From 269d1fc486102df5d4144934a0e5d582d94261f4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 14 Jun 2024 20:22:05 +0800
Subject: [PATCH] md

---
 .../emis/customerService/traceWaybillDetailView.vue   |  1 -
 src/views/emis/customerService/waybillTracking.vue    | 11 ++++++++---
 src/views/emis/emisTmsScanRecord/arrivalScan.vue      | 11 ++++++-----
 src/views/emis/emisWaybill/waybillDetailReadOnly.vue  |  4 ++--
 .../emis/emisWaybillTransfer/waybillTransfer.vue      |  4 ++--
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/views/emis/customerService/traceWaybillDetailView.vue b/src/views/emis/customerService/traceWaybillDetailView.vue
index 4e549a12..3ed40adc 100644
--- a/src/views/emis/customerService/traceWaybillDetailView.vue
+++ b/src/views/emis/customerService/traceWaybillDetailView.vue
@@ -110,7 +110,6 @@ export default {
     };
   },
   created() {
-    console.log("=====>xxx==>",this.billDetail);
 
     if(this.billDetail.waybillStatus=='10'){
       this.active=1;
diff --git a/src/views/emis/customerService/waybillTracking.vue b/src/views/emis/customerService/waybillTracking.vue
index e050088b..4bae2f7b 100644
--- a/src/views/emis/customerService/waybillTracking.vue
+++ b/src/views/emis/customerService/waybillTracking.vue
@@ -33,9 +33,9 @@
 
     <div style="min-height: 100%;padding: 0px 10px 5px 0px;">
       <el-scrollbar style="height: 1000px">
-        <CardWithHeader v-for="(item,index) in emisWaybillList" :key="index" :header="'运单号:'+item.billCode" >
+        <CardWithHeader v-for="(item,index) in emisWaybillList" :key="resetRefreshId+'.'+index" :header="'运单号:'+item.billCode" >
             <template v-slot:body>
-              <TraceWaybillDetailView :billDetail="item"></TraceWaybillDetailView>
+              <TraceWaybillDetailView :billDetail="item" :key="resetRefreshId+'.d.'+index" ></TraceWaybillDetailView>
             </template>
         </CardWithHeader>
       </el-scrollbar>
@@ -60,7 +60,7 @@ export default {
   dicts: [],
   data() {
     return {
-
+      resetRefreshId:null,
       // 运单列表表格数据
       emisWaybillList: [],
 
@@ -76,8 +76,13 @@ export default {
 
   },
   methods: {
+    getUUID() {
+        return Math.random().toString(36).substring(3,10);
+    },
     /** 查询运单列表列表 */
     getList() {
+
+      this.resetRefreshId="tracing-"+this.getUUID();
       this.loading = true;
 
       if(!this.queryParams.billCode){
diff --git a/src/views/emis/emisTmsScanRecord/arrivalScan.vue b/src/views/emis/emisTmsScanRecord/arrivalScan.vue
index 88a9ef7c..204c5cfc 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalScan.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="0">
-        <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
+        <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+
           <el-col :span="7">
             <el-form-item label="扫描单号" prop="billCode" label-width="70px">
               <span slot="label">
@@ -19,9 +20,9 @@
               </el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+      </el-form>
 
-        </el-form>
-      </el-row>
 
 
       <div slot="toolbar">
@@ -242,7 +243,7 @@ export default {
         this.$message.error("输入单号后回车");
         return;
       }
-      let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[]; 
+      let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
       let scanWeight = this.form.scanWeight
       let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
 
diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index 0c2ea806..7f7e6aad 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -73,8 +73,8 @@
 
             <el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item>
             <el-descriptions-item label="录单员">{{ form.registerManName }}</el-descriptions-item>
-            <el-descriptions-item label="收款人备注">{{ form.feeRemark }}</el-descriptions-item>
-            <el-descriptions-item label="录单备注">{{ form.remark }}</el-descriptions-item>
+            <el-descriptions-item label="费用备注">{{ form.feeRemark }}</el-descriptions-item>
+            <el-descriptions-item label="运单备注">{{ form.remark }}</el-descriptions-item>
 
 
 
diff --git a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
index a0db4a4b..381b6a6b 100644
--- a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
+++ b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
@@ -28,7 +28,7 @@
         <el-col :span="16">
           <el-col :span="8">
             <el-form-item :label="$t('转件网点')" prop="createSite" label-width="80px">
-              <EmisSiteSimplePicker v-model="queryParams.createSite"  :disabled="this.$store.getters.ownerSiteCode != '888888'"  ></EmisSiteSimplePicker>
+              <EmisSiteSimplePicker v-model="queryParams.createSite"  :disabled="$store.getters.ownerSiteCode != '88888'"  ></EmisSiteSimplePicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -368,7 +368,7 @@ export default {
   created() {
     this.$nextTick(function() {
 
-      if(this.$store.getters.ownerSiteCode != '888888'){
+      if(this.$store.getters.ownerSiteCode != '88888'){
         this.queryParams.createSite=this.$store.getters.ownerSiteCode;
       }
       let queryFormEl = this.$refs.queryForm.$el;