lilei 1 month ago
parent
commit
22f40eac53

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

@@ -21,6 +21,7 @@
           <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="最大参与次数">{{ detailData.dealerMaxJoinFlag=='1' ? detailData.dealerMaxJoinQty :'不限' }}</a-descriptions-item>
           <a-descriptions-item label="活动订单起订金额(元)">{{ detailData.minOrderFlag ==='0'?'不限':detailData.minOrderAmount?toThousands(detailData.minOrderAmount):'--' }}</a-descriptions-item>
           <a-descriptions-item label="活动经费上限(元)":span="2">{{ detailData.upperLimitFlag ==='0'?'不限':detailData.upperLimitAmount? toThousands(detailData.upperLimitAmount):'--' }}</a-descriptions-item>
           <a-descriptions-item label="促销描述" :span="3">

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

@@ -410,10 +410,10 @@ export default {
           // 阶梯
           if (resultObj.discountType != '0') {
             if (resultObj.discountType == '1' && resultObj.specialDiscountList) {
-              const utd = { 'YUAN': '元', 'GE': '个' }
+              const utd = { 'YUAN': '元(原价)', 'GE': '个' }
               this.setTableData = resultObj.specialDiscountList.map(item => {
                 return {
-                  orginAmountValue: this.toThousands(item.discountScopeValue) + ' ' + utd[item.unitType],
+                  orginAmountValue: '购买满 ' + this.toThousands(item.discountScopeValue) + ' ' + utd[item.unitType],
                   unitType: item.unitType,
                   provinceValue: item.provinceDiscountRate,
                   cityValue: item.cityDiscountRate,

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

@@ -148,35 +148,38 @@
             <template slot="provinceDiscount" slot-scope="text, record">
               <a-input-number
                 size="small"
+                style="width:70px;"
                 :id="'promotionList-provinceDiscount'+record.id"
                 v-model="record.provinceValue"
                 :min="0"
                 :step="1"
                 :precision="2"
                 :max="99999999"
-                placeholder="请输入"/>%
+                placeholder="请输入"/> %
             </template>
             <template slot="cityDiscount" slot-scope="text, record">
               <a-input-number
                 size="small"
+                style="width:70px;"
                 :id="'promotionList-cityValue'+record.id"
                 v-model="record.cityValue"
                 :min="record.provinceValue||0"
                 :step="1"
                 :precision="2"
                 :max="99999999"
-                placeholder="请输入"/>%
+                placeholder="请输入"/> %
             </template>
             <template slot="specialDiscount" slot-scope="text, record">
               <a-input-number
                 size="small"
+                style="width:70px;"
                 :id="'promotionList-specialValue'+record.id"
                 v-model="record.specialValue"
                 :min="record.cityValue ||0"
                 :step="1"
                 :precision="2"
                 :max="99999999"
-                placeholder="请输入"/>%
+                placeholder="请输入"/> %
             </template>
             <template slot="provincePrice" slot-scope="text, record">
               <a-input-number
@@ -216,16 +219,18 @@
             </template>
             <template slot="orginAmount" slot-scope="text, record, index">
               <div style="display:flex;align-items: center;">
+                <span>购买满</span>
                 <a-input-number
                   size="small"
+                  style="width:100px;margin:0 5px;"
                   :id="'promotionList-orginAmountValue'+record.id"
                   v-model="record.orginAmountValue"
-                  :min="0"
-                  :precision="2"
+                  :min="index>0?setTableData[index-1].orginAmountValue:0"
+                  :precision="record.unitType=='YUAN'?2:0"
                   :max="99999999"
                   placeholder="请输入"/>
-                <a-select size="small" style="width:50px;" v-model="record.unitType" @change="changeUnitType(index)" :disabled="index>0">
-                  <a-select-option value="YUAN">元</a-select-option>
+                <a-select size="small" style="width:80px;" v-model="record.unitType" @change="changeUnitType(index)" :disabled="index>0">
+                  <a-select-option value="YUAN">元(原价)</a-select-option>
                   <a-select-option value="GE">个</a-select-option>
                 </a-select>
               </div>
@@ -379,10 +384,10 @@ export default {
       var arr = []
       if (_this.form.discountType === '1') {
         arr = [
-          { title: '特价产品原价金额', scopedSlots: { customRender: 'orginAmount' }, width: '30%', align: 'left' },
-          { title: '省价折扣', scopedSlots: { customRender: 'provinceDiscount' }, width: '20%', align: 'left' },
-          { title: '市价折扣', scopedSlots: { customRender: 'cityDiscount' }, width: '20%', align: 'left' },
-          { title: '特约折扣', scopedSlots: { customRender: 'specialDiscount' }, width: '20%', align: 'left' },
+          { title: '特价产品合计', scopedSlots: { customRender: 'orginAmount' }, width: '42%', align: 'left' },
+          { title: '省价折扣', scopedSlots: { customRender: 'provinceDiscount' }, width: '16%', align: 'left' },
+          { title: '市价折扣', scopedSlots: { customRender: 'cityDiscount' }, width: '16%', align: 'left' },
+          { title: '特约折扣', scopedSlots: { customRender: 'specialDiscount' }, width: '16%', align: 'left' },
           { title: '', scopedSlots: { customRender: 'actions' }, width: '10%', align: 'center' }
         ]
       } else if (_this.form.discountType === '2') {
@@ -417,6 +422,9 @@ export default {
       const ut = this.setTableData[0].unitType
       this.setTableData = this.setTableData.map(item => {
         item.unitType = ut
+        if (ut == 'GE') {
+          item.orginAmountValue = Math.floor(item.orginAmountValue)
+        }
         return item
       })
     },
@@ -425,7 +433,7 @@ export default {
       this.form.discountType = val
       this.$refs.specialProduct.reSetTableData()
       this.setTableData = [{
-        orginAmountValue: 0,
+        orginAmountValue: undefined,
         unitType: 'YUAN',
         provinceValue: undefined,
         cityValue: undefined,
@@ -473,7 +481,7 @@ export default {
       }
       const ut = this.setTableData[0].unitType
       this.setTableData.push({
-        orginAmountValue: 0,
+        orginAmountValue: undefined,
         unitType: ut,
         provinceValue: undefined,
         cityValue: undefined,
@@ -586,8 +594,9 @@ export default {
           } else if (form.discountType == '1') {
             infoDetail += '各级别价打折;'
             form.specialDiscountList.forEach(item => {
-              const utd = { 'YUAN': '元', 'GE': '个' }
-              infoDetail += '阶梯' + item.scopeLevel + ':' + '原价:' + item.discountScopeValue + utd[item.unitType] + ',省级折扣' + item.provinceDiscountRate + '%,市级折扣' + item.cityDiscountRate + '%,特约折扣' + item.specialDiscountRate + '%;'
+              const utd = { 'YUAN': '元(原价)', 'GE': '个' }
+              infoDetail += form.specialDiscountList.length > 1 ? '<div>' + item.scopeLevel + '、' : '<div>'
+              infoDetail += '购买满' + item.discountScopeValue + utd[item.unitType] + '特价产品,省级折扣' + item.provinceDiscountRate + '%,市级折扣' + item.cityDiscountRate + '%,特约折扣' + item.specialDiscountRate + '%;</div>'
             })
           } else {
             infoDetail += '各级别价直降;省级直降' + form.provinceValue.toFixed(2) + ',市级直降' + form.cityValue.toFixed(2) + ',特约直降' + form.specialValue.toFixed(2)

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -197,12 +197,12 @@ export default {
             if (row.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && row.promotion.borrowFlag == '1' && row.promotionRule.regularSameFlag == '1') {
               return (<div style="width:100%;display:flex;justify-content: space-between;">
                 <div class="table-link-text" onClick={() => _this.showBuyGifts(row)} style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title={row[column.field]}>{row[column.field]}</div>
-                {isTejia ? equalWord : ''}
+                {isTejia && tejiaLen > 1 ? equalWord : ''}
               </div>)
             } else {
               return (<div style="width:100%;display:flex;justify-content: space-between;">
                 <div style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title={row[column.field]}>{row[column.field]}</div>
-                {isTejia ? equalWord : ''}
+                {isTejia && tejiaLen > 1 ? equalWord : ''}
               </div>)
             }
           },