From 92a9aa2f62de1ad002b9eff7e543f841a5404c31 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 3 Aug 2023 16:54:24 +0800 Subject: [PATCH 1/5] update 0803_docs --- public/importTemplates/orderImport.xlsx | Bin 10106 -> 12971 bytes src/views/modules/pms/finishedOrder/config.js | 30 ++++----- .../order/components/ListSectionWithHead.vue | 4 +- .../pms/order/components/order--edit.vue | 28 ++++++++- src/views/modules/pms/order/config.js | 58 +++++++++++------- 5 files changed, 80 insertions(+), 40 deletions(-) diff --git a/public/importTemplates/orderImport.xlsx b/public/importTemplates/orderImport.xlsx index 4b6a312aa267cfc0b13646db342f7a12417c2424..4a9b83392fa42fae6e8a929dca14d7da537be28f 100644 GIT binary patch delta 8402 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 P;6CQC$1S&5|MdO`AZ import BaseListTable from "./BaseListTable.vue"; import BaseSearchForm from "./BaseSearchForm.vue"; -import DialogJustForm from "./DialogJustForm.vue"; +// import DialogJustForm from "./DialogJustForm.vue"; import DialogUpload from "@/components/DialogUpload.vue"; import moment from "moment"; import Overlay from "@/components/Overlay.vue"; @@ -76,7 +76,7 @@ import DialogWithMenu from "./DialogWithMenu.vue"; // const dictList = JSON.parse(localStorage.getItem("dictList")); export default { name: "ListSectionWithHead", - components: { OrderEditDialog, BaseSearchForm, DialogWithMenu, BaseListTable, DialogJustForm, DialogUpload, Overlay }, + components: { OrderEditDialog, BaseSearchForm, DialogWithMenu, BaseListTable, DialogUpload, Overlay }, props: { headConfig: { type: Object, diff --git a/src/views/modules/pms/order/components/order--edit.vue b/src/views/modules/pms/order/components/order--edit.vue index bb0963a..c590bfb 100644 --- a/src/views/modules/pms/order/components/order--edit.vue +++ b/src/views/modules/pms/order/components/order--edit.vue @@ -472,8 +472,32 @@ {{ dataForm.shortDesc }} - - + + + + + + + + + + + + + + + + diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js index 9931999..2fb37a3 100644 --- a/src/views/modules/pms/order/config.js +++ b/src/views/modules/pms/order/config.js @@ -64,31 +64,31 @@ export default function () { { width: 60, type: "index", label: "序号", fixed: true }, { width: 120, prop: "code", label: "订单号", fixed: "left" }, { width: 60, prop: "cate", label: "子号" }, - { width: 60, prop: "statusDictValue", label: "状态", filter: dictFilter("order_status") }, // 不可编辑 - { width: 120, prop: "planStartTime", label: "计划开始时间", filter: timeFilter }, // "订单砖数" }, - ...startTimeProp(type), - { width: 60, prop: "prodqty", label: "数量" }, // "订单砖数" }, { width: 100, prop: "productCode", label: "物料" }, // "物料编号" }, // select, filterable { width: 100, prop: "shapeCode", label: "砖型" }, // "砖型编号" }, // select, filterable { width: 120, prop: "brand", label: "牌号" }, // select, filterable - { width: 60, prop: "ai", label: "版本" }, // "版本号" }, // auto display according to the 配方 - { width: 65, prop: "sapParam1", label: "addon" }, - { width: 200, prop: "shortDesc", label: "物料号销售文本" }, { width: 100, prop: "bomCode", label: "配方编码" }, - { width: 80, prop: "pressCode", label: "压机号" }, // select, filterable + { width: 60, prop: "ai", label: "版本" }, // "版本号" }, // auto display according to the 配方 + { width: 60, prop: "prodqty", label: "数量" }, // "订单砖数" }, { width: 80, prop: "blenderCode", label: "混料机号" }, // select, filterable + { width: 80, prop: "pressCode", label: "压机号" }, // select, filterable { width: 80, prop: "kilnCode", label: "隧道窑号" }, // select, filterable + { width: 120, prop: "planStartTime", label: "计划开始时间", filter: timeFilter }, // "订单砖数" }, + ...startTimeProp(type), { width: 120, prop: "sapParam6", label: "烧成温度" }, { width: 120, prop: "sapParam7", label: "烧成时间(h)" }, - { width: 120, prop: "yieldqty", label: "已生产数量" }, // uneditable - { width: 120, prop: "soqty", label: "销售订单数" }, + { width: 200, prop: "packTechCode", label: "包装工艺代码" }, // select, filterable + { width: 120, prop: "pcsKilnCar", label: "托盘码放砖数" }, + { width: 120, prop: "customerCode", label: "客户" }, + { width: 120, prop: "specifications", label: "生产订单类型" }, + { width: 60, prop: "statusDictValue", label: "状态", filter: dictFilter("order_status") }, // 不可编辑 { width: 200, prop: "saleNo", label: "销售订单号" }, { width: 200, prop: "saleOrderItem", label: "销售订单item号" }, - { width: 200, prop: "packTechCode", label: "包装工艺代码" }, // select, filterable - { width: 120, prop: "specifications", label: "生产订单类型" }, + { width: 120, prop: "soqty", label: "销售订单数" }, { width: 120, prop: "deliveryTime", label: "销售时间", filter: timeFilter }, - { width: 120, prop: "customerCode", label: "客户" }, - { width: 120, prop: "pcsKilnCar", label: "托盘码放砖数" }, + { width: 65, prop: "sapParam1", label: "addon" }, + { width: 200, prop: "shortDesc", label: "物料号销售文本" }, + { width: 120, prop: "yieldqty", label: "已生产数量" }, // uneditable // { prop: "description", label: "详情", subcomponent: TableTextComponent }, { width: 120, prop: "remark", label: "备注" }, { width: 120, prop: "createTime", label: "添加时间", filter: timeFilter }, @@ -283,11 +283,11 @@ export default function () { datetime: true, label: "计划开始时间", prop: "planStartTime", - rules: { - required: true, - message: "必填项不能为空", - trigger: "blur", - }, + // rules: { + // required: true, + // message: "必填项不能为空", + // trigger: "blur", + // }, elparams: { placeholder: "选择计划开始时间", type: "datetime", @@ -552,8 +552,24 @@ export default function () { useBuiltin: false, }, }, - {}, - {} + { + label: '托板类型', + prop: 'palletType', + select: true, + options: [ + { label: '非熏蒸', value: '0' }, + { label: '熏蒸', value: '1' }, + ] + }, + { + label: '贴纸板', + prop: 'paperboard', + select: true, + options: [ + { label: '不要', value: '0' }, + { label: '要', value: '1' }, + ] + }, ], [ { input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }, From 2ab361be8531b44f7855f8d9527406f49e91eb17 Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 8 Aug 2023 15:54:47 +0800 Subject: [PATCH 2/5] fix 0807docs --- public/importTemplates/orderImport.xlsx | Bin 12971 -> 11828 bytes src/components/DialogJustForm.vue | 52 +++++++++------ src/views/modules/pms/bom/config.js | 22 ++++-- src/views/modules/pms/bomDetails/config.js | 4 +- src/views/modules/pms/brokeLog/config.js | 2 + src/views/modules/pms/brokeLogHand/config.js | 2 + src/views/modules/pms/carHistory/config.js | 29 ++++---- .../components/tabs/orderDetail.vue | 20 +++--- src/views/modules/pms/finishedOrder/config.js | 4 +- src/views/modules/pms/materialBase/config.js | 2 +- .../pms/materialStorageDynamic/config.js | 26 ++++---- .../pms/order/components/order--edit.vue | 63 +++++++++++++----- src/views/modules/pms/order/config.js | 4 +- src/views/modules/pms/shape/config.js | 4 +- src/views/pages/login.vue | 4 +- 15 files changed, 147 insertions(+), 91 deletions(-) diff --git a/public/importTemplates/orderImport.xlsx b/public/importTemplates/orderImport.xlsx index 4a9b83392fa42fae6e8a929dca14d7da537be28f..79ba14f834bfdcd05505ec8709678098cdd7f94d 100644 GIT binary patch literal 11828 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 DPp_Q( literal 12971 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 diff --git a/src/components/DialogJustForm.vue b/src/components/DialogJustForm.vue index 13b98f3..314c9a4 100644 --- a/src/components/DialogJustForm.vue +++ b/src/components/DialogJustForm.vue @@ -78,6 +78,14 @@ {{ opt[col.customLabel] || "无描述" }} + { - console.log("getData: ", col.prop, "/", param ?? "no param!"); + // console.log("getData: ", col.prop, "/", param ?? "no param!"); // 获取数据 - 不需要等待前置条件时 promiseHistory[col.prop] = col.fetchData(param).then(({ data: res }) => { if (res.code === 0) { if ("list" in res.data) { - console.log( - "SdASD ", - res.data.list.map((i) => ({ + let options = []; + if (col.customLabel) { + options = res.data.list.map((i) => ({ label: col.optionLabel ? i[col.optionLabel] : i.name, value: col.optionValue ? i[col.optionValue] : i.id, [col.customLabel]: i[col.customLabel], - })) - ); + })); + } else if (col.customLabels) { + options = res.data.list.map((i) => { + let extraOptions = {}; + col.customLabels.forEach((label) => { + extraOptions[label] = i[label]; + }); + return { + label: col.optionLabel ? i[col.optionLabel] : i.name, + value: col.optionValue ? i[col.optionValue] : i.id, + ...extraOptions, + }; + }); + } else { + options = res.data.list.map((i) => ({ + label: col.optionLabel ? i[col.optionLabel] : i.name, + value: col.optionValue ? i[col.optionValue] : i.id, + })); + } // 填充 options - this.$set( - col, - "options", - col.customLabel - ? res.data.list.map((i) => ({ - label: col.optionLabel ? i[col.optionLabel] : i.name, - value: col.optionValue ? i[col.optionValue] : i.id, - [col.customLabel]: i[col.customLabel], - })) - : res.data.list.map((i) => ({ - label: col.optionLabel ? i[col.optionLabel] : i.name, - value: col.optionValue ? i[col.optionValue] : i.id, - })) - ); + this.$set(col, "options", options); // 是否需要缓存数据列表 if ("injectTo" in col || col.cached) { diff --git a/src/views/modules/pms/bom/config.js b/src/views/modules/pms/bom/config.js index a18128b..0f36d8a 100644 --- a/src/views/modules/pms/bom/config.js +++ b/src/views/modules/pms/bom/config.js @@ -12,9 +12,9 @@ export default function () { { prop: "name", label: "牌号" }, { prop: "syncTime", label: "同步时间", filter: timeFilter }, { width: 120, prop: "techCode", label: "烧制曲线", subcomponent: techBox }, - { prop: "upweight", label: "建议混料上限" }, - { prop: "downweight", label: "建议混料下限" }, - // { prop: "externalCode", label: "版本号" }, + { width: 110, prop: "upweight", label: "建议混料上限" }, + { width: 110, prop: "downweight", label: "建议混料下限" }, + { prop: "shortDesc", label: "喷码描述" }, // { prop: "specifications", label: "程序号" }, // { prop: "unitDictValue", label: "砖型", filter: dictFilter("unit") }, // { prop: "unitDictValue", label: "物料号", filter: dictFilter("unit") }, @@ -256,7 +256,7 @@ export default function () { rows: [ [ { - input: true, + forceDisabled: true, label: "配方号", prop: "code", rules: { required: true, message: "必填项不能为空", trigger: "blur" }, @@ -264,7 +264,7 @@ export default function () { elparams: { disabled: true }, }, { - input: true, + forceDisabled: true, label: "牌号", prop: "name", rules: { required: true, message: "必填项不能为空", trigger: "blur" }, @@ -286,7 +286,17 @@ export default function () { rules: [{ type: "number", trigger: "blur", message: "请输入数字类型", transform: (val) => Number(val) }], elparams: { placeholder: "请输入建议混料上限" }, }, - ] + ], + [ + { + input: true, + label: "喷码描述", + prop: "shortDesc", + // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + // elparams: { disabled: true }, + }, + null + ], ], operations: [ { name: "add-bom", label: "保存", type: "primary", permission: "", showOnEdit: false }, diff --git a/src/views/modules/pms/bomDetails/config.js b/src/views/modules/pms/bomDetails/config.js index 9af60d8..15a8a9f 100644 --- a/src/views/modules/pms/bomDetails/config.js +++ b/src/views/modules/pms/bomDetails/config.js @@ -37,8 +37,8 @@ export default function () { { prop: "name", label: "牌号" }, { prop: "version", label: "版本" }, { prop: "sumqty", label: "总重量" }, - { prop: "description", label: "物料销售文本" }, - { width: 150, prop: "shortDesc", label: "物料销售文本短描述" }, + // { prop: "description", label: "物料销售文本" }, + // { width: 150, prop: "shortDesc", label: "物料销售文本短描述" }, { prop: "remark", label: "备注" }, { prop: "createTime", label: "添加时间", filter: timeFilter }, { diff --git a/src/views/modules/pms/brokeLog/config.js b/src/views/modules/pms/brokeLog/config.js index e2b5c3d..aa4eef7 100644 --- a/src/views/modules/pms/brokeLog/config.js +++ b/src/views/modules/pms/brokeLog/config.js @@ -60,6 +60,7 @@ export default function () { } }; + const now = new Date().getTime(); const headFormFields = [ { prop: "material", @@ -95,6 +96,7 @@ export default function () { "start-placeholder": "开始时间", "end-placeholder": "结束时间", }, + default: { value: [now - 3600 * 24 * 7 * 1000, now] }, }, { button: { diff --git a/src/views/modules/pms/brokeLogHand/config.js b/src/views/modules/pms/brokeLogHand/config.js index a8589a4..bac96f4 100644 --- a/src/views/modules/pms/brokeLogHand/config.js +++ b/src/views/modules/pms/brokeLogHand/config.js @@ -60,6 +60,7 @@ export default function () { } }; + const now = new Date().getTime(); const headFormFields = [ { prop: "material", @@ -95,6 +96,7 @@ export default function () { "start-placeholder": "开始时间", "end-placeholder": "结束时间", }, + default: { value: [now - 3600 * 24 * 7 * 1000, now] }, }, { button: { diff --git a/src/views/modules/pms/carHistory/config.js b/src/views/modules/pms/carHistory/config.js index 71ea583..4ba710d 100644 --- a/src/views/modules/pms/carHistory/config.js +++ b/src/views/modules/pms/carHistory/config.js @@ -1,7 +1,7 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent"; -import StateSelect from '@/components/StateSelect.vue'; +import StateSelect from "@/components/StateSelect.vue"; import request from "@/utils/request"; -import { timeFilter } from '@/utils/filters' +import { timeFilter } from "@/utils/filters"; export default function () { const tableProps = [ @@ -21,31 +21,32 @@ export default function () { width: 180, subcomponent: TableOperaionComponent, options: [ - { name: "temperature", label: "烧制温度", }, - { name: "to-car-payload", label: "装载详情", icon: 'document' }, - { name: "delete", label: "删除", icon: 'delete', emitFull: true, promptField: 'code' } + { name: "temperature", label: "烧制温度" }, + { name: "to-car-payload", label: "装载详情", icon: "document" }, + { name: "delete", label: "删除", icon: "delete", emitFull: true, promptField: "code" }, ], }, ]; + const now = new Date().getTime(); const headFormFields = [ { input: true, - prop: 'code', + prop: "code", label: "窑车号", default: { value: "" }, bind: { - placeholder: '请输入窑车号' - } + placeholder: "请输入窑车号", + }, }, { input: true, - prop: 'orderCode', + prop: "orderCode", label: "订单号", default: { value: "" }, bind: { - placeholder: '请输入订单号' - } + placeholder: "请输入订单号", + }, }, { timerange: true, @@ -57,6 +58,7 @@ export default function () { "start-placeholder": "开始时间", "end-placeholder": "结束时间", }, + default: { value: [now - 3600 * 24 * 7 * 1000, now] }, }, { button: { @@ -79,7 +81,7 @@ export default function () { const dialogJustFormConfigs = null; const carPayloadDialogConfigs = { - dialogWidth: '70%', + dialogWidth: "70%", carPayloadDialog: true, clickModalToClose: false, tableConfig: { @@ -102,7 +104,6 @@ export default function () { }, }; - return { carPayloadDialogConfigs, dialogConfigs: dialogJustFormConfigs, @@ -117,7 +118,7 @@ export default function () { urls: { base: "/pms/carHandle", page: "/pms/carHandle/pageHis", - pageIsPostApi: true + pageIsPostApi: true, // subase: '/pms/blenderStepParam', // subpage: '/pms/blenderStepParam/page', // more... diff --git a/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue b/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue index d6c33a3..044fb78 100644 --- a/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue +++ b/src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue @@ -266,7 +266,7 @@ - - + --> - - + --> @@ -377,8 +377,8 @@ + prop="saleNo"> + + prop="deliveryTime"> + - + {{ dataForm.shortDesc }} diff --git a/src/views/modules/pms/finishedOrder/config.js b/src/views/modules/pms/finishedOrder/config.js index 0be0d26..cb2f37b 100644 --- a/src/views/modules/pms/finishedOrder/config.js +++ b/src/views/modules/pms/finishedOrder/config.js @@ -13,7 +13,7 @@ export default function () { { width: 60, prop: "cate", label: "子号" }, { width: 100, prop: "productCode", label: "物料" }, { width: 100, prop: "shapeCode", label: "砖型" }, - { width: 120, prop: "brand", label: "牌号" }, + { width: 160, prop: "brand", label: "牌号" }, { width: 100, prop: "bomCode", label: "配方编码" }, { width: 60, prop: "ai", label: "版本" }, { width: 60, prop: "prodqty", label: "数量" }, @@ -34,7 +34,7 @@ export default function () { { width: 120, prop: "soqty", label: "销售订单数" }, { width: 120, prop: "deliveryTime", label: "销售时间", filter: timeFilter }, { width: 65, prop: "sapParam1", label: "addon" }, - { width: 200, prop: "shortDesc", label: "物料号销售文本" }, + { width: 200, prop: "shortDesc", label: "喷码描述" }, { width: 120, prop: "yieldqty", label: "已生产数量" }, { width: 120, prop: "remark", label: "备注" }, // { width: 120, prop: "createTime", label: "添加时间", filter: timeFilter }, diff --git a/src/views/modules/pms/materialBase/config.js b/src/views/modules/pms/materialBase/config.js index 885bc95..ac8de78 100644 --- a/src/views/modules/pms/materialBase/config.js +++ b/src/views/modules/pms/materialBase/config.js @@ -4,11 +4,11 @@ import { timeFilter } from "@/utils/filters"; export default function () { const tableProps = [ { type: "index", label: "序号" }, - { prop: "name", label: "名称" }, { prop: "code", label: "编码" }, // { prop: "enName", label: "英文名称" }, // { prop: "enAb", label: "缩写" }, { prop: "description", label: "描述" }, + { prop: "name", label: "名称" }, { prop: "remark", label: "备注" }, { prop: "createTime", label: "添加时间", filter: timeFilter }, { diff --git a/src/views/modules/pms/materialStorageDynamic/config.js b/src/views/modules/pms/materialStorageDynamic/config.js index a83005d..8b2beab 100644 --- a/src/views/modules/pms/materialStorageDynamic/config.js +++ b/src/views/modules/pms/materialStorageDynamic/config.js @@ -7,20 +7,21 @@ import { timeFilter } from "@/utils/filters"; export default function () { const tableProps = [ { type: "index", label: "序号" }, - { prop: "name", label: "料仓名称" }, - { prop: "code", label: "料仓编码" }, - { prop: "typeDictValue", label: "料仓类型", filter: dictFilter("liaocang") }, + { width: 90, prop: "name", label: "料仓名称" }, + { width: 90, prop: "code", label: "料仓编码" }, + { width: 90, prop: "typeDictValue", label: "料仓类型", filter: dictFilter("liaocang") }, // { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent - { prop: "materialDescription", label: "原料" }, - { prop: "qty", label: "料位" }, + { width: 220, prop: "materialDescription", label: "原料" }, + { prop: "qty", label: "料位[kg]" }, // { prop: "unitDictValue", label: "单位", filter: dictFilter('unit') }, - { prop: "materialTypeDictValue", label: "原料类型", filter: dictFilter("material_category") }, - { prop: "density", label: "原料堆积密度" }, - { prop: "dosLow", label: "加料下限" }, - { prop: "dosHigh", label: "加料上限" }, - { prop: "description", label: "描述" }, + { width: 128, prop: "materialTypeDictValue", label: "原料类型", filter: dictFilter("material_category") }, + { width: 128, prop: "density", label: "原料堆积密度" }, + { width: 90, prop: "dosLow", label: "加料下限" }, + { width: 90, prop: "dosHigh", label: "加料上限" }, + { width: 128, prop: "description", label: "描述" }, + { width: 128, prop: "materialName", label: "中文描述" }, // { prop: "remark", label: "备注" }, - { prop: "createTime", label: "添加时间", filter: timeFilter }, + { width: 128, prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "operations", name: "操作", @@ -123,7 +124,8 @@ export default function () { fetchData: () => this.$http.get("/pms/material/page", { params: { key: "", limit: 999, page: 1 } }), options: [], optionLabel: "code", - customLabel: "description", + // customLabel: "description+name", + customLabels: ["description", "name"], rules: { required: true, message: "必填项不能为空", trigger: "change" }, elparams: { filterable: true, placeholder: "请选择原料" }, }, diff --git a/src/views/modules/pms/order/components/order--edit.vue b/src/views/modules/pms/order/components/order--edit.vue index c590bfb..12b72d7 100644 --- a/src/views/modules/pms/order/components/order--edit.vue +++ b/src/views/modules/pms/order/components/order--edit.vue @@ -56,10 +56,7 @@ - + - - + --> - - + --> @@ -393,8 +390,8 @@ + prop="saleNo"> + + prop="deliveryTime"> + - + {{ dataForm.shortDesc }} - + - + { if (res && res.code === 0) { this.dataForm = __pick(res.data, Object.keys(this.dataForm)); + + return res.data.bomId; // 特殊需求：编辑页面，还要根据 bomId 来更新配方号 } else { this.$message({ message: `${res.code}: ${res.msg}`, @@ -812,6 +817,28 @@ export default { duration: 1500, }); } + }) + .then((bomId) => { + return this.$http({ + url: "/pms/bom/pageById", + method: "get", + params: { + limit: 999, + page: 1, + key: "", + id: bomId, + }, + }); + }) + .then(({ data: res }) => { + if (res.code == 0) { + this.bomOptions = res.data.list.map((item) => ({ + name: item.name, + label: item.code, + value: item.id, + })); + } + this.formLoading = false; }) .catch((err) => { diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js index 2fb37a3..57a0e3a 100644 --- a/src/views/modules/pms/order/config.js +++ b/src/views/modules/pms/order/config.js @@ -66,7 +66,7 @@ export default function () { { width: 60, prop: "cate", label: "子号" }, { width: 100, prop: "productCode", label: "物料" }, // "物料编号" }, // select, filterable { width: 100, prop: "shapeCode", label: "砖型" }, // "砖型编号" }, // select, filterable - { width: 120, prop: "brand", label: "牌号" }, // select, filterable + { width: 160, prop: "brand", label: "牌号" }, // select, filterable { width: 100, prop: "bomCode", label: "配方编码" }, { width: 60, prop: "ai", label: "版本" }, // "版本号" }, // auto display according to the 配方 { width: 60, prop: "prodqty", label: "数量" }, // "订单砖数" }, @@ -87,7 +87,7 @@ export default function () { { width: 120, prop: "soqty", label: "销售订单数" }, { width: 120, prop: "deliveryTime", label: "销售时间", filter: timeFilter }, { width: 65, prop: "sapParam1", label: "addon" }, - { width: 200, prop: "shortDesc", label: "物料号销售文本" }, + { width: 200, prop: "shortDesc", label: "喷码描述" }, { width: 120, prop: "yieldqty", label: "已生产数量" }, // uneditable // { prop: "description", label: "详情", subcomponent: TableTextComponent }, { width: 120, prop: "remark", label: "备注" }, diff --git a/src/views/modules/pms/shape/config.js b/src/views/modules/pms/shape/config.js index 906ab25..14cdb82 100644 --- a/src/views/modules/pms/shape/config.js +++ b/src/views/modules/pms/shape/config.js @@ -14,8 +14,8 @@ export default function () { { prop: "line", label: "中心线颜色", filter: dictFilter("line") }, { prop: "tequipmentTechCode1", label: "压制工艺", subcomponent: techBox }, { prop: "tequipmentTechCode2", label: "检测工艺", subcomponent: techBox }, - { prop: "description", label: "长描述" }, - { prop: "shortDesc", label: "短描述" }, + // { prop: "description", label: "长描述" }, + { prop: "shortDesc", label: "喷码描述" }, { prop: "remark", label: "备注" }, { prop: "toggle-attachment-dialog", diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index d7adaee..b54a771 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -132,8 +132,8 @@ export default { baseImg: require("../../assets/img/login-back.png"), coverImgUrl: "", dataForm: { - username: "admin", - password: "admin", + username: "", + password: "", uuid: "string", captcha: "", }, From 3601b574fb5234443134271780606df0c89ad36b Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 8 Aug 2023 16:54:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?add=20=E5=AD=90=E8=AE=A2=E5=8D=95=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E2=80=94=E6=B7=B7=E6=96=99=E8=AE=A2=E5=8D=95=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/order/components/TablePagi.vue | 24 ++-- .../components/tabs/blenderOrder-edit.vue | 86 +++++++++++++ .../order/components/tabs/subOrderDetail.vue | 118 +++++++++++------- 3 files changed, 177 insertions(+), 51 deletions(-) create mode 100644 src/views/modules/pms/order/components/tabs/blenderOrder-edit.vue diff --git a/src/views/modules/pms/order/components/TablePagi.vue b/src/views/modules/pms/order/components/TablePagi.vue index fa926cc..1f30166 100644 --- a/src/views/modules/pms/order/components/TablePagi.vue +++ b/src/views/modules/pms/order/components/TablePagi.vue @@ -18,8 +18,13 @@ :total="totalPage" layout="total, prev, pager, next, jumper"> - - + + + import BaseListTable from "./BaseListTable.vue"; -import DialogJustForm from "./DialogJustForm.vue"; +// import DialogJustForm from "./DialogJustForm.vue"; import BatchDialog from "./BatchDialog.vue"; +import BlenderOrderEdit from "./tabs/blenderOrder-edit.vue"; export default { name: "TablePaginationComp", - components: { BaseListTable, DialogJustForm, BatchDialog }, + components: { BaseListTable, BlenderOrderEdit, BatchDialog }, props: { tableConfig: { type: Object, @@ -68,6 +74,7 @@ export default { }, totalPage: 0, refreshLayoutKey: 0, + blenderOrderEditVisible: false, /** batch related */ batchDialogVisible: false, batchDialogConfigs: {}, @@ -80,10 +87,11 @@ export default { handleOperate({ type, data: id }) { console.log("payload", type, id); switch (type) { - case "edit": - // 编辑 - this.$refs.vdialog.init(id); - console.log("编辑"); + case "blender-edit": + this.blenderOrderEditVisible = true; + this.$nextTick(() => { + this.$refs.blenderOrderEdit.init(id); + }); break; case "view-batch": // 查看批次 diff --git a/src/views/modules/pms/order/components/tabs/blenderOrder-edit.vue b/src/views/modules/pms/order/components/tabs/blenderOrder-edit.vue new file mode 100644 index 0000000..3201e57 --- /dev/null +++ b/src/views/modules/pms/order/components/tabs/blenderOrder-edit.vue @@ -0,0 +1,86 @@ + + + + + + + diff --git a/src/views/modules/pms/order/components/tabs/subOrderDetail.vue b/src/views/modules/pms/order/components/tabs/subOrderDetail.vue index 1b93082..7430eac 100644 --- a/src/views/modules/pms/order/components/tabs/subOrderDetail.vue +++ b/src/views/modules/pms/order/components/tabs/subOrderDetail.vue @@ -3,16 +3,24 @@ - - @@ -22,16 +30,24 @@ - - @@ -43,39 +59,37 @@ - + From bc5b6c286860d9684d776a775d8f6f8b0a64c98d Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 9 Aug 2023 14:11:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84cell-class-name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/pms/blenderOrder/config.js | 8 +- src/views/modules/pms/blenderOrder/index.vue | 10 +- .../components/ListViewWithHead.vue | 10 +- src/views/modules/pms/blenderPress/config.js | 97 +++++++++++++------ src/views/modules/pms/blenderPress/index.vue | 13 ++- src/views/modules/pms/order/index.vue | 43 +++++--- src/views/modules/pms/pressOrder/config.js | 26 ++++- src/views/modules/pms/pressOrder/index.vue | 10 +- 8 files changed, 161 insertions(+), 56 deletions(-) diff --git a/src/views/modules/pms/blenderOrder/config.js b/src/views/modules/pms/blenderOrder/config.js index 08d0d18..941ea1c 100644 --- a/src/views/modules/pms/blenderOrder/config.js +++ b/src/views/modules/pms/blenderOrder/config.js @@ -305,7 +305,13 @@ export default function () { return { dialogConfigs, tableConfig: { - table: null, // 此处可省略，el-table 上的配置项 + table: { + "cell-class-name": ({ row, column, rowIndex, columnIndex }) => { + if ("statusDictValue" in row && row.statusDictValue == "2") { + return "cell-in-production"; + } + }, + }, column: tableProps, // el-column-item 上的配置项 }, headFormConfigs: { diff --git a/src/views/modules/pms/blenderOrder/index.vue b/src/views/modules/pms/blenderOrder/index.vue index de8ab96..83d9b95 100644 --- a/src/views/modules/pms/blenderOrder/index.vue +++ b/src/views/modules/pms/blenderOrder/index.vue @@ -1,5 +1,6 @@