lilei 2 weeks ago
parent
commit
7cc65b3bdb

+ 5 - 4
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -38,7 +38,7 @@ import detailModal from '@/views/promotionRulesManagement/dealerPromotions/detai
 import totalProductDetailModal from './totalProductDetailModal.vue'
 import totalProductDetailModal from './totalProductDetailModal.vue'
 import normalProductDetailModal from './normalProductDetailModal.vue'
 import normalProductDetailModal from './normalProductDetailModal.vue'
 import ImportGuideModal from './importGuideModal.vue'
 import ImportGuideModal from './importGuideModal.vue'
-import { salesDisablePromo, salesEnablePromoPromo, salesBatchInsert } from '@/api/salesDetailNew'
+import { salesDisablePromo, salesEnablePromoPromo, salesBatchInsert, salesDetailInsertBatchBorrow } from '@/api/salesDetailNew'
 import { salesPromoSaveSort } from '@/api/salesNew'
 import { salesPromoSaveSort } from '@/api/salesNew'
 export default {
 export default {
   mixins: [commonMixin],
   mixins: [commonMixin],
@@ -854,7 +854,8 @@ export default {
       this.openGuideModal = false
       this.openGuideModal = false
     },
     },
     // 批量导入产品
     // 批量导入产品
-    hanldeImportOk (salesBillDetailList, row, promoProductClz) {
+    hanldeImportOk (salesBillDetailList, row, promoProductClz, isTotalFlag) {
+      const fun = isTotalFlag ? salesDetailInsertBatchBorrow : salesBatchInsert
       const params = {
       const params = {
         salesBillSn: this.salesBillSn,
         salesBillSn: this.salesBillSn,
         salesBillDetailList: salesBillDetailList
         salesBillDetailList: salesBillDetailList
@@ -865,9 +866,9 @@ export default {
         params.promoRuleSn = row.promoRuleSn
         params.promoRuleSn = row.promoRuleSn
         params.promoProductClz = promoProductClz
         params.promoProductClz = promoProductClz
       }
       }
-      salesBatchInsert(params).then(res => {
+      fun(params).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
-          this.$message.success('产品导入成功', 2.5)
+          this.$message.success(isTotalFlag ? '累计产品导入成功' : '产品导入成功', 2.5)
           this.$emit('refash', '', 'import')
           this.$emit('refash', '', 'import')
         }
         }
       })
       })

+ 2 - 1
src/views/salesManagement/salesQueryNew/comps/importGuideModal.vue

@@ -117,6 +117,7 @@ export default {
   },
   },
   methods: {
   methods: {
     pageInit (params, row, title) {
     pageInit (params, row, title) {
+      console.log(params)
       this.title = title ? ('导入' + title) : '导入产品'
       this.title = title ? ('导入' + title) : '导入产品'
       this.curRowData = row || null
       this.curRowData = row || null
       this.isTotalFlag = params.promoProductClz && (params.promoProductClz === 'BORROW_GATE' || params.promoProductClz === 'BORROW_REGULAR')
       this.isTotalFlag = params.promoProductClz && (params.promoProductClz === 'BORROW_GATE' || params.promoProductClz === 'BORROW_REGULAR')
@@ -146,7 +147,7 @@ export default {
     // 导入
     // 导入
     hanldeOk (obj) {
     hanldeOk (obj) {
       if (obj && obj.length > 0) {
       if (obj && obj.length > 0) {
-        this.$emit('ok', obj, this.curRowData, this.uploadParams.promoProductClz)
+        this.$emit('ok', obj, this.curRowData, this.uploadParams.promoProductClz, this.isTotalFlag)
         this.isShow = false
         this.isShow = false
       }
       }
     },
     },