|
@@ -25,7 +25,7 @@
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="客户级别">
|
|
|
<v-select
|
|
|
- v-model="queryParam.dealer.dealerLevel"
|
|
|
+ v-model="queryParam.dealerLevel"
|
|
|
ref="dealerLevel"
|
|
|
id="billingReturnReportList-dealerLevel"
|
|
|
code="DEALER_LEVEL"
|
|
@@ -36,29 +36,29 @@
|
|
|
<template v-if="advanced">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="所在区域">
|
|
|
- <subarea id="billingReturnReportList-subareaSn" v-model="queryParam.dealer.subareaSn"></subarea>
|
|
|
+ <subarea id="billingReturnReportList-subareaSn" v-model="queryParam.subareaSn"></subarea>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="12" :sm="24">
|
|
|
<a-row>
|
|
|
<a-form-model-item label="地区" style="margin-bottom: 0!important;">
|
|
|
<a-col span="7">
|
|
|
- <a-form-model-item prop="dealerProvinceSn" style="margin: 0;">
|
|
|
- <a-select v-model="queryParam.dealer.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
|
|
|
+ <a-form-model-item prop="provinceSn" style="margin: 0;">
|
|
|
+ <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
|
|
|
<a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col span="7" offset="1">
|
|
|
- <a-form-model-item prop="dealerCitySn" style="margin: 0;">
|
|
|
- <a-select v-model="queryParam.dealer.citySn" allowClear @change="getAreaList" placeholder="请选择市">
|
|
|
+ <a-form-model-item prop="citySn" style="margin: 0;">
|
|
|
+ <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
|
|
|
<a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col span="7" offset="1">
|
|
|
- <a-form-model-item prop="dealerCountySn" style="margin: 0;">
|
|
|
- <a-select v-model="queryParam.dealer.districtSn" allowClear placeholder="请选择区/县">
|
|
|
+ <a-form-model-item prop="districtSn" style="margin: 0;">
|
|
|
+ <a-select v-model="queryParam.districtSn" allowClear placeholder="请选择区/县">
|
|
|
<a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
@@ -157,14 +157,12 @@ export default {
|
|
|
],
|
|
|
beginDate: getDate.getCurrMonthDays().starttime,
|
|
|
endDate: getDate.getCurrMonthDays().endtime,
|
|
|
- dealer: {
|
|
|
- 'dealerSn': undefined,
|
|
|
- 'provinceSn': undefined,
|
|
|
- 'citySn': undefined,
|
|
|
- 'districtSn': undefined,
|
|
|
- 'subareaSn': undefined,
|
|
|
- 'dealerLevel': undefined
|
|
|
- }
|
|
|
+ dealerSn: undefined,
|
|
|
+ provinceSn: undefined,
|
|
|
+ citySn: undefined,
|
|
|
+ districtSn: undefined,
|
|
|
+ subareaSn: undefined,
|
|
|
+ dealerLevel: undefined
|
|
|
},
|
|
|
rules: {
|
|
|
'time': [{ required: true, message: '请选择退货日期', trigger: 'change' }]
|
|
@@ -346,7 +344,7 @@ export default {
|
|
|
customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
|
|
|
}
|
|
|
] },
|
|
|
- { title: '开单退货合计金额', width: 90, dataIndex: 'sumAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
|
|
|
+ { title: '开单退货合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -422,7 +420,7 @@ export default {
|
|
|
this.queryParam.endDate = date[1] || ''
|
|
|
},
|
|
|
custChange (val) {
|
|
|
- this.queryParam.dealer.dealerSn = val.key
|
|
|
+ this.queryParam.dealerSn = val.key
|
|
|
},
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
@@ -433,14 +431,12 @@ export default {
|
|
|
this.$refs.rangeDate.resetDate(this.queryParam.time)
|
|
|
this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
|
|
|
this.queryParam.endDate = getDate.getCurrMonthDays().endtime
|
|
|
- this.queryParam.dealer = {
|
|
|
- 'dealerSn': undefined,
|
|
|
- 'provinceSn': undefined,
|
|
|
- 'citySn': undefined,
|
|
|
- 'districtSn': undefined,
|
|
|
- 'subareaSn': undefined,
|
|
|
- 'dealerLevel': undefined
|
|
|
- }
|
|
|
+ this.queryParam.dealerSn = undefined
|
|
|
+ this.queryParam.provinceSn = undefined
|
|
|
+ this.queryParam.citySn = undefined
|
|
|
+ this.queryParam.districtSn = undefined
|
|
|
+ this.queryParam.subareaSn = undefined
|
|
|
+ this.queryParam.dealerLevel = undefined
|
|
|
this.totalData = null
|
|
|
this.$refs.custList.resetForm()
|
|
|
this.$refs.ruleForm.resetFields()
|
|
@@ -450,8 +446,8 @@ export default {
|
|
|
getCityList (val) {
|
|
|
this.addrCityList = []
|
|
|
this.addrDistrictList = []
|
|
|
- this.queryParam.dealerCitySn = undefined
|
|
|
- this.queryParam.dealerCountySn = undefined
|
|
|
+ this.queryParam.citySn = undefined
|
|
|
+ this.queryParam.districtSn = undefined
|
|
|
if (val) {
|
|
|
this.getArea('city', val)
|
|
|
}
|
|
@@ -459,7 +455,7 @@ export default {
|
|
|
// 获取区县列表
|
|
|
getAreaList (val) {
|
|
|
this.addrDistrictList = []
|
|
|
- this.queryParam.dealerCountySn = undefined
|
|
|
+ this.queryParam.districtSn = undefined
|
|
|
if (val) {
|
|
|
this.getArea('district', val)
|
|
|
}
|