aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

Browse Source
This commit is contained in:
linfso 2024-07-26 12:06:57 +08:00
commit b4d0593ad7
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/views/emis/emisTmsPack/packageManagement.vue
View File

@ -6,7 +6,7 @@
<el-col :span="8">
<el-form-item label="" prop="queryOrderType">
<div slot="label">
<el-radio-group class="query-label" v-model="queryParams.queryOrderType">
<el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
<el-radio label="1">合包号</el-radio>
<el-radio label="2">运单号</el-radio>
</el-radio-group>
@ -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{

19
src/views/emis/emisTmsSiteBatch/packListView.vue
View File

@ -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;