lilei 4 weeks ago
parent
commit
af02415598

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

@@ -4,7 +4,7 @@
     class="promotionList-modal"
     :footer="null"
     :maskClosable="false"
-    title="产品送产品-规则设置"
+    title="产品送产品-规则设置"
     v-model="isShow"
     @cancel="isShow=false"
     width="70%">

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

@@ -273,7 +273,7 @@ export default {
 
       // 是否是买产品送产品
       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 giveRuleList = this.promoRuleData && this.promoRuleData.giveRuleList

+ 2 - 4
src/views/salesManagement/salesQueryNew/newPromoModal.vue

@@ -25,12 +25,10 @@
         <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
         <a-button
           type="primary"
-          style="margin-right: 10px"
-          class="button-info"
           :loading="confirmLoading"
           @click="handleSubmit(0)"
-          id="chooseCustom-btn-submit1">仅添加</a-button>
-        <a-button type="primary" :loading="confirmLoading" @click="handleSubmit(1)" id="chooseCustom-btn-submit2">添加并适配</a-button>
+          id="chooseCustom-btn-submit1">确定</a-button>
+        <!-- <a-button type="primary" :loading="confirmLoading" @click="handleSubmit(1)" id="chooseCustom-btn-submit2">添加并适配</a-button> -->
       </div>
     </a-spin>
   </a-modal>