From 8ff4d5dce4b57fa79e682415c54d38db055470f1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 7 Aug 2024 11:54:30 +0800
Subject: [PATCH] md

---
 src/components/XdTable/index.vue              | 13 ----------
 .../emis/customerService/traceRecordList.vue  |  6 +++--
 .../traceWaybillDetailView.vue                | 20 +++++++++------
 .../emis/customerService/waybillTracking.vue  | 25 +++++++------------
 .../emisSettleBill/panel/SiteConfimPanel.vue  |  2 --
 5 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index 3f335bc1..d937d75e 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -450,19 +450,6 @@ export default {
                     });
 
                   }
-
-                //  function addCtrlCKeyDown(oDiv,event){
-                //     let that=this;
-                //     vnode.context.clearEventBubble(event)
-                //     oDiv.addEventListener('keydown', function(e) {
-                //       e = e||window.event;
-                //       if(e.ctrlKey&&e.code=="KeyC"){
-                //         vnode.context.handleCopySelect(e);
-                //         return false;
-                //       }
-                //     });
-                //   }
-
                   function cancelContextMenu() {
                     document.oncontextmenu = new Function("event.returnValue=true");
                   }
diff --git a/src/views/emis/customerService/traceRecordList.vue b/src/views/emis/customerService/traceRecordList.vue
index e8c6efca..007fbd67 100644
--- a/src/views/emis/customerService/traceRecordList.vue
+++ b/src/views/emis/customerService/traceRecordList.vue
@@ -98,14 +98,16 @@ export default {
       return val1.getTime() - val2.getTime()
     },
     getList() {
+
+
+          console.log("======>traceRecordListxxxx1=====>",this.scanRecordList);
+
          this.loading = true;
          let ownerSiteCode=this.$store.getters.ownerSiteCode;
          getTraceListByBillCode(this.queryParams).then(response => {
           this.scanRecordList = response.rows;
           this.total=response.total;
 
-
-          // console.log("======>traceRecordListxxxx1=====>",this.scanRecordList);
           let i=0;
           let len=this.scanRecordList.length;
           for(i=0;i<len;i++){
diff --git a/src/views/emis/customerService/traceWaybillDetailView.vue b/src/views/emis/customerService/traceWaybillDetailView.vue
index 69032ed8..d99399bc 100644
--- a/src/views/emis/customerService/traceWaybillDetailView.vue
+++ b/src/views/emis/customerService/traceWaybillDetailView.vue
@@ -48,19 +48,19 @@
     </div>
     <el-tabs v-model="activeTab"  class="center-tabs" style="margin-top: 15px;">
       <el-tab-pane label="扫描记录" name="tab-1">
-        <TraceRecordList :billCode="scanBillCode" @onCanSeeBillDetail="onCanSeeBillDetail"></TraceRecordList>
+        <TraceRecordList :key="resetRefreshId+'_1'" :billCode="showBillCode" @onCanSeeBillDetail="onCanSeeBillDetail"></TraceRecordList>
       </el-tab-pane>
       <el-tab-pane label="运单信息"  v-if="canViewDetail" name="tab-2">
-        <WaybillDetailReadOnly :billCode="scanBillCode"></WaybillDetailReadOnly>
+        <WaybillDetailReadOnly :key="resetRefreshId+'_2'"  :billCode="showBillCode"></WaybillDetailReadOnly>
       </el-tab-pane>
       <el-tab-pane label="查看图片" name="tab-3">
-        <BillPicList :billCode="scanBillCode" ></BillPicList>
+        <BillPicList :key="resetRefreshId+'_3'" :billCode="showBillCode" ></BillPicList>
       </el-tab-pane>
       <el-tab-pane label="日志记录" name="tab-4">
 
       </el-tab-pane>
       <el-tab-pane label="问题件" name="tab-5">
-        <ProblemList :billCode="scanBillCode"></ProblemList>
+        <ProblemList :key="resetRefreshId+'_4'" :billCode="showBillCode"></ProblemList>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -83,9 +83,9 @@ export default {
     scanBillCode:{
       type: String
     },
-    // billDetail: {
-    //    type: Object
-    //   },
+    resetRefreshId: {
+      type: String
+    },
   },
   components: {
     TraceRecordList,
@@ -110,9 +110,15 @@ export default {
   created() {
       this.initData();
   },
+  computed: {
+    showBillCode() {
+      return this.billCode;
+    },
+  },
   watch: {
       "billCode": {
       handler (newValue, oldValue) {
+
       },
       deep: true
     }
diff --git a/src/views/emis/customerService/waybillTracking.vue b/src/views/emis/customerService/waybillTracking.vue
index a240b73d..2da4fbb3 100644
--- a/src/views/emis/customerService/waybillTracking.vue
+++ b/src/views/emis/customerService/waybillTracking.vue
@@ -40,14 +40,14 @@
         <div v-for="(item,index) in emisWaybillList" :key="resetRefreshId+'.'+index">
           <CardWithHeader :header="'运单号:'+item.billCode" >
               <template v-slot:body>
-                <TraceWaybillDetailView :scanBillCode="item.billCode" :billDetail="item.waybillDetail" :key="resetRefreshId+'.d.'+index" ></TraceWaybillDetailView>
+                <TraceWaybillDetailView :resetRefreshId="resetRefreshId" :scanBillCode="item.billCode" :billDetail="item.waybillDetail" :key="resetRefreshId+'.d.'+index" ></TraceWaybillDetailView>
               </template>
           </CardWithHeader>
 
           <div v-if="blSubBill==1"  >
             <CardWithHeader v-for="subSeqNum in item.waybillDetail.parcelQty" :key="subSeqNum" :header="'子单号:'+item.billCode+lpadZero(subSeqNum,4) +' - 主单:'+item.billCode" >
                 <template v-slot:body>
-                  <TraceWaybillDetailView :scanBillCode="item.billCode+lpadZero(subSeqNum,4)" :billDetail="item.waybillDetail" :key="resetRefreshId+'.d.'+index+'.'+subSeqNum" ></TraceWaybillDetailView>
+                  <TraceWaybillDetailView2 :resetRefreshId="resetRefreshId"  :scanBillCode="item.billCode+lpadZero(subSeqNum,4)" :billDetail="item.waybillDetail" :key="resetRefreshId+'.d.'+index+'.'+subSeqNum" ></TraceWaybillDetailView2>
                 </template>
             </CardWithHeader>
           </div>
@@ -67,11 +67,13 @@ import { formatSearchStr,deepClone } from '@/utils/index'
 
 import CardWithHeader from '@/components/CardWithHeader/index.vue';
 import TraceWaybillDetailView from './traceWaybillDetailView.vue';
+import TraceWaybillDetailView2 from './traceWaybillDetailView.vue';
+
 export default {
   name: "WaybillTracking",
 
   components: {
-    CardWithHeader,TraceWaybillDetailView
+    CardWithHeader,TraceWaybillDetailView,TraceWaybillDetailView2
   },
   dicts: [],
   data() {
@@ -102,7 +104,8 @@ export default {
     /** 查询运单列表列表 */
     getList() {
 
-      this.resetRefreshId="tracing-"+Math.random().toString(36).substring(3,10);
+      this.emisWaybillList=[];
+
       this.loading = true;
 
       if(!this.queryParams.billCode){
@@ -110,23 +113,13 @@ export default {
       }
 
       if(this.queryParams.billCode){
-         // 处理子单号
-        //  let qBillCode=formatSearchStr(this.queryParams.billCode);
-          // let billArr = qBillCode.split(",");
-          // let newBillCodeStr="";
-          // billArr.forEach(item=>{
-          //     if(item.startsWith("T")){
-          //       let mainBillCode=item.substr(0,14);
-          //       newBillCodeStr=newBillCodeStr+mainBillCode+",";
-          //     }else{
-          //       newBillCodeStr=newBillCodeStr+item+",";
-          //     }
-          // });
           this.queryParams.billCode=formatSearchStr(this.queryParams.billCode);
       }
 
       queryScanWaybillList(this.queryParams).then(response => {
         this.emisWaybillList = response.rows;
+        this.resetRefreshId="tracing-"+Math.random().toString(36).substring(3,10);
+
         this.loading = false;
       });
     },
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
index b3badadb..e9d949f5 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@@ -65,8 +65,6 @@
           <XdTable
                 slot="pageContent"
 
-
-
                 v-loading="loading"
                 border stripe
                 size="mini"