|
@@ -337,7 +337,6 @@ export default {
|
|
|
params.createTimeEnd = params.createTime[1]+ " " + "23:59:59"
|
|
|
this.$delete(params,'createTime')
|
|
|
}
|
|
|
- console.log(this.search)
|
|
|
this.page.currentPage = 1;
|
|
|
this.onLoad(this.page, params);
|
|
|
done()
|
|
@@ -413,6 +412,38 @@ export default {
|
|
|
goBack() {
|
|
|
this.detailData=this.$options.data().detailData
|
|
|
this.isShow = true;
|
|
|
+ this.gobackSearch(this.search)
|
|
|
+ },
|
|
|
+ gobackSearch(params) {
|
|
|
+ let data = {};
|
|
|
+ data = Object.assign({}, params)
|
|
|
+ if (data.businesDate) {
|
|
|
+ data.orderStartDate = data.businesDate[0]+ " " + "00:00:00"
|
|
|
+ data.orderEndDate = data.businesDate[1]+ " " + "23:59:59"
|
|
|
+ delete data.businesDate;
|
|
|
+ }
|
|
|
+ if (data.requiredDeliveryDate) {
|
|
|
+ data.deliveryStartDate = data.requiredDeliveryDate[0]+ " " + "00:00:00"
|
|
|
+ data.deliveryEndDate = data.requiredDeliveryDate[1]+ " " + "23:59:59"
|
|
|
+ this.$delete(data,'requiredDeliveryDate')
|
|
|
+ }
|
|
|
+ if (data.requiredArrivalDate) {
|
|
|
+ data.arrivalDateStart = data.requiredArrivalDate[0]+ " " + "00:00:00"
|
|
|
+ data.arrivalDateEnd = data.requiredArrivalDate[1]+ " " + "23:59:59"
|
|
|
+ this.$delete(data,'requiredArrivalDate')
|
|
|
+ }
|
|
|
+ if (data.actualDeliveryDate) {
|
|
|
+ data.actualDeliveryDateStart = data.actualDeliveryDate[0]+ " " + "00:00:00"
|
|
|
+ data.actualDeliveryDateEnd = data.actualDeliveryDate[1]+ " " + "23:59:59"
|
|
|
+ this.$delete(data,'actualDeliveryDate')
|
|
|
+ }
|
|
|
+ if (data.createTime) {
|
|
|
+ data.createTimeStart = data.createTime[0]+ " " + "00:00:00"
|
|
|
+ data.createTimeEnd = data.createTime[1]+ " " + "23:59:59"
|
|
|
+ this.$delete(data,'createTime')
|
|
|
+ }
|
|
|
+ this.page.currentPage = 1;
|
|
|
+ this.onLoad(this.page, data);
|
|
|
},
|
|
|
}
|
|
|
}
|