Sfoglia il codice sorgente

修复包装时报工的重量问题

695593266@qq.com 7 mesi fa
parent
commit
d2d60f163d

+ 10 - 6
src/views/produce/components/jobBooking/components/batchPackagingGrouping.vue

@@ -500,14 +500,16 @@
         conversionTwoUnit: '',
         packageDispositionData: '',
         isReelSpecification: false,
-        reelSpecification: ''
+        reelSpecification: '',
+        newDataList: []
       };
     },
     watch: {
       objData: {
         handler(newVal) {
+          console.log(newVal, 'newValnewValnewVal');
           if (newVal.product && newVal.product.length) {
-            console.log(newVal.product, 'newVal.product');
+            this.newDataList = newVal.product;
             this.newCategoryId = newVal.product[0].categoryId;
             this.formedNumLast = newVal.product.reduce((acc, pro) => {
               return pro.feedQuantity &&
@@ -519,6 +521,7 @@
                 : acc;
             }, 0);
           } else if (newVal.semiProductList && newVal.semiProductList.length) {
+            this.newDataList = newVal.semiProductList;
             this.newCategoryId = newVal.semiProductList[0].categoryId;
             this.formedNumLast = newVal.semiProductList.reduce((acc, pro) => {
               return pro.feedQuantity &&
@@ -531,6 +534,7 @@
             }, 0);
           } else {
             this.formedNumLast = 0;
+            this.newDataList = [];
           }
           if (newVal.isUnpack == '1' && this.objData.singleReport == '1') {
             this.packageDispositionFn();
@@ -1160,7 +1164,8 @@
           outsideQuantity: String(this.outsideQuantity).trim(), //外包装数量
           outsideUnit: this.outsideUnit, //外包装单位
           packageUnit: v.conversionUnit,
-          isNewUnpack: this.isNewUnpack
+          isNewUnpack: this.isNewUnpack,
+          semiProductList: this.newDataList
         };
 
         getPackingList(param).then((res) => {
@@ -1416,12 +1421,11 @@
           withinUnit: this.withinUnit, //内包装单位
           outsideQuantity: this.outsideQuantity, //外包装数量
           outsideUnit: this.outsideUnit, //外包装单位
-          packageUnit: v.conversionUnit
+          packageUnit: v.conversionUnit,
+          semiProductList: this.newDataList
         };
 
         getPackingList(param).then((res) => {
-          console.log(res, '111111111111');
-
           if (this.warehouseId != 1) {
             this.listFn(res);
           }