From bde3147a240e14ab18d16dc871e4a71f75a5e393 Mon Sep 17 00:00:00 2001 From: liuyp Date: Sat, 18 May 2024 21:55:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug-530=EF=BC=9A=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=88=87=E6=8D=A2=E5=AF=84=E4=BB=B6=E7=BD=91=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emis/EmisBaseTools/EmisSiteSimplePicker.vue | 6 ++++++ src/views/emis/emisWaybill/emisWaybillRecord.vue | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue index 5ff44b04..fa899501 100644 --- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue +++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue @@ -64,6 +64,7 @@ optionItems: [], svalue: this.value, firstFlag:true, + filterMap:new Map(), queryParams:{ pageNum:1, pageSize:10, @@ -115,6 +116,11 @@ this.queryParams.siteName=val; listSimpleEmisSite(this.queryParams).then(response => { this.optionItems=response.rows; + response.rows.forEach(item => { + if(!this.filterMap.hasOwnProperty(item.siteCode)){ + this.filterMap[item.siteCode]=item; + } + }); }); }, onMouseleave(e, i) { diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue index aa874002..994c4d0c 100644 --- a/src/views/emis/emisWaybill/emisWaybillRecord.vue +++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue @@ -98,8 +98,9 @@ - - + + + @@ -643,6 +644,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue'; +import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue'; import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue'; @@ -702,6 +704,7 @@ components: { EmisUserSimplePicker1, EmisUserSimplePicker2, EmisUserSimplePicker3, + EmisSiteSimplePicker, // CustomerPicker0, // CustomerPicker1, // CustomerPicker2, @@ -1140,6 +1143,15 @@ methods: { this.form.transLine=item[0]; this.form.productType=item[1]; }, + onSendSiteSelect(item){ + if(!item){ + this.form.sendSiteCode = null; + this.form.sendSiteName = null; + return; + } + this.form.sendSiteCode=item.siteCode; + this.form.sendSiteName=item.siteName; + }, /** 提交按钮 */ submitForm() { this.$refs["form"].validate(valid => { From a98d45a6b5db7f88f88999f195bfa6d2309a6668 Mon Sep 17 00:00:00 2001 From: liuyp Date: Sat, 18 May 2024 22:35:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug-559=EF=BC=9A=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=89=AB=E6=8F=8F=E6=9C=AA=E5=88=A4=E6=96=AD=E5=BD=93?= =?UTF-8?q?=E5=A4=A9=E6=98=AF=E5=90=A6=E9=87=8D=E5=A4=8D=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrivalAndDispathScan.vue | 34 ++++++++++++--- .../emis/emisTmsScanRecord/arrivalScan.vue | 26 ++++++++--- .../emisTmsScanRecord/coPackageScanning.vue | 29 +++++++++---- .../emis/emisTmsScanRecord/deliveryScan.vue | 26 ++++++++--- .../emis/emisTmsScanRecord/loadingScan.vue | 35 ++++++++++++--- .../emis/emisTmsScanRecord/outgoingScan.vue | 27 ++++++++---- .../emisTmsScanRecord/positionScanning.vue | 26 ++++++++--- .../emis/emisTmsScanRecord/scanRecord.vue | 26 ++++++++--- .../transmitReceiveScanning.vue | 43 ++++++++++++------- .../emis/emisTmsScanRecord/unloadingScan.vue | 32 ++++++++++---- .../emis/emisTmsScanRecord/unpackScan.vue | 25 +++++++---- 11 files changed, 239 insertions(+), 90 deletions(-) diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue index f77acd82..69bc3fe7 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue @@ -246,15 +246,35 @@ export default { let scanWeight = this.form.scanWeight let dispatchOrSendMan = this.form.dispatchOrSendMan; let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + // let scList=bcList.map(function(code) { + // return { + // billCode:code, + // scanWeight:scanWeight, + // // scanWeight:null, + // dispatchOrSendManCode: dispatchOrSendManCode + // } + // } + // ) + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code+"30"] || dm[code+"40"]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } // 到件批量 let scanArrivalInfo = { diff --git a/src/views/emis/emisTmsScanRecord/arrivalScan.vue b/src/views/emis/emisTmsScanRecord/arrivalScan.vue index 06f48d89..d1524c47 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalScan.vue @@ -236,15 +236,27 @@ export default { let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[]; let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"30", diff --git a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue index f2f31e70..07e174e3 100644 --- a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue +++ b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue @@ -235,17 +235,28 @@ export default { let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[]; let scanWeight = this.form.scanWeight; let bagNo = this.form.bagNo; - let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - bagNo:bagNo, - scanWeight:scanWeight, - // scanWeight:null, - scanDate:null - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + bagNo:bagNo, + scanWeight:scanWeight, + // scanWeight:null, + scanDate:null + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"200", diff --git a/src/views/emis/emisTmsScanRecord/deliveryScan.vue b/src/views/emis/emisTmsScanRecord/deliveryScan.vue index 20041221..0d394856 100644 --- a/src/views/emis/emisTmsScanRecord/deliveryScan.vue +++ b/src/views/emis/emisTmsScanRecord/deliveryScan.vue @@ -242,15 +242,27 @@ export default { let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[]; let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"40", diff --git a/src/views/emis/emisTmsScanRecord/loadingScan.vue b/src/views/emis/emisTmsScanRecord/loadingScan.vue index a1a9a965..bd1d6ef4 100644 --- a/src/views/emis/emisTmsScanRecord/loadingScan.vue +++ b/src/views/emis/emisTmsScanRecord/loadingScan.vue @@ -228,15 +228,36 @@ export default { // let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; let carNo = this.form.carNo; + // let scList=bcList.map(function(code) { + // return { + // billCode:code, + // // scanWeight:scanWeight, + // carNo:carNo, + // dispatchOrSendManCode: dispatchOrSendManCode + // } + // } + // ) + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - // scanWeight:scanWeight, - carNo:carNo, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + // scanWeight:scanWeight, + carNo:carNo, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"301", diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue index e237d2bb..e2b1a141 100644 --- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue +++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue @@ -229,23 +229,34 @@ export default { this.openBatch=false; }, submitFormBatch(){ - if(this.formBatch.billCode==null || this.formBatch.billCode==''){ this.$message.error("输入单号后回车"); return; } let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[]; + let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"20", diff --git a/src/views/emis/emisTmsScanRecord/positionScanning.vue b/src/views/emis/emisTmsScanRecord/positionScanning.vue index 02b12c96..c2d06ea9 100644 --- a/src/views/emis/emisTmsScanRecord/positionScanning.vue +++ b/src/views/emis/emisTmsScanRecord/positionScanning.vue @@ -247,15 +247,27 @@ export default { let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[]; let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"70", diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue index 91825e79..928bf8f5 100644 --- a/src/views/emis/emisTmsScanRecord/scanRecord.vue +++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue @@ -242,15 +242,27 @@ export default { let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[]; let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"10", diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue index ae7341bd..74a09eae 100644 --- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue +++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue @@ -278,6 +278,16 @@ export default { this.form.ids= arr.map(item=>item.id+item.scanType) }, handleBatchScan(){ + let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + let preOrNextStationCode = this.form.preOrNextStationCode; + if(dispatchOrSendManCode==null || dispatchOrSendManCode==''){ + this.$message.error("请选择取件员"); + return; + } + if(preOrNextStationCode==null||preOrNextStationCode==''){ + this.$message.error("请选择下一站"); + return; + } this.formBatch = { billCode: null, } @@ -310,23 +320,26 @@ export default { this.$message.error("输入单号后回车"); return; } - if(dispatchOrSendManCode==null || dispatchOrSendManCode==''){ - this.$message.error("请选择取件员"); - return; - } - if(preOrNextStationCode==null||preOrNextStationCode==''){ - this.$message.error("请选择下一站"); - return; - } + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code+"10"] || dm[code+"20"]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } // 揽件批量 let scanArrivalInfo = { diff --git a/src/views/emis/emisTmsScanRecord/unloadingScan.vue b/src/views/emis/emisTmsScanRecord/unloadingScan.vue index 2f7fecc3..9a98a02c 100644 --- a/src/views/emis/emisTmsScanRecord/unloadingScan.vue +++ b/src/views/emis/emisTmsScanRecord/unloadingScan.vue @@ -210,16 +210,32 @@ export default { // let scanWeight = this.form.scanWeight // let dispatchOrSendManCode = this.form.dispatchOrSendManCode; let carNo = this.form.carNo; + // let scList=bcList.map(function(code) { + // return { + // billCode:code, + // carNo: carNo + // } + // } + // ) + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - carNo: carNo - // scanWeight:scanWeight, - // scanWeight:null, - // dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + carNo: carNo + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"302", diff --git a/src/views/emis/emisTmsScanRecord/unpackScan.vue b/src/views/emis/emisTmsScanRecord/unpackScan.vue index ce9aa6cd..6259c96d 100644 --- a/src/views/emis/emisTmsScanRecord/unpackScan.vue +++ b/src/views/emis/emisTmsScanRecord/unpackScan.vue @@ -223,16 +223,25 @@ export default { } let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[]; let scanWeight = this.form.scanWeight - let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - // dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + } + }) + + if(haveCode){ + this.$message.error("重复扫描："+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"201", From 57a6b607738bbd2e500c4e24af838d6f50be27f5 Mon Sep 17 00:00:00 2001 From: liuyp Date: Sat, 18 May 2024 22:58:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug-564=EF=BC=9A=E6=B4=BE?= =?UTF-8?q?=E4=BB=B6=E5=91=98=E5=AD=97=E6=AE=B5=E6=94=BE=E5=9C=A8=E6=9C=80?= =?UTF-8?q?=E5=89=8D=E9=9D=A2=20=E5=BF=85=E5=A1=AB=E9=A1=B9=20=E6=A0=87?= =?UTF-8?q?=E7=BA=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emisTmsScanRecord/arrivalAndDispathScan.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue index 69bc3fe7..c8495460 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue @@ -2,21 +2,23 @@
+ + + {{$t('派件员')}} + + + + - 扫描单号 + {{$t('扫描单号')}} - - - - -