Преглед на файлове

fix(销售订单): 修正冲差单业务名称显示问题

liujt преди 7 месеца
родител
ревизия
fb3cfa692d

+ 4 - 3
src/BIZComponents/inventoryTableDetails.vue

@@ -11,7 +11,8 @@
       class="time-form"
       :selection.sync="selection"
       @columns-change="handleColumnChange"
-      @selection-change="handleSelectionChange"
+      @select="handleSelectionChange"
+      @select-all="handleSelectionChange"
       :cache-key="cacheKeyUrl"
       @done="handleDone"
     >
@@ -907,7 +908,6 @@ export default {
       return [...baseColumns, ...additionalColumns, ...remainingColumns];
     }
   },
-
   created() {
     this.requestDict('产地');
     this.requestDict('商品价格类型');
@@ -915,7 +915,8 @@ export default {
   methods: {
     handleDone() {
       if(this.isSelected) {
-        // this.$refs.table.setSelectedRowKeys(this.selectedIds);
+        console.log('selectedIds~~~~~', this.selectedIds)
+        this.$refs.table.setSelectedRowKeys(this.selectedIds);
       }
     },
     handleSelectionChange(val) {

+ 4 - 3
src/views/saleManage/saleOrder/adjustmentNote‌/components/addAdjustDialog.vue

@@ -165,7 +165,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label-width="100px" label="优惠后总金额:" prop="adjustDiscountAmount">
+            <el-form-item label-width="115px" label="优惠后总金额:" prop="adjustDiscountAmount">
               <el-input
                 clearable
                 type="number"
@@ -452,9 +452,10 @@
               this.selectIds = this.adjustData.map(item => item.sourceDetailId);
               this.form = data;
               console.log('tempdata~~~', this.form, data);
+              this.$refs.inventoryTableRef && this.$refs.inventoryTableRef.putTableValue(data);
               this.$refs.inventoryTableDetailsRef &&
                 this.$refs.inventoryTableDetailsRef.putTableValue(tempdata);
-              this.$refs.inventoryTableRef && this.$refs.inventoryTableRef.putTableValue(data);
+              
             // });
             
           }
@@ -623,7 +624,7 @@
               // returnSourceType: data.returnSourceType,
               // storemanIds: storemanIds.toString(),
               businessCode: data.orderNo,
-              businessName: data.createUserName,
+              businessName: '销售订单冲差',
               businessType: '冲差单'
             }
           };

+ 1 - 1
src/views/saleManage/saleOrder/adjustmentNote‌/index.vue

@@ -454,7 +454,7 @@
             variables: {
               // type: '1',
               businessCode: res.orderNo,
-              businessName: res.createUserName,
+              businessName: '销售订单冲差',
               businessType: '冲差单'
             }
             // callBackMethodType : '1',

+ 1 - 2
src/views/saleManage/saleOrder/index.vue

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