Переглянути джерело

Merge branch 'develop_yh49_1' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh49_1

# Conflicts:
#	src/views/easyPassManagement/promotionalActivities/addPromotionModal.vue
lilei 7 місяців тому
батько
коміт
2455856a47

+ 1 - 2
src/views/easyPassManagement/promotionalActivities/addPromotionModal.vue

@@ -185,7 +185,6 @@ export default {
       chooseDealerList: [], // 已选择的经销商列表
       chooseSnList: [], // 已选经销商sn集合
       openDealerModal: false, // 经销商弹窗
-      hasEq: null, // 选择经销商数据是否发生变化
       isAllDealerFlag: null, // 是否是全部经销商
       form: {
         promoType: undefined, // 促销类型
@@ -279,7 +278,7 @@ export default {
             formData.dealerSnList = _this.chooseDealerList.map(con => con.dealerSn)
           }
           if (_this.itemSn && _this.itemSn.length > 0) {
-            const hasEq = _this.chooseDealerList.filter(item => !formData.shopPromoDealerList.map(k => k.dealerSn).includes(item.dealerSn))
+            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)) {