|
|
@@ -1346,7 +1346,7 @@
|
|
|
creativeAdvance: undefined,
|
|
|
creativeSale: undefined,
|
|
|
creativeOperate: 'no',
|
|
|
- time: [moment().subtract(30, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')],
|
|
|
+ time: [moment().subtract(30, 'days'), moment()],
|
|
|
searchStatus: 'no'
|
|
|
},
|
|
|
tablePag: {
|
|
|
@@ -1430,8 +1430,8 @@
|
|
|
saleId: this.configForm.creativeSale === 'no' ? '' : this.configForm.creativeSale,
|
|
|
promotionType: this.configForm.creativeOperate === 'no' ? '' : this.configForm.creativeOperate,
|
|
|
approvedStatus: this.configForm.searchStatus === 'no' ? '' : this.configForm.searchStatus,
|
|
|
- startTime: this.configForm.time[0],
|
|
|
- endTime: this.configForm.time[1],
|
|
|
+ startTime: this.configForm.time && this.configForm.time[0] ? moment(this.configForm.time[0]).format('YYYY-MM-DD') : '',
|
|
|
+ endTime: this.configForm.time && this.configForm.time[1] ? moment(this.configForm.time[1]).format('YYYY-MM-DD') : '',
|
|
|
pageNo: this.tablePag.page,
|
|
|
pageSize: this.tablePag.size
|
|
|
};
|
|
|
@@ -1614,7 +1614,7 @@
|
|
|
return defaultScope;
|
|
|
},
|
|
|
handleLaunchData(date, dateString) {
|
|
|
- this.configForm.time = dateString;
|
|
|
+ this.configForm.time = date;
|
|
|
},
|
|
|
handleFilterOption(input, option) {
|
|
|
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
|
|
@@ -1741,8 +1741,8 @@
|
|
|
saleId: this.configForm.creativeSale === 'no' ? '' : this.configForm.creativeSale,
|
|
|
promotionType: this.configForm.creativeOperate === 'no' ? '' : this.configForm.creativeOperate,
|
|
|
approvedStatus: this.configForm.searchStatus === 'no' ? '' : this.configForm.searchStatus,
|
|
|
- startTime: this.configForm.time[0],
|
|
|
- endTime: this.configForm.time[1],
|
|
|
+ startTime: this.configForm.time && this.configForm.time[0] ? moment(this.configForm.time[0]).format('YYYY-MM-DD') : '',
|
|
|
+ endTime: this.configForm.time && this.configForm.time[1] ? moment(this.configForm.time[1]).format('YYYY-MM-DD') : '',
|
|
|
pageNo: this.tablePag.page,
|
|
|
pageSize: this.tablePag.size
|
|
|
};
|
|
|
@@ -2154,7 +2154,7 @@
|
|
|
creativeAdvance: undefined,
|
|
|
creativeSale: undefined,
|
|
|
creativeOperate: 'no',
|
|
|
- time: [moment().subtract(30, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')],
|
|
|
+ time: [moment().subtract(30, 'days'), moment()],
|
|
|
searchStatus: 'no'
|
|
|
};
|
|
|
this.tablePag = {
|