Pārlūkot izejas kodu

经销商促销

chenrui 1 gadu atpakaļ
vecāks
revīzija
5000c0522f

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

@@ -21,8 +21,8 @@
           <a-descriptions-item label="费用所属部门">{{ detailData.expenseDepartmentName || '--' }}</a-descriptions-item>
           <a-descriptions-item label="参与客户" v-if="detailData.dealerScope!='ALL_DEALER'"><div @click="handleSee">共<span class="link-bule">{{ detailData.dealerQty }}</span>个</div></a-descriptions-item>
           <a-descriptions-item label="参与客户" v-else>全部客户</a-descriptions-item>
-          <a-descriptions-item label="活动订单起订金额(元)">不限</a-descriptions-item>
-          <a-descriptions-item label="活动经费上限(元)">不限</a-descriptions-item>
+          <a-descriptions-item label="活动订单起订金额(元)">{{ detailData.minOrderFlag ==='0'?'不限':detailData.minOrderAmount }}</a-descriptions-item>
+          <a-descriptions-item label="活动经费上限(元)">{{ detailData.upperLimitFlag ==='0'?'不限':detailData.upperLimitAmount }}</a-descriptions-item>
           <a-descriptions-item label="促销描述" :span="2">
             <div class="descItem">{{ detailData.content || '' }}</div>
           </a-descriptions-item>

+ 14 - 5
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -64,8 +64,9 @@
         </a-form-model-item>
         <a-form-model-item label="满赠规则" prop="regularSameFlag">
           <div class="fullGiftRuleBox">
-            <div class="ruleDescList" v-for="(con,i) in form.giveRuleList" :key="i">
+            <div class="ruleDescList" v-for="(con,i) in fullGiftRuleList" :key="i">
               <span>{{ i*1+1 }}、</span>
+              <a-input type="hidden" name="scopeLevel" :value="i*1+1"/>
               <a-select default-value="1" v-model="con.regularSameFlag" style="width: 100px" size="small" @change="handleFullGift">
                 <a-select-option value="1">
                   同款
@@ -100,7 +101,7 @@
                 size="small"/>
               个促销产品
               <a-button type="link" v-if="i==0&&fullGiftRuleList&&fullGiftRuleList.length<5" class="button-info" @click="addFullGiftRule">+新增</a-button>
-              <a-button type="link" v-if="i!=0" class="button-error" @click="delFullGiftRule(i)">删除</a-button>
+              <a-button type="link" v-if="i!=0" class="button-error" @click="delFullGiftRule(con)">删除</a-button>
             </div>
           </div>
           <div class="ruleDescList">
@@ -211,9 +212,12 @@ export default {
         wrapperCol: { span: 17 }
       },
       fullGiftRuleList: [{
+        scopeLevel: undefined,
         regularSameFlag: '1',
         regularQty: undefined,
-        promotionQty: undefined
+        regularUnit: 'YUAN',
+        regularValue: undefined,
+        promotionValue: undefined
       }],
       form: {
         promotionRuleType: 'BUY_PROD_GIVE_PROD', // 买产品送产品
@@ -223,6 +227,7 @@ export default {
         gateAmount: undefined,
         quotaAmount: undefined,
         regularSameFlag: '1', // 满赠规则  不同款商品
+        regularUnit: '',
         regularQty: undefined,
         promotionQty: undefined,
         restrictFlag: '0', // 限制正价产品款数
@@ -251,14 +256,18 @@ export default {
     // 新增  满减规则  最多能添加五个
     addFullGiftRule () {
       const obj = {
+        scopeLevel: undefined,
         regularSameFlag: '1',
         regularQty: undefined,
-        promotionQty: undefined
+        regularUnit: 'YUAN',
+        regularValue: undefined,
+        promotionValue: undefined
       }
       this.fullGiftRuleList.push(obj)
     },
     // 删除满减规则
-    delFullGiftRule (pos) {
+    delFullGiftRule (con) {
+      const pos = this.fullGiftRuleList.findIndex(item => { return item.scopeLevel == con.scopeLevel })
       this.fullGiftRuleList.splice(pos, 1)
     },
     // 满赠  同款    促销品与正品一致  默认是 可修改

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.103:8602/ocs-admin',
+        // target: 'http://192.168.2.103:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {