Browse Source

特价规则叠加修改

chenrui 7 tháng trước cách đây
mục cha
commit
01ba52ce7f

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

@@ -103,8 +103,8 @@
               <span v-else>--</span>
             </div>
             <div v-else-if="record.promotionRuleType == 'PROMO_PROD'">
-              <div v-if="record.stackFlag==='1'">规则叠加;</div>
               <span v-if="record.discountType ==='0'">手动输入特价</span>
+              <div v-if="record.stackFlag==='1'&&record.discountType !='0'">规则叠加;</div>
               <span v-else-if="record.discountType ==='1'">各级别价打折;省级折扣{{ record.provinceValue.toFixed(2) }}%,市级折扣{{ record.cityValue.toFixed(2) }}%,特约折扣{{ record.specialValue.toFixed(2) }}%</span>
               <span v-else>各级别价直降;省级直降{{ toThousands(record.provinceValue) }},市级直降{{ toThousands(record.cityValue) }},特约直降{{ toThousands(record.specialValue) }}</span>
               <div v-if="record.borrowTimeLimtType">产品累计:{{ record.borrowTimeLimtTypeDictValue }}{{ record.borrowedShowFlag==='1'?',':'' }}<span v-if="record.borrowedShowFlag==='1'">加盟商显示“转促”标签;</span></div>

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

@@ -18,7 +18,7 @@
         <a-form-model-item label="规则简称" v-if="form.description">
           {{ form.description }}
         </a-form-model-item>
-        <a-form-model-item label="规则叠加" v-if="form.stackFlag">
+        <a-form-model-item label="规则叠加" v-if="form.stackFlag&&form.promotionRuleType !='PROMO_PROD'">
           {{ form.stackFlag==='1'?'是':'否' }}
         </a-form-model-item>
         <a-form-model-item label="规则门槛" v-if="form.gateFlag">
@@ -80,6 +80,9 @@
         <a-form-model-item label="采购额适用范围" v-if="form.scopeFlag" prop="scopeFlag" >
           {{ form.scopeFlag==='1'?'全部产品':'部分产品' }}
         </a-form-model-item>
+        <a-form-model-item label="规则叠加" v-if="form.stackFlag&&form.promotionRuleType==='PROMO_PROD'&&form.discountType!='0'">
+          {{ form.stackFlag==='1'?'是':'否' }}
+        </a-form-model-item>
       </a-form-model>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <div class="flex">

+ 11 - 11
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -25,17 +25,6 @@
             placeholder="请输入规则简称(最多20个字符)"
             :maxLength="20"></a-input>
         </a-form-model-item>
-        <a-form-model-item label="规则叠加">
-          <v-select
-            style="width:40%;"
-            size="small"
-            v-model="form.stackFlag"
-            id="promotionList-stackFlag"
-            code="FLAG"
-            placeholder="请选择是否叠加规则"
-            allowClear></v-select>
-          <span>(销售单内的产品可同时参与多个叠加规则)</span>
-        </a-form-model-item>
         <a-form-model-item label="规则门槛" prop="gateFlag">
           <div class="fixWidthBox">
             <a-radio-group id="promotionList-gateFlag" v-model="form.gateFlag" button-style="solid" size="small" @change="handleChange">
@@ -229,6 +218,17 @@
             </template>
           </a-table>
         </a-form-model-item>
+        <a-form-model-item label="规则叠加" v-if="form.discountType!=0">
+          <v-select
+            style="width:40%;"
+            size="small"
+            v-model="form.stackFlag"
+            id="promotionList-stackFlag"
+            code="FLAG"
+            placeholder="请选择是否叠加规则"
+            allowClear></v-select>
+          <span>(销售单内的产品可同时参与多个叠加规则)</span>
+        </a-form-model-item>
       </a-form-model>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <div class="flex" style="margin-bottom:10px;">