Переглянути джерело

聚仁发货单打印模板及库存表格优化:调整发货块数显示逻辑

yusheng 10 місяців тому
батько
коміт
c224bbbc52

+ 9 - 18
src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -530,23 +530,7 @@
       },
 
       clientEnvironmentId() {
-        let clientEnvironmentId =
-          this.$store.state.user.info.clientEnvironmentId;
-        if (clientEnvironmentId == 3) {
-          this.blockCountColumn = {
-            width: 150,
-            prop: 'blockCount',
-            label: '发货块数',
-            slot: 'blockCount',
-            headerSlot: 'headerBlockCount',
-            align: 'center'
-          };
-        } else {
-          this.blockCountColumn = {
-            width: 1
-          };
-        }
-        return clientEnvironmentId;
+        return this.$store.state.user.info.clientEnvironmentId;
       }
     },
     methods: {
@@ -723,7 +707,14 @@
             slot: 'measuringUnit',
             align: 'center'
           },
-          this.blockCountColumn,
+          {
+            width: 150,
+            prop: 'blockCount',
+            label: '发货块数',
+            slot: 'blockCount',
+            align: 'center',
+            show: false
+          },
 
           {
             width: 120,

+ 1 - 1
src/views/saleManage/saleOrder/invoice/components/print-template-by.vue

@@ -130,7 +130,7 @@
             <td colspan="1" style="padding: 1px">
               {{ getTotalValue('totalCount', 4) }}
             </td>
-            <td style="padding: 1px"></td>
+            <td style="padding: 1px"> {{ getTotalValue('blockCount',1) }}</td>
             <td colspan="2" style="padding: 1px"></td>
             <td colspan="1" style="padding: 1px" v-if="isPrintPrice">
               {{