|
@@ -436,6 +436,9 @@ export default {
|
|
|
if(params.performDate&¶ms.performDate.length==2){
|
|
|
params.performDateStart = params.performDate[0];
|
|
|
params.performDateEnd = params.performDate[1];
|
|
|
+ }else {
|
|
|
+ params.performDateStart = null
|
|
|
+ params.performDateEnd =null
|
|
|
}
|
|
|
delete params.performDate;
|
|
|
pageList(params)
|
|
@@ -666,9 +669,24 @@ export default {
|
|
|
this.handleExportLoading = true;
|
|
|
// const { pageNum, pageSize} = this.params;
|
|
|
let postMap = {}
|
|
|
- for (let key in this.queryParams) {
|
|
|
- if(key != 'pageNum' && key != 'pageSize'){
|
|
|
- postMap[key] = this.queryParams[key]
|
|
|
+ if(this.queryParams.time){
|
|
|
+ this.queryParams.beginTime = this.queryParams.time[0];
|
|
|
+ this.queryParams.endTime = this.queryParams.time[1];
|
|
|
+ }else{
|
|
|
+ this.queryParams.beginTime = null
|
|
|
+ this.queryParams.endTime = null
|
|
|
+ }
|
|
|
+ if(this.queryParams.performDate&&this.queryParams.performDate.length==2){
|
|
|
+ this.queryParams.performDateStart = this.queryParams.performDate[0];
|
|
|
+ this.queryParams.performDateEnd = this.queryParams.performDate[1];
|
|
|
+ }else {
|
|
|
+ this.queryParams.performDateStart = null
|
|
|
+ this.queryParams.performDateEnd =null
|
|
|
+ }
|
|
|
+ let params = JSON.parse(JSON.stringify(this.queryParams))
|
|
|
+ for (let key in params) {
|
|
|
+ if(key != 'pageNum' && key != 'pageSize' && key != 'time' && key != 'performDate'){
|
|
|
+ postMap[key] = params[key]
|
|
|
}
|
|
|
}
|
|
|
downOrderListXls(postMap)
|