浏览代码

修改bug

chenrui 1 年之前
父节点
当前提交
5df91165b4

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

@@ -90,7 +90,7 @@
               <div v-if="record.giveRuleType==='RATIO' &&record.giveRuleList && record.giveRuleList.length>0 ">
                 <span>按比例;</span>
                 <div v-for="item in record.giveRuleList" :key="item.scopeLevel">
-                  {{ item.scopeLevel }}、产品购买满{{ item.regularValue }}{{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送该规则订单金额的{{ item.promotionValue }}%为促销品采购额
+                  {{ item.scopeLevel }}、产品购买满{{ item.regularValue }}{{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送正价产品总金额的{{ item.promotionValue }}%为促销品采购额
                 </div>
               </div>
             </div>

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

@@ -40,7 +40,7 @@
           <div v-if="form.giveRuleType==='SUM_MONEY'">购买满{{ form.giveRuleList[0].regularValue }}{{ form.giveRuleList[0].regularUnit==='YUAN'?'元':'个' }}正价产品,送{{ form.giveRuleList[0].promotionValue }}元<span v-if="form.giveRuleList[0].regularUnit==='YUAN'">({{ perCentNum }}%促销品采购额)</span></div>
           <div v-if="form.giveRuleType==='RATIO' &&form.giveRuleList && form.giveRuleList.length>0 ">
             <div v-for="item in form.giveRuleList" :key="item.scopeLevel">
-              {{ item.scopeLevel }}、产品购买满{{ item.regularValue }}{{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送该规则订单金额的{{ item.promotionValue }}%为促销品采购额
+              {{ item.scopeLevel }}、产品购买满{{ item.regularValue }}{{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送正价产品总金额的{{ item.promotionValue }}%为促销品采购额
             </div>
           </div>
         </a-form-model-item>

+ 1 - 2
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -100,9 +100,8 @@
           <!-- 参与客户 -->
           <template slot="joinCustomers" slot-scope="text, record">
             <span class="joinCustomer" v-if="record.dealerScope ==='ALL_DEALER'" @click="handleCustomers(record)">全部客户</span>
-            <span class="joinCustomer" v-else @click="handleCustomers(record)">共有<span style="color:#39f;vertical-align:top;">{{ record.dealerSnList?record.dealerSnList.length:0 }}</span>个客户</span>
+            <span class="joinCustomer" v-else @click="handleCustomers(record)">共有<span style="color:#39f;vertical-align:top;">{{ record.dealerQty ||0 }}</span>个客户</span>
             <a-badge count="审" v-show="record.dealerAuditFlag == 1 &&(record.state==='NOT_START'||record.state==='RUNNING') " :number-style="{ backgroundColor: '#F5222D', zoom:'80%' }" />
-            <!-- dealerAuditFlag  1 是 0否 -->
           </template>
           <!-- 发布状态 -->
           <template slot="releaseStatus" slot-scope="text, record">

+ 19 - 11
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -137,7 +137,7 @@
                 </a-select-option>
               </a-select>
-              正价产品,送该规则订单金额的
+              正价产品,送正价产品总金额的
               <a-input-number
                 v-model="con.promotionValue"
                 :min="0"
@@ -239,7 +239,9 @@ export default {
         quotaAmount: undefined,
         giveRuleType: 'SUM_MONEY',
         regularUnit: 'YUAN',
-        scopeFlag: '1'
+        scopeFlag: '1',
+        gateInfo: undefined,
+        ruleInfo: undefined
       },
       rules: {
         description: [ { required: true, message: '请输入规则简称', trigger: 'blur' } ],
@@ -392,8 +394,6 @@ export default {
           })
           form.promotionSn = _this.promotionSn
           form.giveRuleList = _this.fullGiftRuleList
-          delete form.regularUnit
-
           if (form.gateFlag == '1') {
             if (form.gateType === 'RATIO_AMOUNT') {
               form.gateInfo = '购买门槛产品金额' + form.gateValue + '作为配额'
@@ -403,13 +403,19 @@ export default {
               form.gateInfo = '购买满' + form.gateValue + '元门槛产品,可使用' + form.quotaAmount + '元配额,采购规则中的正价商品(配额算销售额)'
             }
           }
-          var newInfo = `<div>${form.accrualFlag == '1' ? '数量叠加;' : ''}${form.convertExpenseFlag == '1' ? '可转费用报销单;' : ''}</div>`
-          _this.fullGiftRuleList.forEach(item => {
-            newInfo += `<div>${form.regularSameFlag == '1' ? '同款' : '不同款'}产品购买满${item.regularValue}${form.regularUnit == 'YUAN' ? '元' : '个'}正价产品,送${item.promotionValue}个促销产品</div>`
-          })
-          newInfo += form.restrictFlag == '1' ? `<div>限制正价产品${form.restrictCategory}款</div>` : ''
+          var newInfo = ''
+          if (form.giveRuleType == 'SUM_MONEY') {
+            newInfo = `<span>金额叠加;购买满${_this.fullGiftRuleList[0].regularValue}${form.regularUnit == 'YUAN' ? '元' : '个'}正价产品,送${_this.fullGiftRuleList[0].promotionValue}元</span>`
+            if (form.regularUnit == 'YUAN') {
+              newInfo += `<span>(${((_this.fullGiftRuleList[0].promotionValue / _this.fullGiftRuleList[0].regularValue) * 100).toFixed(2)} %促销品采购额)</span>`
+            }
+          } else {
+            newInfo = '按比例;'
+            _this.fullGiftRuleList.forEach(item => {
+              newInfo += `<div>购买满${item.regularValue}${form.regularUnit == 'YUAN' ? '元' : '个'}正价产品,送正价产品总金额的${item.promotionValue}%为促销品采购额</div>`
+            })
+          }
           form.ruleInfo = newInfo
-
           _this.spinning = true
           promotionSave(form).then(res => {
             if (res.status == 200) {
@@ -466,7 +472,9 @@ export default {
         scopeFlag: '1',
         gateProductList: undefined,
         giftProductList: undefined,
-        regularProductList: undefined
+        regularProductList: undefined,
+        gateInfo: undefined,
+        ruleInfo: undefined
       }
       this.$nextTick(() => {
         this.$refs.ruleForm.resetFields()

+ 19 - 1
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -254,7 +254,9 @@ export default {
         gateValue: undefined,
         regularUnit: 'YUAN',
         quotaAmount: undefined,
-        discountType: '0'// 特价规则
+        discountType: '0', // 特价规则
+        gateInfo: undefined,
+        ruleInfo: undefined
       },
       rules: {
         description: [ { required: true, message: '请输入规则简称', trigger: 'blur' } ],
@@ -398,6 +400,22 @@ export default {
             form.specialValue = _this.setTableData[0].specialValue
           }
           form.promotionSn = _this.promotionSn
+          if (form.gateFlag == '1') {
+            if (form.gateType === 'RATIO_AMOUNT') {
+              form.gateInfo = '购买门槛产品金额' + form.gateValue + '作为配额'
+            } else if (form.gateType === 'MIN_AMOUNT') {
+              form.gateInfo = '购买门槛产品满最低金额' + form.gateValue + '不限制配额'
+            } else {
+              form.gateInfo = '购买每满' + form.gateValue + form.regularUnit == 'YUAN' ? '元' : '个' + '门槛产品,可采购' + form.quotaAmount + '个特价产品(配额算销售额)'
+            }
+          }
+          if (form.discountType == '0') {
+            form.ruleInfo = '手动输入特价'
+          } else if (form.discountType == '1') {
+            form.ruleInfo = '各级别价打折;省级折扣' + form.provinceValue + '%,市级折扣' + form.cityValue + '%,特约折扣' + form.specialValue + '%'
+          } else {
+            form.ruleInfo = '各级别价直降;省级直降' + form.provinceValue + ',市级直降' + form.cityValue + ',特约直降' + form.specialValue
+          }
           _this.spinning = true
           promotionSave(form).then(res => {
             if (res.status == 200) {