From 17aca9be31ff94c2503541b378cd5fd9b387363b Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Wed, 31 Dec 2025 16:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E9=A2=84=E8=AD=A6=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisWaybill/centerWaybillList.vue    | 23 +++++++++++++++----
 .../emis/emisWaybill/dispatchWaybillList.vue  | 23 +++++++++++++++----
 .../emis/emisWaybill/sendWaybillListNew.vue   |  8 +++----
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index 943772f4..0bbffa5a 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -394,7 +394,7 @@
       </el-table-column>
       <el-table-column :label="$t('跟踪预警')" align="center" prop="traceWaring" min-width="100" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
-              <div v-if="scope.row.lastScanRecord!=null" >
+              <div v-if="scope.row.lastScanDate!=null" >
                 <div v-if="scope.row.blSign=='1'" >
                   已签收
                 </div>
@@ -403,11 +403,11 @@
                       <span style="color: red">{{ scope.row.problemTypeName }}</span>
                     </div>
                     <div v-else>
-                    <span v-if="calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)>2" style="color: red" >
-                          轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}} 天
+                      <span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
+                        轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
                     </span>
                     <span v-else  >
-                      {{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}}天
+                        {{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
                     </span>
                     </div>
                 </div>
@@ -654,6 +654,7 @@ import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMul
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
 
 import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
+import {  queryLastRecord } from "@/api/emis/emisTmsScanRecord";
 
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 import { formatSearchStr,deepClone } from '@/utils/index'
@@ -1017,6 +1018,8 @@ export default {
         this.emisWaybillList = response.rows;
         this.total = response.total;
         this.loading = false;
+        
+        this.showLastTraceInfo();
       });
 
        // 查询统计
@@ -1024,7 +1027,17 @@ export default {
         this.queryStatInfoMap = response.data;
       });
     },
-
+    showLastTraceInfo(){
+      if(this.emisWaybillList&&this.emisWaybillList.length>0){
+        this.emisWaybillList.forEach(item=>{
+          queryLastRecord(item.billCode).then(response => {
+            let data=response.data;
+            item.lastTraceInfo=data.lastTraceInfo;
+            item.lastScanDate=data.scanDate;
+          });
+        });
+      }
+    },
     onDateSelect(value){
       this.dateTimeRange=value;
       // scanDate
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 40528d5f..ff9d34d3 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -377,7 +377,7 @@
       </el-table-column>
       <el-table-column :label="$t('跟踪预警')" align="center" prop="traceWaring" min-width="100" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
-              <div v-if="scope.row.lastScanRecord!=null" >
+              <div v-if="scope.row.lastScanDate!=null" >
                 <div v-if="scope.row.blSign=='1'" >
                   已签收
                 </div>
@@ -386,11 +386,11 @@
                       <span style="color: red">{{ scope.row.problemTypeName }}</span>
                     </div>
                     <div v-else>
-                    <span v-if="calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)>2" style="color: red" >
-                          轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}} 天
+                      <span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
+                            轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
                     </span>
                     <span v-else  >
-                      {{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}}天
+                        {{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
                     </span>
                 </div>
               </div>
@@ -631,6 +631,7 @@ import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMul
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
 
 import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
+import {  queryLastRecord } from "@/api/emis/emisTmsScanRecord";
 
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 import { formatSearchStr,deepClone } from '@/utils/index'
@@ -983,6 +984,8 @@ export default {
         this.emisWaybillList = response.rows;
         this.total = response.total;
         this.loading = false;
+
+        this.showLastTraceInfo();
       });
 
        // 查询统计
@@ -990,7 +993,17 @@ export default {
         this.queryStatInfoMap = response.data;
       });
     },
-
+    showLastTraceInfo(){
+      if(this.emisWaybillList&&this.emisWaybillList.length>0){
+        this.emisWaybillList.forEach(item=>{
+          queryLastRecord(item.billCode).then(response => {
+            let data=response.data;
+            item.lastTraceInfo=data.lastTraceInfo;
+            item.lastScanDate=data.scanDate;
+          });
+        });
+      }
+    },
     onDateSelect(value){
       this.dateTimeRange=value;
       // scanDate
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index d8a8ac27..b5027820 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -373,7 +373,7 @@
       </el-table-column>
       <el-table-column :label="$t('跟踪预警')" align="center" prop="traceWaring" min-width="100" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
-              <div v-if="scope.row.lastScanRecord!=null" >
+              <div v-if="scope.row.lastScanDate!=null" >
                 <div v-if="scope.row.blSign=='1'" >
                   已签收
                 </div>
@@ -382,11 +382,11 @@
                         <span style="color: red">{{ scope.row.problemTypeName }}</span>
                     </div>
                     <div v-else>
-                    <span v-if="calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)>2" style="color: red" >
-                          轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}} 天
+                      <span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
+                            轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
                     </span>
                     <span v-else  >
-                      {{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}}天
+                        {{calcDeliveryTime(new Date(),scope.row.lastScanDate)}}天
                     </span>
                 </div>
               </div>