|
|
@@ -188,9 +188,8 @@
|
|
|
asnNo: null,
|
|
|
createSingleStartTime: null,
|
|
|
createSingleEndTime: null,
|
|
|
- finishedReceiveTime: null,
|
|
|
- receivePerson: null,
|
|
|
workGroupId: null,
|
|
|
+ sign: null,
|
|
|
},
|
|
|
size: 50,
|
|
|
current: 1,
|
|
|
@@ -275,10 +274,14 @@
|
|
|
});
|
|
|
},
|
|
|
getSearch() {
|
|
|
+ if (this.search.customerId!=null ||this.search.receiveTaskNo!=null ||this.search.reservationNo!=null
|
|
|
+ ||this.search.status!=null ||this.search.asnNo!=null ||this.search.createSingleStartTime!=null
|
|
|
+ ||this.search.createSingleEndTime!=null ||this.search.workGroupId!=null){
|
|
|
+ this.search.sign='有筛选';
|
|
|
+ }
|
|
|
let search = Object.assign({}, this.search);
|
|
|
search.startTime += ' 00:00:00';
|
|
|
search.endTime += ' 23:59:59';
|
|
|
- console.log(search);
|
|
|
return search;
|
|
|
},
|
|
|
//初始化日期为今天和昨天
|