|
@@ -83,10 +83,10 @@
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="采购额">
|
|
|
<v-select
|
|
|
- v-model="queryParam.buyerLevel"
|
|
|
- ref="buyerLevel"
|
|
|
- id="promotionSalesRealTimeReport-buyerLevel"
|
|
|
- code="DEALER_LEVEL"
|
|
|
+ v-model="queryParam.giveMoney"
|
|
|
+ ref="giveMoney"
|
|
|
+ id="promotionSalesRealTimeReport-giveMoney"
|
|
|
+ code="GIVE_MONEY"
|
|
|
placeholder="请选择采购额"
|
|
|
allowClear></v-select>
|
|
|
</a-form-model-item>
|
|
@@ -135,11 +135,10 @@
|
|
|
<span>{{ record.promotion.promotionDateStart }}-{{ record.promotion.promotionDateEnd }}</span>
|
|
|
</template>
|
|
|
<!-- 规则 -->
|
|
|
- <!-- <template slot="promotionDesc" slot-scope="text, record">
|
|
|
- <span v-if="record.promotionRule.promotionRuleType=='PROMO_PROD'">{{ record.promotionRule.promotionRuleTypeDictValue }}</span>
|
|
|
- <span v-else-if="record.promotionRule.promotionRuleType=='RATIO_AMOUNT'">{{ record.promotionRule.regularSameFlag==1?'同款':'不同款' }}产品购买满{{ record.promotionRule.regularQty }}个正价产品,送{{ record.promotionQty }}个促销产品</span>
|
|
|
- <span v-else>购买满{{ record.promotionRule.regularAmount }}元正价产品,送{{ record.promotionRule.giveAmount }}元促销品采购额{{ record.promotionRule.accrualFlag&&record.promotionRule.accrualFlag==1?'(金额叠加)':'(金额不叠加)' }}</span>
|
|
|
- </template> -->
|
|
|
+ <template slot="promotionDesc" slot-scope="text, record">
|
|
|
+ <div v-if="record.ruleInfo" v-html="record.ruleInfo"></div>
|
|
|
+ <span v-else>--</span>
|
|
|
+ </template>
|
|
|
<!-- 地区 -->
|
|
|
<template slot="addressInfo" slot-scope="text, record">
|
|
|
<span>{{ record.provinceName }}{{ record.cityName?'/'+record.cityName:'' }}{{ record.districtName?'/'+record.districtName :'' }}</span>
|
|
@@ -157,6 +156,8 @@
|
|
|
<a-col span="4">损失费用:{{ (totalData && (totalData.lossAmount || totalData.lossAmount==0)) ? toThousands(totalData.lossAmount) : '--' }}</a-col>
|
|
|
<a-col span="4">采购额结余:{{ (totalData && (totalData.surplusPromoGiftsAmount || totalData.surplusPromoGiftsAmount==0)) ? toThousands(totalData.surplusPromoGiftsAmount) : '--' }}</a-col>
|
|
|
<a-col span="4">采购额超出:{{ (totalData && (totalData.outPromoGiftsAmount || totalData.outPromoGiftsAmount==0)) ? toThousands(totalData.outPromoGiftsAmount) : '--' }}</a-col>
|
|
|
+ <a-col span="4">转采购额数量:{{ (totalData && (totalData.convertPromoGiftsQty || totalData.convertPromoGiftsQty==0)) ? totalData.convertPromoGiftsQty : '--' }}</a-col>
|
|
|
+ <a-col span="4">转采购额金额:{{ (totalData && (totalData.convertPromoGiftsAmount || totalData.convertPromoGiftsAmount==0)) ? toThousands(totalData.convertPromoGiftsAmount) : '--' }}</a-col>
|
|
|
</a-row>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
@@ -219,7 +220,8 @@ export default {
|
|
|
},
|
|
|
dealerProvinceSn: undefined, // 省份编码
|
|
|
dealerCitySn: undefined, // 城市编码
|
|
|
- dealerDistrictSn: undefined // 区域编码
|
|
|
+ dealerDistrictSn: undefined, // 区域编码
|
|
|
+ giveMoney: undefined
|
|
|
},
|
|
|
rules: {
|
|
|
salesDate: [{ required: true, message: '请选择销售审核时间', trigger: 'change' }]
|
|
@@ -236,7 +238,7 @@ export default {
|
|
|
{ title: '促销时间', scopedSlots: { customRender: 'promotionTime' }, width: '130px', align: 'center', fixed: 'left' },
|
|
|
{ title: '费用所属部门', dataIndex: 'departmentName', width: '160px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, fixed: 'left' },
|
|
|
{ title: '促销类型', dataIndex: 'promotionRule.promotionRuleTypeDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
|
- { title: '规则', dataIndex: 'promotionRule.ruleInfo', width: '180px', align: 'left', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
|
+ { title: '规则', dataIndex: 'promotionRule.ruleInfo', width: '180px', align: 'left', scopedSlots: { customRender: 'promotionDesc' }, fixed: 'left' },
|
|
|
{ title: '销售单号', dataIndex: 'salesBillNo', width: '120px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left' },
|
|
|
{ title: '区域', dataIndex: 'subareaArea.subareaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -251,7 +253,8 @@ export default {
|
|
|
{ title: '成本金额', dataIndex: 'totalRealCost', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '损失成本', dataIndex: 'lossCost', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '损失费用', dataIndex: 'lossAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
- { title: '促销产品转采购额', dataIndex: 'lossAmount1', width: '130px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
+ { title: <a-tooltip placement='top' title='即在下推时促销产品已转采购额的数量'>转采购额数量 <a-icon type="question-circle" /></a-tooltip>, dataIndex: 'convertPromoGiftsQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: <a-tooltip placement='top' title='即促销产品转采购额金额,促销产品转采购额数量*销售价'>转采购额金额 <a-icon type="question-circle" /></a-tooltip>, dataIndex: 'convertPromoGiftsAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '采购额结余', dataIndex: 'surplusPromoGiftsAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '采购额超出', dataIndex: 'outPromoGiftsAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '促销品费用归属品牌', dataIndex: 'promoProductBrandName', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -396,7 +399,8 @@ export default {
|
|
|
},
|
|
|
dealerProvinceSn: undefined, // 省份编码
|
|
|
dealerCitySn: undefined, // 城市编码
|
|
|
- dealerDistrictSn: undefined // 区域编码
|
|
|
+ dealerDistrictSn: undefined, // 区域编码
|
|
|
+ giveMoney: undefined
|
|
|
}
|
|
|
this.time = undefined
|
|
|
this.$refs.subarea.clearData()
|