|
@@ -3,17 +3,24 @@
|
|
<a-card size="small" :bordered="false" class="returnSchedule-wrap">
|
|
<a-card size="small" :bordered="false" class="returnSchedule-wrap">
|
|
<!-- 搜索条件 -->
|
|
<!-- 搜索条件 -->
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
- <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
|
|
|
|
+ <a-form-model
|
|
|
|
+ id="allocateBillList-form"
|
|
|
|
+ ref="ruleForm"
|
|
|
|
+ class="form-model-con"
|
|
|
|
+ layout="inline"
|
|
|
|
+ :rules="rules"
|
|
|
|
+ :model="queryParam"
|
|
|
|
+ @keyup.enter.native="handleSearch">
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="提交时间">
|
|
|
|
- <rangeDate ref="rangeDate" @change="dateChange" />
|
|
|
|
- </a-form-item>
|
|
|
|
|
|
+ <a-form-model-item label="提交时间" prop="time">
|
|
|
|
+ <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
|
|
|
|
+ </a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="审核时间">
|
|
|
|
|
|
+ <a-form-model-item label="退货申请审核时间">
|
|
<rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
|
|
<rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
|
|
- </a-form-item>
|
|
|
|
|
|
+ </a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="所属区域/分区">
|
|
<a-form-model-item label="所属区域/分区">
|
|
@@ -21,18 +28,18 @@
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
|
|
|
+ <a-form-model-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
<dealerSubareaScopeList ref="dealerSubareaScopeList" id="returnSchedule-buyerSn" @change="custChange" />
|
|
<dealerSubareaScopeList ref="dealerSubareaScopeList" id="returnSchedule-buyerSn" @change="custChange" />
|
|
- </a-form-item>
|
|
|
|
|
|
+ </a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="总部销退单号">
|
|
|
|
|
|
+ <a-form-model-item label="总部销退单号">
|
|
<a-input id="returnSchedule-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
|
|
<a-input id="returnSchedule-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
|
|
- </a-form-item>
|
|
|
|
|
|
+ </a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
- <a-form-item label="业务状态">
|
|
|
|
|
|
+ <a-form-model-item label="业务状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.billStatus"
|
|
v-model="queryParam.billStatus"
|
|
ref="billStatus"
|
|
ref="billStatus"
|
|
@@ -40,7 +47,7 @@
|
|
code="SALES_RETURN_BILL_STATUS2"
|
|
code="SALES_RETURN_BILL_STATUS2"
|
|
placeholder="请选择业务状态"
|
|
placeholder="请选择业务状态"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
- </a-form-item>
|
|
|
|
|
|
+ </a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-model-item label="省份" prop="provinceSn">
|
|
<a-form-model-item label="省份" prop="provinceSn">
|
|
@@ -60,7 +67,7 @@
|
|
</a-col>
|
|
</a-col>
|
|
</template>
|
|
</template>
|
|
<a-col :md="24" :sm="24" style="margin-top:16px;text-align:center">
|
|
<a-col :md="24" :sm="24" style="margin-top:16px;text-align:center">
|
|
- <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="returnSchedule-refresh">查询</a-button>
|
|
|
|
|
|
+ <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSchedule-refresh">查询</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnSchedule-reset">重置</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnSchedule-reset">重置</a-button>
|
|
<a @click="advanced=!advanced" style="margin-left: 8px">
|
|
<a @click="advanced=!advanced" style="margin-left: 8px">
|
|
{{ advanced ? '收起' : '展开' }}
|
|
{{ advanced ? '收起' : '展开' }}
|
|
@@ -68,7 +75,7 @@
|
|
</a>
|
|
</a>
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
- </a-form>
|
|
|
|
|
|
+ </a-form-model>
|
|
</div>
|
|
</div>
|
|
</a-card>
|
|
</a-card>
|
|
<a-card size="small" :bordered="false">
|
|
<a-card size="small" :bordered="false">
|
|
@@ -128,11 +135,11 @@ export default {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
tableHeight: 0,
|
|
tableHeight: 0,
|
|
- time: [
|
|
|
|
- moment(getDate.getCurrMonthDays().starttime, 'YYYY-MM-DD'),
|
|
|
|
- moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
|
|
- ],
|
|
|
|
queryParam: { // 查询条件
|
|
queryParam: { // 查询条件
|
|
|
|
+ time: [
|
|
|
|
+ moment(getDate.getCurrMonthDays().starttime, 'YYYY-MM-DD'),
|
|
|
|
+ moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
|
|
|
|
+ ],
|
|
beginSubmitDate: getDate.getCurrMonthDays().starttime,
|
|
beginSubmitDate: getDate.getCurrMonthDays().starttime,
|
|
endSubmitDate: getDate.getCurrMonthDays().endtime,
|
|
endSubmitDate: getDate.getCurrMonthDays().endtime,
|
|
beginAuditDate: undefined,
|
|
beginAuditDate: undefined,
|
|
@@ -150,6 +157,9 @@ export default {
|
|
provinceSn: undefined,
|
|
provinceSn: undefined,
|
|
salesReturnType: undefined// 退货类别
|
|
salesReturnType: undefined// 退货类别
|
|
},
|
|
},
|
|
|
|
+ rules: {
|
|
|
|
+ 'time': [{ required: true, message: '请选择退货完成时间', trigger: 'change' }]
|
|
|
|
+ },
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
advanced: true,
|
|
advanced: true,
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
@@ -192,8 +202,8 @@ export default {
|
|
|
|
|
|
{ title: '申请退货数量', dataIndex: 'totalInitialQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? 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: 'auditTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
+ { title: '提货审核时间', dataIndex: 'pickUpAuditDate', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收货时间', dataIndex: 'receiveTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '收货时间', dataIndex: 'receiveTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '品检时间', dataIndex: 'checkTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '品检时间', dataIndex: 'checkTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '客服确认时间', dataIndex: 'customerServiceConfirmTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '客服确认时间', dataIndex: 'customerServiceConfirmTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -208,10 +218,27 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ // 查询
|
|
|
|
+ handleSearch () {
|
|
|
|
+ const _this = this
|
|
|
|
+ this.$refs.ruleForm.validate(valid => {
|
|
|
|
+ if (valid) {
|
|
|
|
+ _this.$refs.table.refresh(true)
|
|
|
|
+ } else {
|
|
|
|
+ _this.$message.error('请选择提交时间')
|
|
|
|
+ return false
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 提交时间 change
|
|
// 提交时间 change
|
|
dateChange (date) {
|
|
dateChange (date) {
|
|
- this.queryParam.beginSubmitDate = date[0]
|
|
|
|
- this.queryParam.endSubmitDate = date[1]
|
|
|
|
|
|
+ if (date[0] && date[1]) {
|
|
|
|
+ this.queryParam.time = date
|
|
|
|
+ } else {
|
|
|
|
+ this.queryParam.time = []
|
|
|
|
+ }
|
|
|
|
+ this.queryParam.beginSubmitDate = date[0] || ''
|
|
|
|
+ this.queryParam.endSubmitDate = date[1] || ''
|
|
},
|
|
},
|
|
// 审核时间
|
|
// 审核时间
|
|
dateExamineChange (date) {
|
|
dateExamineChange (date) {
|
|
@@ -235,12 +262,17 @@ export default {
|
|
},
|
|
},
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
- this.$refs.rangeDate.resetDate(this.time)
|
|
|
|
|
|
+ this.queryParam.time = [
|
|
|
|
+ getDate.getCurrMonthDays().starttime,
|
|
|
|
+ getDate.getCurrMonthDays().endtime
|
|
|
|
+ ]
|
|
|
|
+ this.$refs.rangeDate.resetDate(this.queryParam.time)
|
|
this.queryParam.beginSubmitDate = getDate.getCurrMonthDays().starttime
|
|
this.queryParam.beginSubmitDate = getDate.getCurrMonthDays().starttime
|
|
this.queryParam.endSubmitDate = getDate.getCurrMonthDays().endtime
|
|
this.queryParam.endSubmitDate = getDate.getCurrMonthDays().endtime
|
|
|
|
|
|
this.queryParam.beginAuditDate = undefined
|
|
this.queryParam.beginAuditDate = undefined
|
|
this.queryParam.endAuditDate = undefined
|
|
this.queryParam.endAuditDate = undefined
|
|
|
|
+ this.$refs.rangeExamineDate.resetDate()
|
|
|
|
|
|
this.queryParam.subareaArea.subareaSn = undefined
|
|
this.queryParam.subareaArea.subareaSn = undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = undefined
|