字段调整

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')

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')