|
@@ -35,7 +35,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="客户名称">
|
|
|
- <dealerSubareaScopeList id="priceDifferenceDetailList-custList" ref="custList" :itemSn="queryParam.dealerSn" @change="custChange"></dealerSubareaScopeList>
|
|
|
+ <dealerSubareaScopeList id="priceDifferenceDetailList-custList" ref="custList" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
|
|
@@ -79,17 +79,17 @@
|
|
|
<template slot="footer">
|
|
|
<table>
|
|
|
<tr>
|
|
|
- <td width="51%" colspan="4"></td>
|
|
|
- <td width="8%">
|
|
|
+ <td width="41%" colspan="4">总计:</td>
|
|
|
+ <td width="8%" align="right">
|
|
|
<div>实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</div>
|
|
|
</td>
|
|
|
- <td width="8%">
|
|
|
+ <td width="8%" align="right">
|
|
|
<div>开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</div>
|
|
|
</td>
|
|
|
- <td width="8%">
|
|
|
- <div>差价金额:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</div>
|
|
|
+ <td width="8%" align="right">
|
|
|
+ <div>差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</div>
|
|
|
</td>
|
|
|
- <td width="25%" colspan="2"></td>
|
|
|
+ <td width="34%" colspan="3"></td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
</template>
|
|
@@ -127,8 +127,8 @@ export default {
|
|
|
queryParam: { // 查询条件
|
|
|
month: moment().format('YYYY-MM'),
|
|
|
provinceSn: undefined,
|
|
|
- rebateDealerSn: undefined,
|
|
|
- dealerSn: undefined,
|
|
|
+ parentDealerSn: undefined,
|
|
|
+ buyerSn: undefined,
|
|
|
bizUserSn: undefined
|
|
|
},
|
|
|
rules: {
|
|
@@ -168,17 +168,17 @@ export default {
|
|
|
columns () {
|
|
|
const _this = this
|
|
|
const arr = [
|
|
|
- { title: '月份', dataIndex: 'month', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '月份', dataIndex: 'bizDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '省份', dataIndex: 'provinceName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '记账门店', dataIndex: 'rebateDealerName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '客户名称', dataIndex: 'dealerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '记账门店', dataIndex: 'parentDealerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '客户名称', dataIndex: 'buyerName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '产品品牌+二级分类', dataIndex: 'productBrandAndType2', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '类型', dataIndex: 'bizType', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
]
|
|
|
arr.splice(4, 0, { title: '实售金额', dataIndex: 'totalRealAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
arr.splice(5, 0, { title: '开单金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
- arr.splice(6, 0, { title: '差价金额', dataIndex: 'rebateAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
- arr.splice(7, 0, { title: '记账费用', dataIndex: 'rebateAmount1', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
+ arr.splice(6, 0, { title: '差价金额', dataIndex: 'directRebateAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
+ arr.splice(7, 0, { title: '记账费用', dataIndex: 'rebateAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
|
|
|
return arr
|
|
|
}
|
|
|
},
|
|
@@ -212,17 +212,17 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
rebateDealerChange (val) {
|
|
|
- this.queryParam.rebateDealerSn = val.key
|
|
|
+ this.queryParam.parentDealerSn = val.key
|
|
|
},
|
|
|
custChange (val) {
|
|
|
- this.queryParam.dealerSn = val.key
|
|
|
+ this.queryParam.buyerSn = val.key
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.queryParam.month = moment().format('YYYY-MM')
|
|
|
this.queryParam.provinceSn = undefined
|
|
|
- this.queryParam.rebateDealerSn = undefined
|
|
|
- this.queryParam.dealerSn = undefined
|
|
|
+ this.queryParam.parentDealerSn = undefined
|
|
|
+ this.queryParam.buyerSn = undefined
|
|
|
this.queryParam.bizUserSn = undefined
|
|
|
this.$refs.rebateDealerList.resetForm()
|
|
|
this.totalData = null
|