Merge pull request 'master-dev' (#164) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/164
This commit is contained in:
wuteng 2025-12-09 16:10:01 +08:00
commit 60b04a16c6
2 changed files with 9 additions and 10 deletions

View File

@ -83,7 +83,6 @@ export function autoScanSiteBatchV2(lineCode) {
return request({
url: '/emis/common/autoScanSiteBatchV2?lineCode='+lineCode,
method: 'get',
params: {lineCode:lineCode},
timeout: 20000
})
}

View File

@ -455,15 +455,15 @@ export default {
let rqParams = {...this.queryParams};
if(this.queryParams.queryKey){
rqParams={
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize,
queryKey:null,
params:{
billCode:null,
batchNo:null
}
};
// 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;