diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue index e016efc7..0d1ae6cf 100644 --- a/src/views/emis/emisTmsPack/packageManagement.vue +++ b/src/views/emis/emisTmsPack/packageManagement.vue @@ -6,7 +6,7 @@
- + 合包号 运单号 @@ -898,9 +898,10 @@ export default { opMan: null, remark: null, delFlag: null, - params:{}, + params:{ + queryOrderType: '1', + }, packNo:'', - queryOrderType: '1', billCode: '' }, queryCoParams: { @@ -1013,7 +1014,7 @@ export default { newBillCodeStr=newBillCodeStr+item+","; } }); - if(this.queryParams.queryOrderType == "1"){ + if(this.queryParams.params.queryOrderType == "1"){ this.queryParams.packNo=newBillCodeStr; this.queryParams.billCode=null; }else{ @@ -1059,7 +1060,7 @@ export default { newBillCodeStr=newBillCodeStr+item+","; } }); - if(this.queryParams.queryOrderType == "1"){ + if(this.queryParams.params.queryOrderType == "1"){ this.queryWaitParams.packNo=newBillCodeStr; this.queryWaitParams.billCode=null; }else{ @@ -1109,7 +1110,7 @@ export default { newBillCodeStr=newBillCodeStr+item+","; } }); - if(this.queryParams.queryOrderType == "1"){ + if(this.queryParams.params.queryOrderType == "1"){ this.queryDoneParams.packNo=newBillCodeStr; this.queryDoneParams.billCode=null; }else{ diff --git a/src/views/emis/emisTmsSiteBatch/packListView.vue b/src/views/emis/emisTmsSiteBatch/packListView.vue index fb515500..fa4948b1 100644 --- a/src/views/emis/emisTmsSiteBatch/packListView.vue +++ b/src/views/emis/emisTmsSiteBatch/packListView.vue @@ -192,13 +192,17 @@ export default { }, created() { // this.initData(); - this.queryParams = this.propParams; + this.queryParams = this.propParams || {}; + this.queryParams.params = this.queryParams.params || {}; + this.queryParams.params.isNeedPack = null; this.showType = this.propType; }, watch: { "propParams": { handler (newValue, oldValue) { - this.queryParams = newValue; + this.queryParams = newValue || {}; + this.queryParams.params = this.queryParams.params || {}; + this.queryParams.params.isNeedPack = null; // this.initData(); }, deep: true @@ -350,10 +354,13 @@ export default { } this.emisTmsPackList = []; - if (null != this.dateTimeRange && '' != this.dateTimeRange) { - this.queryParams.params["beginSendDate"] = dateToStr(new Date(this.dateTimeRange[0])); - this.queryParams.params["endSendDate"] = dateToStr(new Date(this.dateTimeRange[1])); - } + // if (null != this.dateTimeRange && '' != this.dateTimeRange) { + // this.queryParams.params["beginSendDate"] = dateToStr(new Date(this.dateTimeRange[0])); + // this.queryParams.params["endSendDate"] = dateToStr(new Date(this.dateTimeRange[1])); + // } + this.queryParams.params["beginSendDate"] = null; + this.queryParams.params["endSendDate"] = null; + this.queryParams.params["isNeedPack"] = null; this.queryParams.destCountry = this.queryParams.receiveCountry; listEmisTmsPack(this.queryParams).then(response => { this.emisTmsPackList = response.rows;