Commit 6e2411df authored by zhoutong's avatar zhoutong

空运列表,切换到其他页面返回后,页面未缓存之前搜索条件、分页数据

parent 80cc189b
...@@ -224,7 +224,7 @@ import LadingBill from "@/views/ecw/box/ladingBill/index.vue"; ...@@ -224,7 +224,7 @@ import LadingBill from "@/views/ecw/box/ladingBill/index.vue";
import {listUser} from "@/api/system/user"; import {listUser} from "@/api/system/user";
export default { export default {
name: 'indexAir', name: 'EcwBoxIndexair',
components: { components: {
LadingBill, LadingBill,
costForm, costForm,
......
...@@ -90,6 +90,7 @@ export default { ...@@ -90,6 +90,7 @@ export default {
orderList: [], orderList: [],
orderListFilter: [], orderListFilter: [],
arrivalOrderList: [], arrivalOrderList: [],
clearanceOrderList: [],
airArrivalInfo: {} airArrivalInfo: {}
} }
}, },
...@@ -102,6 +103,7 @@ export default { ...@@ -102,6 +103,7 @@ export default {
if (!this.cusClearanceObj.clearanceType) this.$set(this.cusClearanceObj, 'clearanceType', 0) if (!this.cusClearanceObj.clearanceType) this.$set(this.cusClearanceObj, 'clearanceType', 0)
this.$set(this.cusClearanceObj, 'clearanceOrderIdList', []) this.$set(this.cusClearanceObj, 'clearanceOrderIdList', [])
if (this.$attrs.shipmentObj.airArrivalInfo.arrivalOrderList) this.arrivalOrderList = this.$attrs.shipmentObj.airArrivalInfo.arrivalOrderList if (this.$attrs.shipmentObj.airArrivalInfo.arrivalOrderList) this.arrivalOrderList = this.$attrs.shipmentObj.airArrivalInfo.arrivalOrderList
if (this.$attrs.shipmentObj.clearanceInfo.clearanceOrderList) this.clearanceOrderList = this.$attrs.shipmentObj.clearanceInfo.clearanceOrderList
shipmentOrderList(this.$attrs.shipmentObj.id).then((r) => { shipmentOrderList(this.$attrs.shipmentObj.id).then((r) => {
this.orderList = r.data this.orderList = r.data
this.orderListFilter = r.data this.orderListFilter = r.data
...@@ -174,10 +176,17 @@ export default { ...@@ -174,10 +176,17 @@ export default {
this.$set(this.airArrivalInfo, 'estTime', formatDate(arr.estTime)) this.$set(this.airArrivalInfo, 'estTime', formatDate(arr.estTime))
this.$set(this.airArrivalInfo, 'actTime', formatDate(arr.actTime)) this.$set(this.airArrivalInfo, 'actTime', formatDate(arr.actTime))
} }
let clear = this.clearanceOrderList.find((item) => item.orderId == val[0])
if(clear){
this.$set(this.cusClearanceObj, 'clEstTime', formatDate(clear.clEstTime))
this.$set(this.cusClearanceObj, 'clClearTime', formatDate(clear.clClearTime))
}
} else { } else {
this.$set(this.airArrivalInfo, 'actSecondTime', null) this.$set(this.airArrivalInfo, 'actSecondTime', null)
this.$set(this.airArrivalInfo, 'estTime', null) this.$set(this.airArrivalInfo, 'estTime', null)
this.$set(this.airArrivalInfo, 'actTime', null) this.$set(this.airArrivalInfo, 'actTime', null)
this.$set(this.cusClearanceObj, 'clEstTime', null)
this.$set(this.cusClearanceObj, 'clClearTime', null)
} }
}, },
getClAgent(type) { getClAgent(type) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment