Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/produce/components/jobBooking/components/batchPackagingGrouping.vue

@@ -180,6 +180,16 @@
                   <template v-slot:feedQuantity="{ row, $index }">
                     <span>{{ row.feedQuantity }}{{ row.unit }}</span>
                   </template>
+
+                  <template v-slot:packageQuantity="{ row, $index }">
+                    <span>{{ row.packageQuantity }}{{ row.packingUnit }}</span>
+                  </template>
+
+                  <template v-slot:packageDisposition="{ row, $index }">
+                    <el-tag v-if="row.extInfo.packageDisposition">{{
+                      row.extInfo.packageDisposition
+                    }}</el-tag>
+                  </template>
                 </ele-pro-table>
 
                 <!-- <template v-slot:newWeight="{ row, $index }">
@@ -500,14 +510,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 +531,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 +544,7 @@
             }, 0);
           } else {
             this.formedNumLast = 0;
+            this.newDataList = [];
           }
           if (newVal.isUnpack == '1' && this.objData.singleReport == '1') {
             this.packageDispositionFn();
@@ -1160,7 +1174,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 +1431,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);
           }

src/views/produceWord/index.vue

@@ -165,6 +165,13 @@ r++<template>
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            prop: 'productionCodes',
+            label: '生产编号',
+            align: 'center',
+            minWidth: 150,
+            showOverflowTooltip: true
+          },
           {
             prop: 'productCode',
             label: '编码',