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

src/BIZComponents/inventoryTableDetails.vue

@@ -57,15 +57,16 @@
           :prop="'datasource.' + scope.$index + '.' + countObj.countKey"
         >
           {{ scope.row[countObj.countKey] }}
+          {{ scope.row[countObj.unitKey] }}
         </el-form-item>
       </template>
-      <template v-slot:saleUnit="scope">
+      <!-- <template v-slot:saleUnit="scope">
         <el-form-item
           :prop="'datasource.' + scope.$index + '.' + countObj.unitKey"
         >
           {{ scope.row[countObj.unitKey] }}
         </el-form-item>
-      </template>
+      </template> -->
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
         <div class="headbox">
@@ -272,14 +273,14 @@
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
-          {
-            width: 150,
-            prop: 'saleUnit',
-            label: '单位',
-            slot: 'saleUnit',
-            headerSlot: 'headerTotalCount',
-            align: 'center'
-          },
+          // {
+          //   width: 150,
+          //   prop: 'saleUnit',
+          //   label: '单位',
+          //   slot: 'saleUnit',
+          //   headerSlot: 'headerTotalCount',
+          //   align: 'center'
+          // },
           {
             width: 120,
             prop: 'packingSpecification',
@@ -292,22 +293,32 @@
             prop: 'totalCount',
             label: '计量数量',
             slot: 'totalCount',
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            },
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
-          {
-            width: 120,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
-            align: 'center'
-          },
+          // {
+          //   width: 120,
+          //   prop: 'measuringUnit',
+          //   label: '计量单位',
+          //   slot: 'measuringUnit',
+          //   align: 'center'
+          // },
           this.pageName == 'send'
             ? {
                 minWidth: 110,
                 prop: 'sendTotalCount',
                 label: '已发货数量',
                 slot: 'sendTotalCount',
+                formatter: (row, column) => {
+                  if (row.sendTotalCount) {
+                    return row.sendTotalCount + ' ' + row.measuringUnit;
+                  }
+                },
                 align: 'center'
               }
             : {
@@ -319,6 +330,11 @@
                 prop: 'notSendTotalCount',
                 label: '未发货数量',
                 slot: 'notSendTotalCount',
+                formatter: (row, column) => {
+                  if (row.notSendTotalCount) {
+                    return row.notSendTotalCount + ' ' + row.measuringUnit;
+                  }
+                },
                 align: 'center'
               }
             : {
@@ -329,6 +345,11 @@
             prop: 'singleWeight',
             label: '单重',
             slot: 'singleWeight',
+            formatter: (row, column) => {
+              if (row.singleWeight) {
+                return row.singleWeight + ' ' + row.weightUnit;
+              }
+            },
             headerSlot: 'headerSingleWeight',
             align: 'center'
           },
@@ -337,15 +358,20 @@
             prop: 'totalWeight',
             label: '总重',
             slot: 'totalWeight',
