From 830e4ae4a426dbee331c4786de760bac50f6267c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 14:27:51 +0800
Subject: [PATCH] md

---
 .../emis/customerService/traceRecordList.vue  | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/views/emis/customerService/traceRecordList.vue b/src/views/emis/customerService/traceRecordList.vue
index 64daa121..3bef3034 100644
--- a/src/views/emis/customerService/traceRecordList.vue
+++ b/src/views/emis/customerService/traceRecordList.vue
@@ -126,7 +126,8 @@ export default {
 60 退回件
 70 留仓扫描
 80 转件扫描
-81 转件扫描
+81 转件扫描（三方）
+90 提货扫描
 -1 问题件
 100 入库扫描
 101 出库扫描
@@ -147,11 +148,11 @@ export default {
          const scanType=scanRecord.scanType;
          // 揽收扫描
          if(scanType=="10"){
-             content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>已做收件扫描,收件员是<span class="siteOrManHighlight" >['+scanRecord.dispatchOrSendMan+']</span>';
+             content='揽收，快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>收件,收件员是<span class="siteOrManHighlight" >['+scanRecord.dispatchOrSendMan+']</span>';
          }
          // 合包扫描
          else if(scanType=="200"){
-             content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>合包，合包号[<span class="siteOrManHighlight" >['+scanRecord.bagNo+']</span>';
+             content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>合包，合包号[<span class="siteOrManHighlight" >['+scanRecord.bagNo+']</span>下一站发往[<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
          }
           // 拆包扫描
          else if(scanType=="201"){
@@ -163,37 +164,41 @@ export default {
          }
         // 装车扫描
          else if(scanType=="301"){
-             content='快件已装车<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往[<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>,车牌号:'+scanRecord.carNo;
+             content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>装车，下一站发往[<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>,车牌号:'+scanRecord.carNo;
          }
         // 卸车扫描
           else if(scanType=="302"){
-             content='快件已卸车<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,车牌号:'+scanRecord.carNo;
+             content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>卸车,车牌号:'+scanRecord.carNo;
          }
          // 到件扫描
          else if(scanType=="30"){
-             content='快件已到达 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>上一站是[<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
+             content='快件到达<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>上一站是[<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
          }
          // 派送扫描
          else if(scanType=="40"){
-             content='快件在 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>开始派送,已分配派件员<span class="siteOrManHighlight" >['+scanRecord.dispatchOrSendMan+']</span>';
+             content='派件，快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>开始派送,已分配派件员<span class="siteOrManHighlight" >['+scanRecord.dispatchOrSendMan+']</span>';
          }
          // 签收扫描
          else if(scanType=="50"){
-             content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>已签收，签收人<span class="siteOrManHighlight" >['+scanRecord.signMan+']</span>';
+             content='签收,快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>已签收，签收人<span class="siteOrManHighlight" >['+scanRecord.signMan+']</span>';
          }
          // 留仓
          else if(scanType=="70"){
-          content='快件[留仓],停留在网点 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,'+scanRecord.remark;
+          content='留仓,停留在网点 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,'+scanRecord.remark;
          }
          // 转单扫描
          else if(scanType=="80"){
-          content='快件[转件],转件网点 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,转件人<span class="siteOrManHighlight" >['+scanRecord.scanMan+']</span>';
+          content='转单,快件在网点 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,转件人<span class="siteOrManHighlight" >['+scanRecord.scanMan+']</span>';
          }
          // 转件第三方物流信息,拼接三方公司物流轨迹
          else if(scanType=="81"){
           content='<span class="transferGray" >'+scanRecord.remark+'</span>';
              // 查询转单轨迹
              // 拼接三方公司物流轨迹
+         }
+           // 提货扫描
+           else if(scanType=="90"){
+             content='提货签收，快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>提货，提货人<span class="siteOrManHighlight" >['+scanRecord.signMan+']</span>';
          }
          // 问题件
          else if(scanType=="-1"){
@@ -201,11 +206,11 @@ export default {
          }
          // 报关扫描
          else if(scanType=="700"){
-             content='报关扫描，快件已报关<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
+             content='报关，快件已报关<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
          }
          // 清关扫描
          else if(scanType=="800"){
-             content='清关扫描，快件已清关<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
+             content='清关，快件已清关<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
          }
         //  content='<span style="color: #C53144;">'+content+'</span>';
          return content;