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:{