|
@@ -44,7 +44,7 @@
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="省份" prop="provinceSn">
|
|
|
- <Area id="salesReturn-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
|
|
|
+ <Area id="salesReturn-provinceSn" ref="provinceBox" v-model="queryParam.provinceSn" placeholder="请选择省" @change="chooseArea"></Area>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -89,7 +89,7 @@
|
|
|
<template slot="tip" slot-scope="text, record">
|
|
|
<a-tooltip placement="top" v-if="record.customerServiceConfirmOverDay && record.customerServiceConfirmOverDay*1>3">
|
|
|
<template slot="title">
|
|
|
- <span>已超时{{ record.dispatchOverDay }}天(要求提货后3-5天内完成清点)</span>
|
|
|
+ <span>已超时{{ record.customerServiceConfirmOverDay }}天(要求提货后3-5天内完成清点)</span>
|
|
|
</template>
|
|
|
<div>
|
|
|
<a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
|
|
@@ -133,8 +133,10 @@ export default {
|
|
|
moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
|
],
|
|
|
queryParam: { // 查询条件
|
|
|
- submitBeginDate: getDate.getCurrMonthDays().starttime,
|
|
|
- submitEndDate: getDate.getCurrMonthDays().endtime,
|
|
|
+ beginSubmitDate: getDate.getCurrMonthDays().starttime,
|
|
|
+ endSubmitDate: getDate.getCurrMonthDays().endtime,
|
|
|
+ beginAuditDate: undefined,
|
|
|
+ endAuditDate: undefined,
|
|
|
buyerSn: undefined,
|
|
|
buyerName: undefined,
|
|
|
subareaArea: {
|
|
@@ -144,6 +146,7 @@ export default {
|
|
|
goodFlag: undefined,
|
|
|
salesReturnBillNo: '', // 单号
|
|
|
billStatus: undefined, // 业务状态
|
|
|
+ provinceName: undefined,
|
|
|
provinceSn: undefined,
|
|
|
salesReturnType: undefined// 退货类别
|
|
|
},
|
|
@@ -188,7 +191,7 @@ export default {
|
|
|
{ title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
{ title: '申请退货数量', dataIndex: 'totalInitialQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '申请退货金额', dataIndex: 'initialAmount', width: '100px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
|
+ // { title: '申请退货金额', dataIndex: 'initialAmount', width: '100px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
|
|
|
{ title: '退货申请审核时间', dataIndex: 'updateDate', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '提货审核时间', dataIndex: 'auditTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '收货时间', dataIndex: 'receiveTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -207,8 +210,13 @@ export default {
|
|
|
methods: {
|
|
|
// 提交时间 change
|
|
|
dateChange (date) {
|
|
|
- this.queryParam.submitBeginDate = date[0]
|
|
|
- this.queryParam.submitEndDate = date[1]
|
|
|
+ this.queryParam.beginSubmitDate = date[0]
|
|
|
+ this.queryParam.endSubmitDate = date[1]
|
|
|
+ },
|
|
|
+ // 审核时间
|
|
|
+ dateExamineChange (date) {
|
|
|
+ this.queryParam.beginAuditDate = date[0]
|
|
|
+ this.queryParam.endAuditDate = date[1]
|
|
|
},
|
|
|
// 客户名称
|
|
|
custChange (val) {
|
|
@@ -228,8 +236,11 @@ export default {
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
|
- this.queryParam.submitBeginDate = getDate.getCurrMonthDays().starttime
|
|
|
- this.queryParam.submitEndDate = getDate.getCurrMonthDays().endtime
|
|
|
+ this.queryParam.beginSubmitDate = getDate.getCurrMonthDays().starttime
|
|
|
+ this.queryParam.endSubmitDate = getDate.getCurrMonthDays().endtime
|
|
|
+
|
|
|
+ this.queryParam.beginAuditDate = undefined
|
|
|
+ this.queryParam.endAuditDate = undefined
|
|
|
|
|
|
this.queryParam.subareaArea.subareaSn = undefined
|
|
|
this.queryParam.subareaArea.subareaAreaSn = undefined
|
|
@@ -239,6 +250,7 @@ export default {
|
|
|
this.queryParam.salesReturnBillNo = ''
|
|
|
this.queryParam.billStatus = undefined
|
|
|
this.queryParam.provinceSn = undefined
|
|
|
+ this.queryParam.provinceName = undefined
|
|
|
this.queryParam.salesReturnType = undefined
|
|
|
this.queryParam.goodFlag = undefined
|
|
|
this.$refs.dealerSubareaScopeList.resetForm()
|
|
@@ -248,6 +260,11 @@ export default {
|
|
|
handleDetail (row) {
|
|
|
this.$router.push({ name: 'salesReturnDetail', params: { sn: row.salesReturnBillSn }, query: { path: 'returnSchedule' } })
|
|
|
},
|
|
|
+ // 选择省份
|
|
|
+ chooseArea (con, item) {
|
|
|
+ this.queryParam.provinceSn = con
|
|
|
+ this.queryParam.provinceName = item.name
|
|
|
+ },
|
|
|
pageInit () {
|
|
|
const _this = this
|
|
|
this.$nextTick(() => { // 页面渲染完成后的回调
|