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

src/BIZComponents/inventoryTableDetails.vue

@@ -344,7 +344,10 @@
             width: 45,
             type: 'selection',
             columnKey: 'selection',
-            align: 'center'
+            align: 'center',
+            selectable: (row, index) => {
+              return row.sendTotalCount && row.sendTotalCount > 0;
+          },
           },
           {
             minWidth: 200,

src/views/saleManage/saleOrder/adjustmentNote‌/components/addAdjustDialog.vue

@@ -443,8 +443,8 @@
             // this.$nextTick(() => {
               const tempdata = {
                 // ...data,
-                totalPrice: data.amount,
-                discountTotalPrice: data.discountAmount,
+                totalPrice: row.amount,
+                discountTotalPrice: row.discountAmount,
                 productList: data.originalList
               }
               this.businessId = data.id;

src/views/saleManage/saleOrder/adjustmentNote‌/components/detailAdjustDialog.vue

@@ -366,17 +366,17 @@
       },
 
       //获取详情
-      async getDetail(id) {
-        this.businessId = id;
+      async getDetail(row) {
+        this.businessId = row?.id;
 
         this.loading = true;
-        const data = await getInfo(id);
+        const data = await getInfo(row?.id);
         this.loading = false;
         if (data) {
           const tempdata = {
             // ...data,
-            totalPrice: data.amount,
-            discountTotalPrice: data.discountAmount,
+            totalPrice: row.amount,
+            discountTotalPrice: row.discountAmount,
             productList: data.originalList
           }
           this.businessId = data.id;
@@ -393,7 +393,7 @@
       async open(type, row) {
 
         if (row && row?.id) {
-          await this.getDetail(row?.id);
+          await this.getDetail(row);
         }
 
       },

src/views/saleManage/saleOrder/index.vue

@@ -198,7 +198,7 @@
                   :underline="false"
                   icon="el-icon-plus"
                   @click="handleCommand('adjustment', row)"
-                  v-if="[2].includes(row.orderStatus) && $hasPermission('eom:saleorder:adjustment')"
+                  v-if="row.allowDifference == 1 && $hasPermission('eom:saleorder:adjustment')"
                 >
                   冲差
                 </el-link>