Explorar el Código

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

lilei hace 1 año
padre
commit
105be1aa40

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

@@ -73,7 +73,7 @@
               {{ record.regularSameFlag==1?'同款':'不同款' }}产品购买满{{ record.regularQty }}个正价产品,送{{ record.promotionQty }}个促销产品{{ record.promotionRuleType ==='BUY_PROD_GIVE_MONEY'?(record.accrualFlag&&record.accrualFlag==1)?'(金额叠加)':'(金额不叠加)':'' }}
             </div>
             <div v-else-if="record.promotionRuleType == 'BUY_PROD_GIVE_MONEY'">
-              {{ record.regularSameFlag==1?'同款':'不同款' }}产品购买满{{ record.regularAmount }}元正价产品,送{{ record.giveAmount }}元促销品采购额{{ record.promotionRuleType ==='BUY_PROD_GIVE_MONEY'?(record.accrualFlag&&record.accrualFlag==1)?'(金额叠加)':'(金额不叠加)':'' }}
+              购买满{{ record.regularAmount }}元正价产品,送{{ record.giveAmount }}元促销品采购额{{ record.promotionRuleType ==='BUY_PROD_GIVE_MONEY'?(record.accrualFlag&&record.accrualFlag==1)?'(金额叠加)':'(金额不叠加)':'' }}
             </div>
             <div v-else>
               特价产品

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

@@ -32,7 +32,7 @@
           <span v-if="form.restrictFlag&&form.restrictFlag==1">,限制正价产品款数{{ form.restrictCategory }}</span>
         </a-form-model-item>
         <a-form-model-item label="满赠规则" prop="regularSameFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_MONEY'">
-          {{ form.regularSameFlag==='1'?'同款':'不同款' }}产品购买满{{ form.regularAmount }}元正价产品,送{{ form.giveAmount }}元({{ perCentNum }}%促销品采购额)
+          购买满{{ form.regularAmount }}元正价产品,送{{ form.giveAmount }}元({{ perCentNum }}%促销品采购额)
         </a-form-model-item>
         <a-form-model-item label="数量叠加" prop="accrualFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_PROD'&&form.accrualFlag">{{ form.accrualFlag==='1'?'是':'否' }}</a-form-model-item>
         <a-form-model-item label="金额叠加" prop="accrualFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_MONEY'&&form.accrualFlag">{{ form.accrualFlag==='1'?'是':'否' }}</a-form-model-item>
@@ -121,7 +121,7 @@
             </template>
             <!-- 品牌 -->
             <template slot="productBrand" slot-scope="text, record">
-              <div  class="tabBox" v-if="record.productBrandList && record.productBrandList.length>0">
+              <div class="tabBox" v-if="record.productBrandList && record.productBrandList.length>0">
                 <a-tag style="margin-bottom:5px;" v-for="item in record.productBrandList" :key="item.id">{{ item.productBrandName }}</a-tag>
               </div>
             </template>

+ 5 - 7
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -61,17 +61,17 @@
             </div>
           </div>
         </a-form-model-item>
-        <a-form-model-item label="满赠规则" prop="regularSameFlag">
+        <a-form-model-item label="满赠规则" prop="regularAmount">
           <div class="ruleDescList">
-            <a-select default-value="1" v-model="form.regularSameFlag" style="width: 100px" size="small">
+            <!-- <a-select default-value="1" v-model="form.regularSameFlag" style="width: 100px" size="small">
               <a-select-option value="1">
                 同款
               </a-select-option>
               <a-select-option value="0">
                 不同款
               </a-select-option>
-            </a-select>
-            产品购买满
+            </a-select> -->
+            购买满
             <a-input-number
               v-model="form.regularAmount"
               @blur="calculatePrice"
@@ -228,7 +228,6 @@ export default {
         gateType: undefined,
         gateAmount: undefined,
         quotaAmount: undefined,
-        regularSameFlag: '1', // 满赠规则  不同款商品
         regularAmount: undefined,
         giveAmount: undefined,
         restrictCategory: '',
@@ -242,7 +241,7 @@ export default {
       rules: {
         description: [ { required: true, message: '请输入规则简称', trigger: 'blur' } ],
         gateFlag: [ { required: true, message: '请选择规则门槛', trigger: 'change' } ],
-        regularSameFlag: [{ required: true, message: '请选择满赠规则', trigger: 'change' }],
+        regularAmount: [{ required: true, message: '请输入满赠规则', trigger: 'blur' }],
         accrualFlag: [{ required: true, message: '请选择数量是否叠加', trigger: 'change' }],
         minOrderFlag: [{ required: true, message: '请选择订单起订金额', trigger: 'change' }],
         upperLimitFlag: [{ required: true, message: '请选择活动经费上限', trigger: 'change' }],
@@ -429,7 +428,6 @@ export default {
         gateType: undefined,
         gateAmount: undefined,
         quotaAmount: undefined,
-        regularSameFlag: '1', // 满赠规则  不同款商品
         regularAmount: undefined,
         giveAmount: undefined,
         restrictCategory: '',