Browse Source

修改bug

chenrui 5 months ago
parent
commit
ac1d2856b3

+ 4 - 4
src/views/salesManagement/salesQueryNew/comps/importGuideModal.vue

@@ -116,13 +116,13 @@ export default {
   },
   methods: {
     pageInit (params, row) {
-      this.curRowData = row
-      this.isTotalFlag = params.promoProductClz === 'BORROW_GATE' || params.promoProductClz === 'BORROW_REGULAR'
+      this.curRowData = row || null
+      this.isTotalFlag = params.promoProductClz && (params.promoProductClz === 'BORROW_GATE' || params.promoProductClz === 'BORROW_REGULAR')
       // 判断是否是累计产品导入
-      if (params.promoProductClz === 'BORROW_GATE' || params.promoProductClz === 'BORROW_REGULAR') {
+      if (this.isTotalFlag) {
         params.promoProductClz = params.promoProductClz.split('_')[1]
       }
-      this.uploadParams = params
+      this.uploadParams = { ...this.uploadParams, ...params }
     },
     // 下一步
     handlerNextStep () {

+ 7 - 2
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -91,7 +91,7 @@
             type="link"
             class="button-info"
             id="salesEdit-import-product"
-            @click="openGuideModal=true"><a-icon type="login" /> 导入产品</a-button>
+            @click="handleGuideModal"><a-icon type="login" /> 导入产品</a-button>
           <a-button
             id="salesEdit-new-product"
             type="link"
@@ -188,7 +188,7 @@
       </template>
     </v-table>
     <!-- 导入产品 -->
-    <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: salesBillSn}" @close="closeGuideModel" @ok="hanldeOk" />
+    <importGuideModal ref="guideModal" :openModal="openGuideModal" @close="closeGuideModel" @ok="hanldeOk" />
     <!-- 仓库设置 -->
     <setWarehouse :show="openWarehouseModal" :title="warehouseTit" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
     <!-- 换促销 -->
@@ -364,6 +364,11 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
+    // 导入产品
+    handleGuideModal () {
+      this.$refs.guideModal.pageInit({ salesBillSn: this.salesBillSn })
+      this.openGuideModal = true
+    },
     // 仓库下拉列表数据加载完成
     warehouseLoad (sn, list) {
       this.warehouseDataList = list

+ 5 - 3
src/views/salesManagement/salesQueryNew/edit.vue

@@ -191,8 +191,7 @@ import {
   salesPromoQueryList,
   salesPromoDiscountSort,
   salesQueryUnPartPromo,
-  salesPromoValidaSubmit,
-  getThirdStockQty } from '@/api/salesNew'
+  salesPromoValidaSubmit } from '@/api/salesNew'
 
 export default {
   name: 'SalesNewEdit',
@@ -335,13 +334,16 @@ export default {
     // 提交销售单
     async submitResult () {
       const _this = this
-      this.spinning = true
+      _this.spinning = true
       // 校验活动规则
       const vaildActive = await salesPromoValidaSubmit({ salesBillSn: this.salesBillSn }).then(res => res.data)
       const a = vaildActive.filter(item => item.type == 1) // 不可提交
       const d = vaildActive.filter(item => item.type == 'price_less_0') // 不可提交
       const b = vaildActive.filter(item => item.type == 0) // 文字提示,可跳过继续提交
       const c = vaildActive.filter(item => item.type == 'price_less_cost' || item.type == 'wait_up_audit_price_less_cost') // 价格校验表格提示,可跳过继续提交
+      if (vaildActive && vaildActive.length == 0) {
+        this.submitOrder()
+      }
       // 不可提交
       // 弹出不符合规则弹框
       if (a.length > 0) {