Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/views/bpm/handleTask/components/productionWarehousing/detailDialog.vue

@@ -181,8 +181,13 @@
         console.log('data-----------', data);
         this.loading = false;
         if (data) {
+          const detailList = Array.isArray(data.detailList)
+            ? data.detailList
+            : [];
+          const firstDetail = detailList[0];
           this.form = data;
-          let categoryLevelTopIds = data.detailList.map(
+          this.form.detailList = detailList;
+          let categoryLevelTopIds = detailList.map(
             (item) => item.rootCategoryLevelId
           );
           let filterCategoryLevelTopIds = Array.from(
@@ -191,7 +196,7 @@
           data.categoryLevelTopId = filterCategoryLevelTopIds.join(',');
 
           if (this.taskDefinitionKey == 'wmsBizType4') {
-            this.form.totalCount = data.detailList.reduce(
+            this.form.totalCount = detailList.reduce(
               (sum, item) => sum + (item.quantity || 0),
               0
             );
@@ -199,32 +204,31 @@
             this.$set(
               this.form,
               'totalCount',
-              data.detailList.reduce(
-                (sum, item) => sum + (item.quantity || 0),
-                0
-              )
+              detailList.reduce((sum, item) => sum + (item.quantity || 0), 0)
             );
           }
 
-          this.isDetail =
-            this.form.detailList[0].isAllPackageData == 1 ? true : false;
+          this.isDetail = firstDetail?.isAllPackageData == 1;
 
-          this.totalPackage =
-            this.form.detailList[0].isAllPackageData == 1
-              ? this.form.detailList[0].packingCount +
-                this.form?.detailList[0]?.packingUnit
-              : this.form.detailList.length +
-                this.form?.detailList[0]?.packingUnit;
-          this.totalCount =
-            this.form.totalCount + this.form?.detailList[0]?.measuringUnit;
+          const totalPackage = firstDetail
+            ? this.isDetail
+              ? firstDetail.packingCount ?? data.totalPackage ?? ''
+              : detailList.length
+            : data.totalPackage ?? '';
+          const packingUnit =
+            firstDetail?.packingUnit ?? data.packingUnit ?? '';
+          const measuringUnit =
+            firstDetail?.measuringUnit ?? data.measuringUnit ?? '';
+          this.totalPackage = `${totalPackage}${packingUnit}`;
+          this.totalCount = `${this.form.totalCount ?? ''}${measuringUnit}`;
           this.detailData = data;
-          this.form.detailList = data.detailList.map((item) => {
+          this.form.detailList = detailList.map((item) => {
             return {
               ...item,
               productName: item.categoryName,
               productCode: item.categoryCode,
               productId: item.categoryId,
-              packingQuantity: item.packingCount,
+              packingQuantity: item.packingCount
               // quantity: item.quantity,
               // packingUnit:item.packingUnit||item.measuringUnit
             };

vue.config.js

@@ -42,7 +42,7 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.251:18186',
-        target: 'http://192.168.1.113:18086',
+        target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://aiot.zoomwin.com.cn:51001/api',
         // target: 'http://192.168.1.3:18086',