Quellcode durchsuchen

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

lilei vor 7 Monaten
Ursprung
Commit
02be84f619

+ 24 - 0
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -25,6 +25,17 @@
             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.gateType"
+            id="promotionList-gateType"
+            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="changeGateFlag">
@@ -188,6 +199,19 @@
             </div>
           </div>
         </a-form-model-item>
+        <a-form-model-item label="产品累计">
+          <v-select
+            style="width:40%;margin-right:10px;"
+            size="small"
+            v-model="form.gateType"
+            id="promotionList-gateType"
+            code="FLAG"
+            placeholder="请选择累计时间"
+            allowClear></v-select>
+          <a-checkbox id="promotionList-restrictFlag" :checked="form.restrictFlag === '1'" size="small" @change="onChange">
+            客户采购单显示转促标签
+          </a-checkbox>
+        </a-form-model-item>
         <a-form-model-item label="采购额适用范围" prop="scopeFlag">
           <div class="fixWidthBox">
             <a-radio-group id="promotionList-scopeFlag" v-model="form.scopeFlag" button-style="solid" size="small">

+ 24 - 0
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -25,6 +25,17 @@
             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.gateType"
+            id="promotionList-gateType"
+            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 v-model="form.gateFlag" id="promotionList-gateFlag" button-style="solid" size="small" @change="changeGateFlag">
@@ -176,6 +187,19 @@
           </a-radio-group>
           <span style="color:gray;">(如:满10送2,数量叠加则:满20送4,满30送6)</span>
         </a-form-model-item>
+        <a-form-model-item label="产品累计">
+          <v-select
+            style="width:40%;margin-right:10px;"
+            size="small"
+            v-model="form.gateType"
+            id="promotionList-gateType"
+            code="FLAG"
+            placeholder="请选择累计时间"
+            allowClear></v-select>
+          <a-checkbox id="promotionList-restrictFlag" :checked="form.restrictFlag === '1'" size="small" @change="onChange">
+            客户采购单显示转促标签
+          </a-checkbox>
+        </a-form-model-item>
         <a-form-model-item label="促销品与正品一致" prop="regularPromotionSameFlag">
           <div class="fixWidthBox">
             <a-radio-group

+ 24 - 0
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -25,6 +25,17 @@
             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.gateType"
+            id="promotionList-gateType"
+            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">
@@ -102,6 +113,19 @@
             </div>
           </div>
         </a-form-model-item>
+        <a-form-model-item label="产品累计">
+          <v-select
+            style="width:40%;margin-right:10px;"
+            size="small"
+            v-model="form.gateType"
+            id="promotionList-gateType"
+            code="FLAG"
+            placeholder="请选择累计时间"
+            allowClear></v-select>
+          <a-checkbox id="promotionList-restrictFlag" :checked="form.restrictFlag === '1'" size="small" @change="onChange">
+            客户采购单显示转促标签
+          </a-checkbox>
+        </a-form-model-item>
         <a-form-model-item label="特价规则" prop="discountType">
           <a-select
             id="promotionList-discountType"