소스 검색

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

chenrui 1 년 전
부모
커밋
b4f71c3d2b
1개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 6 3
      src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

+ 6 - 3
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -257,8 +257,11 @@ export default {
       this.queryParam.dealerLevel = data.buyerLevel
       this.queryParam.promoRuleSn = promo.promoRuleSn
       this.queryParam.salesPromoSn = promo.salesPromoSn
+      
       // 是否是买产品送产品
-      const isMcpScge = promo.promotionRule&&promo.promotionRule.convertExpenseFlag==1&&promo.promotionRule.promotionRuleType=='BUY_PROD_GIVE_PROD'
+      const isMcpScp = this.promoRuleData&&this.promoRuleData.convertExpenseFlag==1&&this.promoRuleData.promotionRuleType=='BUY_PROD_GIVE_PROD'
+      // 是否卖产品送采购额
+      const isMcpScge = this.promoRuleData.promotionRuleType=='BUY_PROD_GIVE_MONEY'&&this.promoRuleData.scopeFlag==='1'
       
       const tabList = []
       if(this.promoRuleData){ 
@@ -268,8 +271,8 @@ export default {
         if(this.promoRuleData.promotionRuleType!='PROMO_PROD'){
           tabList.push({text:'正价产品',val:'REGULAR'})
         }
-        if(this.promoRuleData.regularPromotionSameFlag==='0'||this.promoRuleData.scopeFlag==='0'){
-          const levelText = promo.countData.scopeLevelFlag && isMcpScge ? '(阶梯'+promo.countData.scopeLevel+')' : ''
+        if(this.promoRuleData.regularPromotionSameFlag==='0'||this.promoRuleData.scopeFlag==='0'||isMcpScge){
+          const levelText = promo.countData.scopeLevelFlag && isMcpScp ? '(阶梯'+promo.countData.scopeLevel+')' : ''
           tabList.push({text:'促销产品'+ levelText ,val:'GIFT'})
         }
         if(this.promoRuleData.promotionRuleType=='PROMO_PROD'){