+            formatter: (row, column) => {
+              if (row.totalWeight) {
+                return row.totalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
-          {
-            width: 120,
-            prop: 'weightUnit',
-            label: '重量单位',
-            slot: 'weightUnit',
-            align: 'center'
-          },
+          // {
+          //   width: 120,
+          //   prop: 'weightUnit',
+          //   label: '重量单位',
+          //   slot: 'weightUnit',
+          //   align: 'center'
+          // },
           // {
           //   width: 160,
           //   prop: 'pricingWay',

src/views/bpm/handleTask/components/saleOrder/entrustedReceive/detailDialog.vue

@@ -198,21 +198,19 @@
             slot: 'specification',
             align: 'center'
           },
-             {
+          {
             minWidth: 120,
             prop: 'modelKey',
             label: '机型',
             showOverflowTooltip: true,
-            align: 'center',
-
+            align: 'center'
           },
           {
             minWidth: 120,
             prop: 'colorKey',
             showOverflowTooltip: true,
             label: '颜色',
-            align: 'center',
-
+            align: 'center'
           },
           {
             width: 200,
@@ -241,6 +239,11 @@
             prop: 'totalCount',
             label: '本次收货数量',
             slot: 'totalCount',
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            },
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
@@ -251,18 +254,23 @@
           //   slot: 'receiveTotalCount',
           //   align: 'center'
           // },
-          {
-            width: 120,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
-            align: 'center'
-          },
+          // {
+          //   width: 120,
+          //   prop: 'measuringUnit',
+          //   label: '计量单位',
+          //   slot: 'measuringUnit',
+          //   align: 'center'
+          // },
           {
             width: 120,
             prop: 'singleWeight',
             label: '单重',
             slot: 'singleWeight',
+                      formatter: (row, column) => {
+              if (row.singleWeight) {
+                return row.singleWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           {
@@ -270,15 +278,21 @@
             prop: 'receiveTotalWeight',
             label: '收货总重',
             slot: 'receiveTotalWeight',
+                                  formatter: (row, column) => {
+              if (row.receiveTotalWeight) {
+                return row.receiveTotalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
-          {
-            width: 100,
-            prop: 'weightUnit',
-            label: '重量单位',
-            slot: 'weightUnit',
-            align: 'center'
-          },
+          // {
+          //   width: 100,
+          //   prop: 'weightUnit',
+          //   label: '重量单位',
+          //   slot: 'weightUnit',
+            
+          //   align: 'center'
+          // },
           // {
           //   width: 160,
           //   prop: 'pricingWay',
@@ -394,7 +408,6 @@
     },
     created() {
       this.getDetailData(this.businessId);
-
     },
     methods: {
       downloadFile(file) {

src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -394,26 +394,36 @@
             align: 'center'
           },
           {
-            width: 150,
+            width: 180,
             prop: 'saleCount',
             label: '发货数量',
             slot: 'saleCount',
+            formatter: (row, column) => {
+              if (row.saleCount) {
+                return row.saleCount + ' ' + row.saleUnit;
+              }
+            },
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
-          {
-            width: 150,
-            prop: 'saleUnit',
-            label: '单位',
-            slot: 'saleUnit',
-            headerSlot: 'headerTotalCount',
-            align: 'center'
-          },
+          // {
+          //   width: 150,
+          //   prop: 'saleUnit',
+          //   label: '单位',
+          //   slot: 'saleUnit',
+          //   headerSlot: 'headerTotalCount',
+          //   align: 'center'
+          // },
           {
             width: 120,
             prop: 'totalCount',
             label: '计量数量',
             slot: 'totalCount',
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            },
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
@@ -422,16 +432,21 @@
             prop: 'orderTotalCount',
             label: '订单数量',
             slot: 'orderTotalCount',
+            formatter: (row, column) => {
+              if (row.orderTotalCount) {
+                return row.orderTotalCount + ' ' + row.measuringUnit;
+              }
+            },
             align: 'center'
           },
 
-          {
-            width: 80,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
-            align: 'center'
-          },
+          // {
+          //   width: 80,
+          //   prop: 'measuringUnit',
+          //   label: '计量单位',
+          //   slot: 'measuringUnit',
+          //   align: 'center'
+          // },
 
           this.$store.state.user.info.clientEnvironmentId == '4'
             ? {
@@ -449,6 +464,11 @@
             prop: 'singleWeight',
             label: '单重',
             slot: 'singleWeight',
+            formatter: (row, column) => {
+              if (row.singleWeight) {
+                return row.singleWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           {
@@ -456,6 +476,11 @@
             prop: 'receiveTotalWeight',
             label: '收货总重',
             slot: 'receiveTotalWeight',
+            formatter: (row, column) => {
+              if (row.receiveTotalWeight) {
+                return row.receiveTotalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center',
             headerSlot: 'headerTotalCount'
           },
@@ -464,6 +489,11 @@
             prop: 'sendTotalWeight',
             label: '发货总重',
             slot: 'sendTotalWeight',
+            formatter: (row, column) => {
+              if (row.sendTotalWeight) {
+                return row.sendTotalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
 
@@ -472,15 +502,20 @@
             prop: 'increaseTotalWeight',
             label: '增重重量',
             slot: 'increaseTotalWeight',
+            formatter: (row, column) => {
+              if (row.increaseTotalWeight) {
+                return row.increaseTotalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
-          {
-            width: 100,
-            prop: 'weightUnit',
-            label: '重量单位',
-            slot: 'weightUnit',
-            align: 'center'
-          },
+          // {
+          //   width: 100,
+          //   prop: 'weightUnit',
+          //   label: '重量单位',
+          //   slot: 'weightUnit',
+          //   align: 'center'
+          // },
           // {
           //   width: 160,
           //   prop: 'pricingWay',