lilei 7 месяцев назад
Родитель
Сommit
828bccc264

+ 6 - 15
src/views/easyPassManagement/promotionalActivities/addPromotionModal.vue

@@ -186,7 +186,6 @@ export default {
       chooseSnList: [], // 已选经销商sn集合
       openDealerModal: false, // 经销商弹窗
       hasEq: null, // 选择经销商数据是否发生变化
-      oldDealerFlag: null, // 编辑页面,初始选择经销商值
       isAllDealerFlag: null, // 是否是全部经销商
       form: {
         promoType: undefined, // 促销类型
@@ -220,12 +219,6 @@ export default {
     },
     // 参与经销商 change
     changeDealerScope (val) {
-      // 全部切部分
-      if (this.isAllDealerFlag == '1' && this.isAllDealerFlag != val) {
-        this.oldDealerFlag = '1'
-      } else {
-        this.oldDealerFlag = '0'
-      }
       const _this = this
       _this.form.allDealerFlag = val
       if (val == '1' || !val) {
@@ -245,7 +238,6 @@ export default {
     // 部分经销商  选择经销商成功
     addDealerOk (list) {
       const _this = this
-      _this.hasEq = list.filter(item => !this.chooseDealerList.map(k => k.dealerSn).includes(item.dealerSn))
       _this.chooseDealerList = list
       _this.openDealerModal = false
     },
@@ -286,20 +278,17 @@ export default {
             }
             formData.dealerSnList = _this.chooseDealerList.map(con => con.dealerSn)
           }
-          delete formData.time
-          delete formData.shopPromoDealerList
           if (_this.itemSn && _this.itemSn.length > 0) {
-            console.log('22222222222222:', _this.oldDealerFlag)
-            if (_this.chooseProductNum > 0 && ((_this.hasEq && _this.hasEq.length > 0) && _this.oldDealerFlag != '1')) {
+            const hasEq = _this.chooseDealerList.filter(item => !formData.shopPromoDealerList.map(k => k.dealerSn).includes(item.dealerSn))
+            const hasEq1 = _this.isAllDealerFlag == 0 && formData.allDealerFlag == 1 // 部分变全部
+            console.log(hasEq, hasEq1)
+            if (_this.chooseProductNum > 0 && (hasEq && hasEq.length > 0 || hasEq1)) {
               _this.$confirm({
                 title: '提示',
                 content: <div>变更【参与经销商】后将会【<span style="color:red">清空</span>】已选产品列表,确定变更吗?</div>,
                 centered: true,
                 onOk () {
                   _this.saveSuccess(formData, '1')
-                },
-                onCancel () {
-                  console.log('取消变更经销商')
                 }
               })
             } else {
@@ -314,6 +303,8 @@ export default {
     saveSuccess (ajaxData, type) {
       const _this = this
       _this.spinning = true
+      delete ajaxData.time
+      delete ajaxData.shopPromoDealerList
       ajaxData.saveType = 'alone'
       saveShopPromo(ajaxData).then(res => {
         if (res.status == 200) {