Merge pull request '货物组批次查询参数调整' (#165) from master-dev into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/165
This commit is contained in:
commit
ebd4e19a5a
@ -451,42 +451,32 @@ export default {
|
||||
/** 查询TMS组批次列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
|
||||
this.initQueryParams();
|
||||
let rqParams = {...this.queryParams};
|
||||
|
||||
if(this.queryParams.queryKey){
|
||||
// rqParams={
|
||||
// pageNum: this.queryParams.pageNum,
|
||||
// pageSize: this.queryParams.pageSize,
|
||||
// queryKey:null,
|
||||
// params:{
|
||||
// billCode:null,
|
||||
// batchNo:null
|
||||
// }
|
||||
// };
|
||||
|
||||
if(this.queryOrderType=='1'){
|
||||
rqParams.params.billCode=this.queryParams.queryKey;
|
||||
rqParams.batchNo=null;
|
||||
rqParams.carNo=null;
|
||||
}else if(this.queryOrderType=='2'){
|
||||
rqParams.carNo=this.queryParams.queryKey;
|
||||
rqParams.batchNo=null;
|
||||
rqParams.params.billCode=null;
|
||||
}else{
|
||||
rqParams.batchNo=this.queryParams.queryKey;
|
||||
rqParams.params.billCode=null;
|
||||
rqParams.carNo=null;
|
||||
}
|
||||
}else{
|
||||
if(this.queryETDType=='2'){
|
||||
this.removeDateRange(rqParams,"createTime");
|
||||
rqParams=this.addDateRange(rqParams, this.dateTimeRange,"etd");
|
||||
}else{
|
||||
this.removeDateRange(rqParams,"etd");
|
||||
rqParams=this.addDateRange(rqParams, this.dateTimeRange,"createTime");
|
||||
}
|
||||
}
|
||||
// if(this.queryParams.queryKey){
|
||||
// if(this.queryOrderType=='1'){
|
||||
// rqParams.params.billCode=this.queryParams.queryKey;
|
||||
// rqParams.batchNo=null;
|
||||
// rqParams.carNo=null;
|
||||
// }else if(this.queryOrderType=='2'){
|
||||
// rqParams.carNo=this.queryParams.queryKey;
|
||||
// rqParams.batchNo=null;
|
||||
// rqParams.params.billCode=null;
|
||||
// }else{
|
||||
// rqParams.batchNo=this.queryParams.queryKey;
|
||||
// rqParams.params.billCode=null;
|
||||
// rqParams.carNo=null;
|
||||
// }
|
||||
// }else{
|
||||
// if(this.queryETDType=='2'){
|
||||
// this.removeDateRange(rqParams,"createTime");
|
||||
// rqParams=this.addDateRange(rqParams, this.dateTimeRange,"etd");
|
||||
// }else{
|
||||
// this.removeDateRange(rqParams,"etd");
|
||||
// rqParams=this.addDateRange(rqParams, this.dateTimeRange,"createTime");
|
||||
// }
|
||||
// }
|
||||
listEmisTmsSiteBatch(rqParams).then(response => {
|
||||
this.emisTmsBatchList = response.rows;
|
||||
this.total = response.total;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user