浏览代码

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

chenrui 1 年之前
父节点
当前提交
8dfb11d4ac

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -24,7 +24,7 @@
             <span v-if="form.gateType==='RATIO_AMOUNT'">购买门槛产品金额 {{ form.gateValue*100 }}% 作为配额 </span>
             <span v-if="form.gateType==='MIN_AMOUNT'">购买门槛产品满最低金额 {{ form.gateValue }} 元,不限制配额。</span>
             <span v-if="form.gateType==='FIXED_AMOUNT'&&form.promotionRuleType !='PROMO_PROD'">购买满 {{ form.gateValue }} 元门槛产品,可使用 {{ form.quotaAmount }} 元配额,采购规则中的正价商品(配额算销售额)</span>
-            <span v-if="form.gateType==='FIXED_AMOUNT'&&form.promotionRuleType ==='PROMO_PROD'">购买每满 {{ form.gateValue }} {{ form.regularUnit==='YUAN'?'元':'个' }}门槛产品,可采购 {{ form.quotaAmount }} 个特价产品(配额算销售额)</span>
+            <span v-if="form.gateType==='FIXED_AMOUNT'&&form.promotionRuleType ==='PROMO_PROD'">购买每满 {{ form.gateValue }} {{ form.gateUnit==='YUAN'?'元':'个' }}门槛产品,可采购 {{ form.quotaAmount }} 个特价产品(配额算销售额)</span>
           </div>
         </a-form-model-item>
         <!-- 买产品送产品 -->

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -268,7 +268,7 @@ export default {
         if(this.promoRuleData.promotionRuleType!='PROMO_PROD'){
           tabList.push({text:'正价产品',val:'REGULAR'})
         }
-        if(this.promoRuleData.regularPromotionSameFlag==='0'||this.promoRuleData.scopeFlag==='0'||isMcpScge){
+        if(this.promoRuleData.regularPromotionSameFlag==='0'||this.promoRuleData.scopeFlag==='0'){
           const levelText = promo.countData.scopeLevelFlag && isMcpScge ? '(阶梯'+promo.countData.scopeLevel+')' : ''
           tabList.push({text:'促销产品'+ levelText ,val:'GIFT'})
         }