From 4b744d9620e4989cdbebbd27dd94d38d6e8a1fb2 Mon Sep 17 00:00:00 2001 From: liuyp Date: Mon, 3 Jun 2024 19:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5&=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrivalAndDispathScan.vue | 3 - .../emis/emisTmsScanRecord/arrivalScan.vue | 3 - .../clearanceScanUnderDevelopment.vue | 3 - .../emisTmsScanRecord/coPackageScanning.vue | 3 - .../customsClearanceScanning.vue | 3 - .../emis/emisTmsScanRecord/deliveryScan.vue | 3 - .../emis/emisTmsScanRecord/loadingScan.vue | 3 - .../emis/emisTmsScanRecord/outgoingScan.vue | 3 - .../emisTmsScanRecord/positionScanning.vue | 3 - .../emis/emisTmsScanRecord/scanRecord.vue | 3 - .../emis/emisTmsScanRecord/signAndRecord.vue | 3 - .../transmitReceiveScanning.vue | 3 - .../emis/emisTmsScanRecord/unloadingScan.vue | 3 - .../emis/emisTmsScanRecord/unpackScan.vue | 3 - .../centralProblemInquiry.vue | 12 +- .../emisWaybillProblemInfo/problemEntry.vue | 222 +++++++++++------- .../receivedProblemInquiries.vue | 13 +- .../registrationProblemInquiry.vue | 12 +- .../emisWaybillTransfer/waybillTransfer.vue | 20 +- 19 files changed, 189 insertions(+), 132 deletions(-) diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue index 7e3a2c54..6dbb56d1 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue @@ -109,9 +109,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/arrivalScan.vue b/src/views/emis/emisTmsScanRecord/arrivalScan.vue index 93ba8e91..88a9ef7c 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalScan.vue @@ -108,9 +108,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue b/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue index 0d425468..2dc94183 100644 --- a/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue +++ b/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue @@ -109,9 +109,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue index 350639cd..e379967e 100644 --- a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue +++ b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue @@ -114,9 +114,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue b/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue index 93d41d6e..a80fd755 100644 --- a/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue +++ b/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue @@ -109,9 +109,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/deliveryScan.vue b/src/views/emis/emisTmsScanRecord/deliveryScan.vue index 7b64d958..c65671fc 100644 --- a/src/views/emis/emisTmsScanRecord/deliveryScan.vue +++ b/src/views/emis/emisTmsScanRecord/deliveryScan.vue @@ -101,9 +101,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/loadingScan.vue b/src/views/emis/emisTmsScanRecord/loadingScan.vue index d2e53afa..0a1929ee 100644 --- a/src/views/emis/emisTmsScanRecord/loadingScan.vue +++ b/src/views/emis/emisTmsScanRecord/loadingScan.vue @@ -106,9 +106,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue index 7df0a966..e9bb44c0 100644 --- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue +++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue @@ -109,9 +109,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/positionScanning.vue b/src/views/emis/emisTmsScanRecord/positionScanning.vue index 2675240e..5fead701 100644 --- a/src/views/emis/emisTmsScanRecord/positionScanning.vue +++ b/src/views/emis/emisTmsScanRecord/positionScanning.vue @@ -112,9 +112,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue index c76377d8..dd89d452 100644 --- a/src/views/emis/emisTmsScanRecord/scanRecord.vue +++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue @@ -108,9 +108,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue index dcaa748f..c2b93426 100644 --- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue +++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue @@ -186,9 +186,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue index 1a37264e..2aa4f5c7 100644 --- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue +++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue @@ -159,9 +159,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/unloadingScan.vue b/src/views/emis/emisTmsScanRecord/unloadingScan.vue index 14f57156..3565dc71 100644 --- a/src/views/emis/emisTmsScanRecord/unloadingScan.vue +++ b/src/views/emis/emisTmsScanRecord/unloadingScan.vue @@ -102,9 +102,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisTmsScanRecord/unpackScan.vue b/src/views/emis/emisTmsScanRecord/unpackScan.vue index 516b3d44..d694f4a0 100644 --- a/src/views/emis/emisTmsScanRecord/unpackScan.vue +++ b/src/views/emis/emisTmsScanRecord/unpackScan.vue @@ -100,9 +100,6 @@ - -
T0123219321 有问题
-
diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue index eef6ac12..2ccb3b26 100644 --- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue +++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue @@ -167,7 +167,11 @@ - + + +
@@ -725,4 +729,10 @@ export default { margin-right: 0; } } + .ellipsis { + width:200px; + overflow: hidden; /* 确保超出容器的内容被裁剪 */ + white-space: nowrap; /* 确保文本在一行内显示 */ + text-overflow: ellipsis; /* 超出部分显示省略号 */ + } diff --git a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue index 9e5f7ac7..882145e5 100644 --- a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue +++ b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue @@ -7,7 +7,7 @@ 扫描单号 - + @@ -16,7 +16,10 @@ - + + + + @@ -38,16 +41,6 @@ - - - 登记 - @@ -66,6 +59,15 @@ >
+ + 登记 + + - + {{ parseTime(scope.row.scanDate) }} + @@ -173,9 +175,6 @@ - -
T0123219321 有问题
-
@@ -218,6 +217,8 @@ export default { // 问题件表格数据 emisWaybillList: [], + notifySiteDataSource:[], + title: "", open: false, titleBatch:"", @@ -227,10 +228,9 @@ export default { problemType:null, openForm: false, titleForm: "", - + tempRecord:{}, titleEmisWaybillProblemInfo: "", openEmisWaybillProblemInfo: false, - // 显示编辑框更多 moreInputVisible: false, @@ -286,13 +286,14 @@ export default { this.multiple = !selection.length }, onScanSiteSelect(item){ + // debugger if(!item){ - this.form.modifyNotifySite = null; - this.form.modifyNotifySiteName = null; + this.form.notifySiteCode = null; + this.form.notifySiteName = null; return; } - this.form.notifySite=item && item.siteCode; - this.form.notifySiteName=item && item.siteName; + this.form.notifySiteCode=item.siteCode; + this.form.notifySiteName=item.siteName; }, onproblemTypeSelect(item){ // debugger; @@ -345,22 +346,68 @@ export default { this.$message.error("输入单号后回车"); return; } - // if(this.form.notifySite==null || this.form.notifySite==''){ - // this.$message.error("请选择通知网点"); - // return; - // } + // this.getWaybill(this.form.billCode) + this.loading = true; + listEmisWaybill({billCode:this.form.billCode}).then(response => { + this.loading = false; + let scanDate = new Date(); + if(response.code != 200){ + this.$message.error(response.msg); + return; + } + let rows = response.rows; + if(!rows || rows.length == 0){ + this.$message.error("未查到单号"); + this.form.billCode=null; + return; + } + if(rows.length>0) { + let rsItem = rows[0]; + console.log(rsItem); + this.tempRecord =Object.assign({}, rsItem) + // tempRecord.notifySite = tempRecord.sendSiteCode; + // tempRecord.notifySiteName = tempRecord.sendSiteName; + this.tempRecord.scanSiteCode=this.form.scanSiteCode; + this.tempRecord.scanSite=this.form.scanSite; + this.tempRecord.scanDate=scanDate; + this.tempRecord.scanMan=this.form.scanMan; + this.tempRecord.scanManCode=this.form.scanManCode; + this.tempRecord.dataFrom="PC"; + this.notifySiteDataSource=[ + { + siteCode:this.tempRecord.sendSiteCode, + siteName:this.tempRecord.sendSiteName, + }, + { + siteCode:this.tempRecord.dispatchUnderlingSiteCode, + siteName:this.tempRecord.dispatchUnderlingSiteName, + } + ] + // this.billInputDisabled = true; + // this.emisWaybillList.push(tempRecord); + // this.dataMap[this.form.billCode]=tempRecord; + } + // this.form.billCode=null; + }) + }, + handleRegister(){ - // if(this.form.problemType==null || this.form.problemType==''){ - // this.$message.error("请选择问题类型"); - // return; - // } + this.tempRecord.notifySiteCode = this.form.notifySiteCode; + this.tempRecord.notifySiteName = this.form.notifySiteName; + this.tempRecord.problemType = this.form.problemType; + this.tempRecord.problemId = this.form.problemId; + this.tempRecord.remark = this.form.remark; + this.tempRecord.picUrl=this.form.picUrl; + this.emisWaybillList.push(this.tempRecord); + this.dataMap[this.form.billCode]=this.tempRecord; - // if(this.dataMap[this.form.billCode]){ - // this.$message.error("重复登记"); - // this.playNoticeTone(1); - // return; - // } - this.getWaybill(this.form.billCode) + //清理数据 + this.form.notifySiteCode=""; + this.form.notifySiteName=""; + this.tempRecord=null; + this.form.billCode=null; + this.notifySiteDataSource=[]; + console.log(this.emisWaybillList) }, getWaybill(billCode){ this.loading = true; @@ -380,12 +427,13 @@ export default { let rsItem = rows[index]; console.log(rsItem); let record =Object.assign({}, rsItem) - record.notifySite = this.form.notifySite; - record.notifySiteName = this.form.notifySiteName; + record.notifySiteCode = recs; + record.notifySiteName = record.sendSiteName; record.scanSiteCode=this.form.scanSiteCode; record.scanSite=this.form.scanSite; record.scanDate=scanDate; record.problemType=this.form.problemType; + record.problemId=this.form.problemId; record.scanMan=this.form.scanMan; record.scanManCode=this.form.scanManCode; record.picUrl=this.form.picUrl; @@ -399,48 +447,49 @@ export default { }, handleUpload(){ let scanData=[]; - let problemInfoList=[]; + // let problemInfoList=[]; this.emisWaybillList.forEach(item=>{ + // item.currentStatus="已上传"; if(this.ids.indexOf(item.id) > -1){ scanData.push( { billCode:item.billCode, - problemType:item.problemType, - notifySite:item.notifySite, + problemType:item.problemId, + notifySite:item.notifySiteCode, picUrl:item.picUrl, remark:item.remark, scanWeight:item.scanWeight, scanDate:item.scanDate } ) - problemInfoList.push({ - billCode: item.billCode, - problemType: item.problemType, - problemTitle: null, - problemCause: item.remark, - sendSite: item.sendSiteName, - sendSiteCode: item.sendSiteCode, - registerManCode: item.registerManCode, - registerManDept: null, - registerSiteCode: item.registerSiteCode, - registerDate: item.registerDate, - registerSaveDate: null, - dataFrom: item.dataFrom, - status: null,//item.waybillStatus,//？？？？？？？？是否正确 - isSendSiteRegister: null, - // blReversion: false,//？？？？？？？？是否正确 - blReversion: null, - reversionStr: null, - reversionMan: null, - reversionManCode: null, - reversionDate: null, - blCheckok: null, - blSee: null, - filePath: item.picUrl, - modifySiteCode: null, - delFlag: item.delFlag,//？？？？？？？？是否正确 - remark: item.remark,//？？？？？？？？是否正确 - }) + // problemInfoList.push({ + // billCode: item.billCode, + // problemType: item.problemType, + // problemTitle: null, + // problemCause: item.remark, + // sendSite: item.sendSiteName, + // sendSiteCode: item.sendSiteCode, + // registerManCode: item.registerManCode, + // registerManDept: null, + // registerSiteCode: item.registerSiteCode, + // registerDate: item.registerDate, + // registerSaveDate: null, + // dataFrom: item.dataFrom, + // status: null,//item.waybillStatus,//？？？？？？？？是否正确 + // isSendSiteRegister: null, + // // blReversion: false,//？？？？？？？？是否正确 + // blReversion: null, + // reversionStr: null, + // reversionMan: null, + // reversionManCode: null, + // reversionDate: null, + // blCheckok: null, + // blSee: null, + // filePath: item.picUrl, + // modifySiteCode: null, + // delFlag: item.delFlag,//？？？？？？？？是否正确 + // remark: item.remark,//？？？？？？？？是否正确 + // }) } }); @@ -450,6 +499,8 @@ export default { scanData:scanData }; + let newList = []; + doScan(scanProblemInfo).then(response => { let scanRstItem = response.data.scanResult[0]; console.log(scanRstItem); @@ -457,24 +508,29 @@ export default { this.$modal.msgError(scanRstItem.message); return; } - + this.emisWaybillList.forEach(item=>{ + if(this.ids.indexOf(item.id) > -1){ + item.currentStatus="已上传"; + } + newList.push(item); + }) + this.emisWaybillList = newList; this.$modal.msgSuccess(scanRstItem.message); }); - problemInfoList.forEach(item => { - addEmisWaybillProblemInfo(item).then(response => { - // debugger; - if(response.code != "200"){ - this.$modal.msgError(response.msg); - return; - } - this.$modal.msgSuccess(response.msg); - }) - }) + // problemInfoList.forEach(item => { + // addEmisWaybillProblemInfo(item).then(response => { + // // debugger; + // if(response.code != "200"){ + // this.$modal.msgError(response.msg); + // return; + // } + // this.$modal.msgSuccess(response.msg); + // }) + // }) }, /** 提交按钮 */ submitForm() { let newList = []; - debugger for(let i = 0; i< this.emisWaybillList.length;i++){ let waybill = {...this.emisWaybillList[i]}; if(this.ids.indexOf(waybill.id) > -1){ diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue index b94ab6a4..1e7e15c0 100644 --- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue +++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue @@ -131,7 +131,11 @@ - + + + @@ -880,4 +884,11 @@ export default { padding: 0 12px 0 0; box-sizing: border-box; } + + .ellipsis { + width:200px; + overflow: hidden; /* 确保超出容器的内容被裁剪 */ + white-space: nowrap; /* 确保文本在一行内显示 */ + text-overflow: ellipsis; /* 超出部分显示省略号 */ + } diff --git a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue index 868e7fd9..77e89e56 100644 --- a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue +++ b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue @@ -126,7 +126,11 @@ - + + + @@ -830,4 +834,10 @@ export default { padding: 0 12px 0 0; box-sizing: border-box; } + .ellipsis { + width:200px; + overflow: hidden; /* 确保超出容器的内容被裁剪 */ + white-space: nowrap; /* 确保文本在一行内显示 */ + text-overflow: ellipsis; /* 超出部分显示省略号 */ + } diff --git a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue index 4add55f8..b1e3670e 100644 --- a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue +++ b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue @@ -50,7 +50,7 @@ - + @@ -156,11 +156,16 @@ - + + + - - + + @@ -366,6 +371,13 @@ export default { }); // this.getList(); }, + mounted() { + const end = new Date() + const start = new Date() + start.setHours(0,0,0,0) + end.setHours(23,59,59,0) + this.dateTimeRange=[start,end]; + }, methods: { /** 查询运单转件表列表 */ getList() {