|
|
|
@ -14,7 +14,7 @@
|
|
|
|
|
<el-form-item label="配送日期:" class="el-times"> |
|
|
|
|
<el-date-picker |
|
|
|
|
class="w100" |
|
|
|
|
v-model="query.taskTimeArr" |
|
|
|
|
v-model="Deliverydate" |
|
|
|
|
type="daterange" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
@ -335,6 +335,7 @@ export default {
|
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
currentdate: true, |
|
|
|
|
Deliverydate: [], |
|
|
|
|
height: 0, |
|
|
|
|
// 弹框标题 |
|
|
|
|
title: '', |
|
|
|
@ -1088,20 +1089,19 @@ export default {
|
|
|
|
|
const startDate = currentDate.subtract(1, 'month'); |
|
|
|
|
// 格式化日期为 'YYYY-MM-DD' |
|
|
|
|
const formatDate = date => date.format('YYYY-MM-DD'); |
|
|
|
|
this.query.taskTimeArr = []; |
|
|
|
|
(this.query.taskTimeArr[0] = formatDate(startDate)), // 一个月前的日期 |
|
|
|
|
(this.query.taskTimeArr[1] = formatDate(currentDate)); // 当前日期 |
|
|
|
|
this.Deliverydate = []; |
|
|
|
|
this.Deliverydate[0] = formatDate(startDate); // 一个月前的日期 |
|
|
|
|
this.Deliverydate[1] = formatDate(currentDate); // 当前日期 |
|
|
|
|
}, |
|
|
|
|
async onLoad(page, params = {}) { |
|
|
|
|
this.loading = true; |
|
|
|
|
if (this.currentdate) { |
|
|
|
|
await this.Getcurrentdate(); |
|
|
|
|
} |
|
|
|
|
if (getObjType(this.query.taskTimeArr) === 'array') { |
|
|
|
|
params.taskTimeStart = this.query.taskTimeArr[0]; |
|
|
|
|
params.taskTimeEnd = this.query.taskTimeArr[1]; |
|
|
|
|
if (getObjType(this.Deliverydate) === 'array') { |
|
|
|
|
params.taskTimeStart = this.Deliverydate[0]; |
|
|
|
|
params.taskTimeEnd = this.Deliverydate[1]; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
// eslint-disable-next-line no-empty |
|
|
|
|