From a1ee2214b5dee8c3f9275816cbffc5a8cfcacc42 Mon Sep 17 00:00:00 2001 From: lb Date: Mon, 24 Apr 2023 10:30:52 +0800 Subject: [PATCH] update --- src/views/modules/pms/order/config.js | 401 +++++++++++--------- src/views/modules/pms/packingStep/config.js | 25 +- 2 files changed, 231 insertions(+), 195 deletions(-) diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js index a20c667..4d02eba 100644 --- a/src/views/modules/pms/order/config.js +++ b/src/views/modules/pms/order/config.js @@ -225,7 +225,7 @@ export default function () { form: { field: [ { - title: '订单', + title: '生产订单', rows: [ [ { @@ -251,18 +251,32 @@ export default function () { elparams: { placeholder: "请输入订单子号" }, }, { - input: true, - label: "生产订单类型", - prop: "specifications", - // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - elparams: { placeholder: "请输入生产订单类型" }, - } + datetime: true, + label: '计划开始时间', + prop: 'planStartTime', + rules: { + required: true, + message: "必填项不能为空", + trigger: "blur" + }, + elparams: { + placeholder: "请选择计划开始时间", + type: 'datetime' + }, + }, ] ] }, { - title: '设备', + title: '设备与参数', rows: [ + { + input: true, + label: "生产订单类型", + prop: "specifications", + // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请输入生产订单类型" }, + }, { select: true, label: "压机", @@ -292,142 +306,207 @@ export default function () { fetchData: () => this.$http.get("/pms/equipment/search", { params: { equipmentTypeCode: 'Kiln' } }), elparams: { placeholder: "请选择隧道窑号", filterable: true }, }, + { + select: true, + label: "牌号", + prop: "bomId", + options: [], + // optionLabel: '', + fetchData: () => this.$http.get("/pms/bom/page", { params: { limit: 999, page: 1, key: "", externalCode: "" } }), + elparams: { placeholder: "请选择牌号", filterable: true }, + // TODO: 选择后，需要带出一些数据 + injectTo: [ + ['bomCode', 'code'], + ['ai', 'externalCode'] + ] + }, + { + // input: true, + // select: true, + label: "配方号", + prop: "bomCode", + // options: [], + // optionLabel: 'code', + // fetchData: () => this.$http.get("/pms/bom/page", { params: { limit: 999, page: 1, key: "" } }), + // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + // elparams: { placeholder: "请选择配方" }, + component: textOnlyComponent, + bind: { + useBuiltin: false, + }, + }, + { + label: "版本号", + prop: "ai", + component: textOnlyComponent, + bind: { + useBuiltin: false, + }, + }, + { + select: true, + label: "物料", + prop: "productId", + options: [], + optionLabel: "code", + // optionValue: 'code', + // fetchedDataIdConvertTo: 'productId', + // optionValue: 'id', + fetchData: () => this.$http.get("/pms/product/page", { params: { limit: 999, page: 1, key: "" } }), + // label: "单位", + // prop: "unitDictValue", + // options: dictList["unit"].map((u) => ({ label: u.dictLabel, value: u.dictValue })), + elparams: { placeholder: "请选择物料", filterable: true }, + }, + { + select: true, + label: "砖型", + prop: "shape", + optionLabel: "code", + options: [], + fetchData: () => this.$http.get("/pms/shape/page", { params: { limit: 999, page: 1, key: "" } }), + // label: "单位", + // prop: "unitDictValue", + // options: dictList["unit"].map((u) => ({ label: u.dictLabel, value: u.dictValue })), + elparams: { placeholder: "请选择砖型", filterable: true }, + }, + { + input: true, + label: "烧成温度", + prop: "sapParam6", + rules: [ + { required: true, message: "必填项不能为空", trigger: "blur" }, + { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, + ], + elparams: { placeholder: "请输入烧成温度" }, + }, + { + input: true, + label: "烧成时间 H", + prop: "sapParam7", + rules: [ + { required: true, message: "必填项不能为空", trigger: "blur" }, + { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, + ], + elparams: { placeholder: "请输入烧成时间" }, + }, + { + select: true, + label: "包装代码", + prop: "packTech", + options: [], + optionLabel: "code", + fetchData: () => this.$http.post("/pms/equipmentTech/pageView", { limit: 999, page: 1, key: "", shape: "", wsId: 5 }), + // label: "单位", + // prop: "unitDictValue", + // options: dictList["unit"].map((u) => ({ label: u.dictLabel, value: u.dictValue })), + elparams: { placeholder: "请选择物料", filterable: true }, + }, + ] + }, + { + title: '其他', + rows: [ + { + input: true, + label: "生产订单砖数", + prop: "prodqty", + rules: [ + { required: true, message: "必填项不能为空", trigger: "blur" }, + { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, + ], + elparams: { placeholder: "请输入要求生产的数量" }, + }, + { + input: true, + label: "已生产数", + prop: "yieldqty", + // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + rules: [ + // { required: true, message: "必填项不能为空", trigger: "blur" }, + { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, + ], + elparams: { placeholder: "请输入已经生产的数量" }, + }, + { + input: true, + label: "托盘码放砖数", + prop: "pcsKilnCar", + rules: [ + { required: true, message: "必填项不能为空", trigger: "blur" }, + { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, + ], + elparams: { placeholder: "请输入要求生产的数量" }, + }, + { + input: true, + label: "Add on", + prop: "sapParam1", + rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请输入addon" }, + }, + { + input: true, + label: "销售订单号", + prop: "saleNo", + rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请输入销售订单号" }, + }, + { + input: true, + label: "销售订单item号", + prop: "saleOrderItem", + // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请输入销售订单item号" }, + }, + { + input: true, + label: "销售订单砖数", + prop: "soqty", + rules: [ + { required: true, message: "必填项不能为空", trigger: "blur" }, + { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, + ], + elparams: { placeholder: "请输入销售订单砖数" }, + }, + { + // time + datetime: true, + label: "销售时间", + prop: "deliveryTime", + rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请选择销售时间" }, + }, + { + select: true, + label: "客户", + prop: "customerId", + option: [], + optionLabel: "name", + fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }), + rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请选择客户" }, + }, ] } ], rows: [ [ - { - select: true, - label: "物料编号", - prop: "productId", - options: [], - optionLabel: "code", - // optionValue: 'code', - // fetchedDataIdConvertTo: 'productId', - // optionValue: 'id', - fetchData: () => this.$http.get("/pms/product/page", { params: { limit: 999, page: 1, key: "" } }), - // label: "单位", - // prop: "unitDictValue", - // options: dictList["unit"].map((u) => ({ label: u.dictLabel, value: u.dictValue })), - elparams: { placeholder: "请选择物料", filterable: true }, - }, - { - select: true, - label: "包装代码", - prop: "packTech", - options: [], - optionLabel: "code", - fetchData: () => this.$http.post("/pms/equipmentTech/pageView", { limit: 999, page: 1, key: "", shape: "", wsId: 5 }), - // label: "单位", - // prop: "unitDictValue", - // options: dictList["unit"].map((u) => ({ label: u.dictLabel, value: u.dictValue })), - elparams: { placeholder: "请选择物料", filterable: true }, - }, - ], - [ - { - input: true, - label: "生产订单砖数", - prop: "prodqty", - rules: [ - { required: true, message: "必填项不能为空", trigger: "blur" }, - { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, - ], - elparams: { placeholder: "请输入要求生产的数量" }, - }, - { - input: true, - label: "已生产数", - prop: "yieldqty", - // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - rules: [ - // { required: true, message: "必填项不能为空", trigger: "blur" }, - { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, - ], - elparams: { placeholder: "请输入已经生产的数量" }, - }, - { - input: true, - label: "托盘码放砖数", - prop: "pcsKilnCar", - rules: [ - { required: true, message: "必填项不能为空", trigger: "blur" }, - { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, - ], - elparams: { placeholder: "请输入要求生产的数量" }, - }, - { - input: true, - label: "Add on", - prop: "sapParam1", - rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - elparams: { placeholder: "请输入addon" }, - }, - { - select: true, - label: "砖型", - prop: "shape", - optionLabel: "code", - options: [], - fetchData: () => this.$http.get("/pms/shape/page", { params: { limit: 999, page: 1, key: "" } }), - // label: "单位", - // prop: "unitDictValue", - // options: dictList["unit"].map((u) => ({ label: u.dictLabel, value: u.dictValue })), - elparams: { placeholder: "请选择砖型", filterable: true }, - }, + ], [ - { - select: true, - label: "牌号", - prop: "bomId", - options: [], - // optionLabel: '', - fetchData: () => this.$http.get("/pms/bom/page", { params: { limit: 999, page: 1, key: "", externalCode: "" } }), - elparams: { placeholder: "请选择牌号", filterable: true }, - // TODO: 选择后，需要带出一些数据 - injectTo: [ - ['bomCode', 'code'], - ['ai', 'externalCode'] - ] - }, - { - // input: true, - // select: true, - label: "配方号代码", - prop: "bomCode", - // options: [], - // optionLabel: 'code', - // fetchData: () => this.$http.get("/pms/bom/page", { params: { limit: 999, page: 1, key: "" } }), - // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - // elparams: { placeholder: "请选择配方" }, - component: textOnlyComponent, - bind: { - useBuiltin: false, - }, - }, - { - label: "版本号", - prop: "ai", - component: textOnlyComponent, - bind: { - useBuiltin: false, - }, - }, + + + + ], + [ - { - input: true, - label: "烧成温度 ℃", - prop: "sapParam6", - rules: [ - { required: true, message: "必填项不能为空", trigger: "blur" }, - { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, - ], - elparams: { placeholder: "请输入烧成温度" }, - }, + + + + // { // input: true, // label: "版本号", @@ -437,58 +516,8 @@ export default function () { // }, ], [ - { - input: true, - label: "烧成时间 H", - prop: "sapParam7", - rules: [ - { required: true, message: "必填项不能为空", trigger: "blur" }, - { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, - ], - elparams: { placeholder: "请输入烧成时间" }, - }, - { - input: true, - label: "销售订单号", - prop: "saleNo", - rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - elparams: { placeholder: "请输入销售订单号" }, - }, - { - input: true, - label: "销售订单item号", - prop: "saleOrderItem", - // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - elparams: { placeholder: "请输入销售订单item号" }, - }, - { - input: true, - label: "销售订单砖数", - prop: "soqty", - rules: [ - { required: true, message: "必填项不能为空", trigger: "blur" }, - { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, - ], - elparams: { placeholder: "请输入销售订单砖数" }, - }, - { - // time - datetime: true, - label: "销售时间", - prop: "deliveryTime", - rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - elparams: { placeholder: "请选择销售时间" }, - }, - { - select: true, - label: "客户", - prop: "customerId", - option: [], - optionLabel: "name", - fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }), - rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - elparams: { placeholder: "请选择客户" }, - }, + + ], [ // { diff --git a/src/views/modules/pms/packingStep/config.js b/src/views/modules/pms/packingStep/config.js index cd992bd..2874694 100644 --- a/src/views/modules/pms/packingStep/config.js +++ b/src/views/modules/pms/packingStep/config.js @@ -18,9 +18,13 @@ export default function () { prop: "operations", name: "操作", fixed: "right", - width: 160, + width: 120, subcomponent: TableOperaionComponent, - options: ["copy", { name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:packingStep:delete" }], + options: [ + { name: "copy", label: "复制", icon: "copy-document" }, + { name: "edit", label: "编辑", icon: "edit-outline" }, + { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:packingStep:delete" }, + ], }, ]; @@ -70,7 +74,10 @@ export default function () { const dialogConfigs = { allowAdd: false, extraIds: { wsId: 5 }, // 工艺管理里面的相关模块的 dialogWithMenu 需要额外的工序 id - menu: [{ name: "包装工艺", key: 'info' }, { name: "工艺参数", key: 'attr', onlyEditMode: true }], + menu: [ + { name: "包装工艺", key: "info" }, + { name: "工艺参数", key: "attr", onlyEditMode: true }, + ], form: { rows: [ [ @@ -101,11 +108,11 @@ export default function () { // }, ], // [ - // { - // forceDisabled: true, - // prop: 'shapeCode', - // label: '当前砖型' - // }, + // { + // forceDisabled: true, + // prop: 'shapeCode', + // label: '当前砖型' + // }, // ], // { // select: true, @@ -143,7 +150,7 @@ export default function () { width: 120, subcomponent: TableOperaionComponent, options: [ - { name: 'edit', label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" }, + { name: "edit", label: "编辑", icon: "edit-outline", permission: "pms:blenderStepParam:update" }, // { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:blenderStepParam:delete" }, ], },