|
@@ -89,13 +89,6 @@
|
|
:pagination="{pageSizeOptions: ['20','50','100','200','500']}"
|
|
:pagination="{pageSizeOptions: ['20','50','100','200','500']}"
|
|
:defaultLoadData="false"
|
|
:defaultLoadData="false"
|
|
bordered>
|
|
bordered>
|
|
- <!-- 地区 -->
|
|
|
|
- <template slot="addressInfo" slot-scope="text, record">
|
|
|
|
- <span v-if="record.dealerEntity&&record.dealerEntity.provinceName">
|
|
|
|
- {{ record.dealerEntity.provinceName }}
|
|
|
|
- </span>
|
|
|
|
- <span v-else>--</span>
|
|
|
|
- </template>
|
|
|
|
<template slot="footer">
|
|
<template slot="footer">
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">服务费金额合计:{{ (totalData && (totalData.subsidyServiceTotal || totalData.subsidyServiceTotal==0)) ? toThousands(totalData.subsidyServiceTotal): '--' }}</a-col>
|
|
<a-col :md="6" :sm="24">服务费金额合计:{{ (totalData && (totalData.subsidyServiceTotal || totalData.subsidyServiceTotal==0)) ? toThousands(totalData.subsidyServiceTotal): '--' }}</a-col>
|
|
@@ -134,7 +127,7 @@ export default {
|
|
// 查询条件
|
|
// 查询条件
|
|
queryParam: {
|
|
queryParam: {
|
|
queryDate: moment().format('YYYY-MM'), // 选择月份
|
|
queryDate: moment().format('YYYY-MM'), // 选择月份
|
|
- dealerEntity: {
|
|
|
|
|
|
+ dealer: {
|
|
provinceSn: undefined, // 省
|
|
provinceSn: undefined, // 省
|
|
citySn: undefined, // 市
|
|
citySn: undefined, // 市
|
|
districtSn: undefined // 区
|
|
districtSn: undefined // 区
|
|
@@ -195,7 +188,7 @@ export default {
|
|
{ title: '月份', dataIndex: 'mothDay', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '月份', dataIndex: 'mothDay', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '区域', dataIndex: 'subareaArea.subareaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '区域', dataIndex: 'subareaArea.subareaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '省份', scopedSlots: { customRender: 'addressInfo' }, width: '6%', align: 'center' },
|
|
|
|
|
|
+ { title: '省份', dataIndex: 'provinceName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '记账主体', dataIndex: 'belongDealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '记账主体', dataIndex: 'belongDealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '服务费(记)', dataIndex: 'subsidyServiceSales', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
{ title: '服务费(记)', dataIndex: 'subsidyServiceSales', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
{ title: '服务费(扣)', dataIndex: 'subsidyServiceReturn', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
{ title: '服务费(扣)', dataIndex: 'subsidyServiceReturn', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
@@ -252,9 +245,9 @@ export default {
|
|
},
|
|
},
|
|
// 地区
|
|
// 地区
|
|
areaChange (val) {
|
|
areaChange (val) {
|
|
- this.queryParam.dealerEntity.provinceSn = val[0] ? val[0] : undefined
|
|
|
|
- this.queryParam.dealerEntity.citySn = val[1] ? val[1] : undefined
|
|
|
|
- this.queryParam.dealerEntity.districtSn = val[2] ? val[2] : undefined
|
|
|
|
|
|
+ this.queryParam.dealer.provinceSn = val[0] ? val[0] : undefined
|
|
|
|
+ this.queryParam.dealer.citySn = val[1] ? val[1] : undefined
|
|
|
|
+ this.queryParam.dealer.districtSn = val[2] ? val[2] : undefined
|
|
},
|
|
},
|
|
// 区域分区 change
|
|
// 区域分区 change
|
|
subareaChange (val) {
|
|
subareaChange (val) {
|
|
@@ -265,10 +258,10 @@ export default {
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
this.monthVal = moment().format('YYYY-MM')
|
|
this.monthVal = moment().format('YYYY-MM')
|
|
this.queryParam.queryDate = moment().format('YYYY-MM')
|
|
this.queryParam.queryDate = moment().format('YYYY-MM')
|
|
- this.queryParam.dealerEntity.provinceSn = undefined
|
|
|
|
- this.queryParam.dealerEntity.citySn = undefined
|
|
|
|
- this.queryParam.dealerEntity.districtSn = undefined
|
|
|
|
- this.queryParam.dealerEntity.dealerName = undefined
|
|
|
|
|
|
+ this.queryParam.dealer.provinceSn = undefined
|
|
|
|
+ this.queryParam.dealer.citySn = undefined
|
|
|
|
+ this.queryParam.dealer.districtSn = undefined
|
|
|
|
+ this.queryParam.dealer.dealerName = undefined
|
|
this.queryParam.subareaArea.subareaSn = ''
|
|
this.queryParam.subareaArea.subareaSn = ''
|
|
this.queryParam.subareaArea.subareaAreaSn = ''
|
|
this.queryParam.subareaArea.subareaAreaSn = ''
|
|
this.queryParam.dealerLevel = undefined
|
|
this.queryParam.dealerLevel = undefined
|