From 6bdd0b2a40b7ee1352a2c816dac7ea41bc10529d Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 16 Jan 2026 13:52:32 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E8=BD=A8=E8=BF=B9?=
=?UTF-8?q?=E5=B7=B2=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/emis/emisTmsScanRecord/outgoingScan.vue | 8 +++++---
.../emis/emisTmsScanRecord/scanRecordQuery.vue | 14 +++++++++++++-
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
index 22b9dacb..ff80d686 100644
--- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
@@ -66,6 +66,9 @@
v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
>批量扫描
+
+ 轨迹已结束
+
@@ -159,7 +162,7 @@ export default {
emisTmsScanRecordList: [],
queryParams:{},
tableHeight: 200,
-
+ blLastTrack:0,
// 是否显示弹出层
open: false,
// 表单校验
@@ -416,8 +419,7 @@ export default {
});
// 检查
- let scanInfo = {scanType:"20",opType:2,scanData:scanData}
- console.log(scanInfo)
+ let scanInfo = {scanType:"20",opType:2,scanData:scanData, blLastTrack:this.blLastTrack?1:0}
doScan(scanInfo).then(response => {
console.log(response);
diff --git a/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue b/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
index 699c55d6..801271b1 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
@@ -56,6 +56,12 @@
+
+
+
+
+
+
@@ -162,7 +168,12 @@
-
+
+
+ 已结束
+ 未结束
+
+
@@ -305,6 +316,7 @@ export default {
queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：0
// scanType:"",
isSubBill:"",
+ blLastTrack:null,
},
// 修改参数
modifyParams:{
From 3a12613cd63d565b2b71c9b338dfbd5460afcca5 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 16 Jan 2026 13:54:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue b/src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue
index f23bb840..5d549af2 100644
--- a/src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue
+++ b/src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue
@@ -208,7 +208,7 @@
-
+
From a596fd8944a989f8c360979369022cd512c48771 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Fri, 16 Jan 2026 17:05:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=8F=90=E9=86=92?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emis/emisTmsScanRecord/outgoingScan.vue | 27 +++++++++++--------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
index ff80d686..4cf0b768 100644
--- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
@@ -420,27 +420,32 @@ export default {
// 检查
let scanInfo = {scanType:"20",opType:2,scanData:scanData, blLastTrack:this.blLastTrack?1:0}
-
+ let count = 0;
doScan(scanInfo).then(response => {
- console.log(response);
let scanRstItem = response.data.scanResult[0];
- console.log(scanRstItem);
- if(scanRstItem.result != 'success'){
- this.$modal.msgError(scanRstItem.message);
- return;
- }
+ let scanRstItems = response.data.scanResult;
+ // if(scanRstItem.result != 'success'){
+ // this.$modal.msgError(scanRstItem.message);
+ // return;
+ // }
let newList = [];
this.emisTmsScanRecordList.forEach(item => {
- if(this.ids.indexOf(item.billCode) > -1){
- this.dataMap[item.billCode]=null;
- }else{
+ // item.billcode 在 scanResultItem 里面result 不是成功 就加入newList
+ let scanRstItemResult = scanRstItems.find(scanRstItem => scanRstItem.billCode == item.billCode);
+ if (scanRstItemResult.result != 'success') {
+ if (count == 0) {
+ this.$modal.msgError(scanRstItem.message);
+ }
+ count++;
newList.push(item);
}
})
this.ids = [];
this.selection = null;
this.emisTmsScanRecordList = newList;
- this.$modal.msgSuccess(scanRstItem.message);
+ if(newList.length == 0){ // 所有都成功
+ this.$modal.msgSuccess("上传成功");
+ }
});