|
@@ -28,12 +28,12 @@
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<template v-if="advanced">
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
+ <a-col :md="7" :sm="24">
|
|
|
<a-form-model-item label="客户名称">
|
|
|
<dealerSubareaScopeList ref="custList" id="salesReturnsReportList-dealerSn" @change="custChange" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="24">
|
|
|
+ <a-col :md="7" :sm="24">
|
|
|
<a-form-model-item label="客户级别">
|
|
|
<v-select
|
|
|
v-model="queryParam.dealerLevel"
|
|
@@ -46,7 +46,18 @@
|
|
|
</a-col>
|
|
|
<a-col :md="5" :sm="24">
|
|
|
<a-form-model-item label="地区">
|
|
|
- <AreaList id="salesReturnsReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
|
|
|
+ <AreaList id="salesReturnsReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="5" :sm="24">
|
|
|
+ <a-form-model-item label="退货类型">
|
|
|
+ <v-select
|
|
|
+ v-model="queryParam.dealerLevel"
|
|
|
+ ref="dealerLevel"
|
|
|
+ id="salesReturnsReportList-dealerLevel"
|
|
|
+ code="DEALER_LEVEL"
|
|
|
+ placeholder="请选择退货类型"
|
|
|
+ allowClear></v-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</template>
|
|
@@ -135,7 +146,7 @@ export default {
|
|
|
beginDate: getDate.getCurrMonthDays().starttime,
|
|
|
endDate: getDate.getCurrMonthDays().endtime,
|
|
|
salesReturnBillNo: '',
|
|
|
- subareaArea:{
|
|
|
+ subareaArea: {
|
|
|
subareaSn: undefined,
|
|
|
subareaAreaSn: undefined
|
|
|
},
|
|
@@ -181,9 +192,10 @@ export default {
|
|
|
{ title: '退货完成日期', dataIndex: 'salesReturnDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '退货类型', dataIndex: 'returnType', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '退货数量', dataIndex: 'totalQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '退货数量', dataIndex: 'totalQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
|
// { title: '开单退货金额', dataIndex: 'totalAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
// { title: '经销商价', dataIndex: 'totalWholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
// { title: '服务中心价', dataIndex: 'totalWholesalePrice1', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -257,7 +269,7 @@ export default {
|
|
|
if (valid) {
|
|
|
_this.$refs.table.refresh(true)
|
|
|
} else {
|
|
|
- _this.$message.error("请选择退货完成日期")
|
|
|
+ _this.$message.error('请选择退货完成日期')
|
|
|
return false
|
|
|
}
|
|
|
})
|
|
@@ -275,7 +287,7 @@ export default {
|
|
|
custChange (val) {
|
|
|
this.queryParam.dealerSn = val.key
|
|
|
},
|
|
|
- subareaChange(val){
|
|
|
+ subareaChange (val) {
|
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
|
this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
|
},
|
|
@@ -305,7 +317,7 @@ export default {
|
|
|
this.$refs.ruleForm.resetFields()
|
|
|
this.$refs.table.clearTable()
|
|
|
},
|
|
|
- areaChange(val){
|
|
|
+ areaChange (val) {
|
|
|
this.queryParam.dealerProvinceSn = val[0] ? val[0] : ''
|
|
|
this.queryParam.dealerCitySn = val[1] ? val[1] : ''
|
|
|
this.queryParam.dealerCountySn = val[2] ? val[2] : ''
|