diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue index 07194a67..c8608810 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue @@ -265,6 +265,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code+"30"] || dm[code+"40"]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/arrivalScan.vue b/src/views/emis/emisTmsScanRecord/arrivalScan.vue index f2eeddb5..bcf3ff86 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalScan.vue @@ -251,6 +251,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue index 2475a1dc..27c23edb 100644 --- a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue +++ b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue @@ -268,6 +268,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/customsClearScan.vue b/src/views/emis/emisTmsScanRecord/customsClearScan.vue index 8bfdc4b0..9d1173a4 100644 --- a/src/views/emis/emisTmsScanRecord/customsClearScan.vue +++ b/src/views/emis/emisTmsScanRecord/customsClearScan.vue @@ -259,6 +259,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue b/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue index c33b8d9f..fa574109 100644 --- a/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue +++ b/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue @@ -262,6 +262,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/deliveryScan.vue b/src/views/emis/emisTmsScanRecord/deliveryScan.vue index 76d5481c..4e44b8ac 100644 --- a/src/views/emis/emisTmsScanRecord/deliveryScan.vue +++ b/src/views/emis/emisTmsScanRecord/deliveryScan.vue @@ -253,6 +253,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/loadingScan.vue b/src/views/emis/emisTmsScanRecord/loadingScan.vue index 99525e8e..79dcd107 100644 --- a/src/views/emis/emisTmsScanRecord/loadingScan.vue +++ b/src/views/emis/emisTmsScanRecord/loadingScan.vue @@ -264,6 +264,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue index db232108..731af2af 100644 --- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue +++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue @@ -261,6 +261,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/positionScanning.vue b/src/views/emis/emisTmsScanRecord/positionScanning.vue index 67dbcfc4..e952284a 100644 --- a/src/views/emis/emisTmsScanRecord/positionScanning.vue +++ b/src/views/emis/emisTmsScanRecord/positionScanning.vue @@ -262,6 +262,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue index 235b9c35..861f0a3a 100644 --- a/src/views/emis/emisTmsScanRecord/scanRecord.vue +++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue @@ -252,6 +252,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue index 728a7f8f..d08e722b 100644 --- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue +++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue @@ -321,6 +321,7 @@ export default { } let bcList=this.formBatch.billCode.split(/[;\;\,\,\n]/)||[]; bcList.forEach((code) => { + code = code.trim(); this.getDetail(code, true) }) this.openBatch=false; diff --git a/src/views/emis/emisTmsScanRecord/takeDeliveryScan.vue b/src/views/emis/emisTmsScanRecord/takeDeliveryScan.vue index abbab5f2..3eefbcc0 100644 --- a/src/views/emis/emisTmsScanRecord/takeDeliveryScan.vue +++ b/src/views/emis/emisTmsScanRecord/takeDeliveryScan.vue @@ -243,6 +243,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue index d9692e76..d1c71f0d 100644 --- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue +++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue @@ -330,6 +330,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code+"10"] || dm[code+"20"]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/unloadingScan.vue b/src/views/emis/emisTmsScanRecord/unloadingScan.vue index 65b86c6a..c0feca23 100644 --- a/src/views/emis/emisTmsScanRecord/unloadingScan.vue +++ b/src/views/emis/emisTmsScanRecord/unloadingScan.vue @@ -245,6 +245,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsScanRecord/unpackScan.vue b/src/views/emis/emisTmsScanRecord/unpackScan.vue index 7c903fef..476c79b6 100644 --- a/src/views/emis/emisTmsScanRecord/unpackScan.vue +++ b/src/views/emis/emisTmsScanRecord/unpackScan.vue @@ -237,6 +237,7 @@ export default { let haveCode = null; let dm = this.dataMap; let scList=bcList.map(function(code) { + code = code.trim(); if(dm[code]){ haveCode = code; return; diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue index 44c16804..cfc7be37 100644 --- a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue +++ b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue @@ -1536,6 +1536,8 @@ export default { let bcList=this.formBatchBillList.trim().split(/[;\;\,\,\n]/)||[]; bcList.forEach(async (billcode) => { + billcode = billcode.trim(); + if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){ let billRes = await listEmisWaybill({billCode:billcode}); if(!billRes || billRes.code != 200 || !billRes.rows || billRes.rows.length < 1){ diff --git a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue index ccfadd97..9cbcdafa 100644 --- a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue +++ b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue @@ -669,12 +669,12 @@ export default { // return; // } // } - let exitlist = this.emisWaybillList.filter(item => (item.billCode == bcList[bc] && item.problemId == this.form.problemId)); + let exitlist = this.emisWaybillList.filter(item => (item.billCode == bcList[bc].trim() && item.problemId == this.form.problemId)); if(exitlist.length > 0){ - this.$message.error("单号:"+ bcList[bc] + ", 已存在"); + this.$message.error("单号:"+ bcList[bc].trim() + ", 已存在"); continue; }else{ - await this.addToList(bcList[bc]); + await this.addToList(bcList[bc].trim()); } } this.loading = false;