From 7be68f30f8f594ab8ceffa60c4b9de428a935b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Sat, 15 Apr 2023 14:43:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartiallyPreparedProducts.vue | 12 ++++++------ .../RecycledMaterialsLabel.vue | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue index 3b3d6444b..a4451b2df 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue @@ -109,8 +109,8 @@ export default { canMake:null,//制造件 canBuy:null,//采购件 labelType:null,//1采购标签 2生产标签 - isRecycled:null,//回收件 - canOutsourcing:null,//外包件 + // isRecycled:null,//回收件 + // canOutsourcing:null,//外包件 qty:"", lot:"", labelQty:"", @@ -137,8 +137,8 @@ export default { { type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 }, { type: "select", disabled:true,label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 }, { type: "select", disabled:true,label: "标签类型", prop: "labelType", options: "labelTypeSelectOption", colSpan: 12 }, - { type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 }, - { type: "select", disabled:true,label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 }, + // { type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 }, + // { type: "select", disabled:true,label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 }, { type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12 }, { type: "input", label: "批次", prop: "lot", colSpan: 12 }, { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 }, @@ -228,8 +228,8 @@ export default { this.selectData.itemName = this.selectItemInfo.name this.selectData.canBuy=this.selectItemInfo.canBuy; this.selectData.canMake=this.selectItemInfo.canMake; - this.selectData.isRecycled=this.selectItemInfo.isRecycled; - this.selectData.canOutsourcing=this.selectItemInfo.canOutsourcing; + // this.selectData.isRecycled=this.selectItemInfo.isRecycled; + // this.selectData.canOutsourcing=this.selectItemInfo.canOutsourcing; // 采购件、制造件只有一个为true 则自动生成比标签类型，并设置不可修改 let _labelType_index = this.getFormPropIndex('labelType') diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue index f24a14652..c5fc02f4a 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue @@ -108,8 +108,8 @@ export default { canMake:null,//制造件 canBuy:null,//采购件 labelType:null,//1采购标签 2生产标签 - // isRecycled:null,//回收件 - // canOutsourcing:null,//外包件 + isRecycled:null,//回收件 + canOutsourcing:null,//外包件 qty:"", lot:"", labelQty:"", @@ -135,8 +135,8 @@ export default { { type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 }, { type: "select", disabled:true,label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 }, { type: "select", disabled:true,label: "标签类型", prop: "labelType", options: "labelTypeSelectOption", colSpan: 12 }, - // { type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 }, - // { type: "select", disabled:true,label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 }, + { type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 }, + { type: "select", disabled:true,label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 }, { type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12 }, { type: "input", label: "批次", prop: "lot", colSpan: 12 }, { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 }, @@ -225,8 +225,8 @@ export default { this.selectData.itemName = this.selectItemInfo.name this.selectData.canBuy=this.selectItemInfo.canBuy; this.selectData.canMake=this.selectItemInfo.canMake; - // this.selectData.isRecycled=this.selectItemInfo.isRecycled; - // this.selectData.canOutsourcing=this.selectItemInfo.canOutsourcing; + this.selectData.isRecycled=this.selectItemInfo.isRecycled; + this.selectData.canOutsourcing=this.selectItemInfo.canOutsourcing; // 采购件、制造件只有一个为true 则自动生成比标签类型，并设置不可修改 let _labelType_index = this.getFormPropIndex('labelType')