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

src/BIZComponents/inventoryTableDetails.vue

@@ -654,7 +654,7 @@
               data.discountTotalPrice ||
               data?.contractVO?.discountTotalPrice;
           }
-          this.setDeliveryDays();
+          // this.setDeliveryDays();
 
           this.supplierObj = await this.getSupplierObj(
             productList,

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

@@ -519,13 +519,13 @@
             },
             align: 'center'
           },
-          // {
-          //   width: 160,
-          //   prop: 'guaranteePeriodDeadline',
-          //   label: '质保截止日期',
-          //   slot: 'guaranteePeriodDeadline',
-          //   align: 'center'
-          // },
+          {
+            width: 160,
+            prop: 'guaranteePeriodDeadline',
+            label: '有效期截止日期',
+            slot: 'guaranteePeriodDeadline',
+            align: 'center'
+          },
           {
             prop: 'provenance',
             label: '产地',

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

@@ -504,13 +504,7 @@
             slot: 'deliveryDays',
             align: 'center'
           },
-          // {
-          //   width: 160,
-          //   prop: 'deliveryDeadline',
-          //   label: '交期截止日期',
-          //   slot: 'deliveryDeadline',
-          //   align: 'center'
-          // },
+      
           {
             width: 200,
             prop: 'guaranteePeriod',
@@ -521,6 +515,13 @@
             },
             align: 'center'
           },
+          {
+            width: 160,
+            prop: 'guaranteePeriodDeadline',
+            label: '有效期截止日期',
+            slot: 'guaranteePeriodDeadline',
+            align: 'center'
+          },
           {
             prop: 'provenance',
             label: '产地',