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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/emis/emisCommon.js
View File

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

18
src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
View File

@ -455,15 +455,15 @@ export default {
let rqParams = {...this.queryParams}; let rqParams = {...this.queryParams};
if(this.queryParams.queryKey){ if(this.queryParams.queryKey){
rqParams={ // rqParams={
pageNum: this.queryParams.pageNum, // pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize, // pageSize: this.queryParams.pageSize,
queryKey:null, // queryKey:null,
params:{ // params:{
billCode:null, // billCode:null,
batchNo:null // batchNo:null
} // }
}; // };
if(this.queryOrderType=='1'){ if(this.queryOrderType=='1'){
rqParams.params.billCode=this.queryParams.queryKey; rqParams.params.billCode=this.queryParams.queryKey;