From 88591455e1f5a2c0f234fcf1d983c825673319e9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 27 Jun 2024 12:42:35 +0800
Subject: [PATCH] md

---
 src/views/emis/customerService/problemList.vue  |  5 +++--
 .../emis/customerService/waybillTracking.vue    |  2 +-
 .../emis/emisTmsScanRecord/deliveryScan.vue     | 17 +++++++++--------
 .../emis/emisTmsScanRecord/signAndRecord.vue    |  6 +++---
 src/views/emis/emisWaybill/sendWaybillList.vue  |  2 +-
 .../emis/emisWaybill/sendWaybillListNew.vue     |  5 ++++-
 .../centralProblemInquiry.vue                   |  7 ++++---
 .../receivedProblemInquiries.vue                |  5 +++--
 .../registrationProblemInquiry.vue              |  5 +++--
 9 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/views/emis/customerService/problemList.vue b/src/views/emis/customerService/problemList.vue
index c5aa33e7..fa013715 100644
--- a/src/views/emis/customerService/problemList.vue
+++ b/src/views/emis/customerService/problemList.vue
@@ -36,9 +36,10 @@
       <el-table-column :label="$t('问题件回复内容')" align="center" prop="reversionStr" min-width="150" />
       <el-table-column :label="$t('处理状态')" align="center" prop="dealResult" min-width="100">
         <template slot-scope="scope">
-          <span v-if="scope.row.dealResult=='2'" style="background-color: #f0e68c;">处理完毕</span>
+          <span v-if="scope.row.dealResult=='1'" style="background-color: #f0e68c;">处理中</span>
+          <span v-else-if="scope.row.dealResult=='2'" style="background-color: #f0e68c;">处理完毕</span>
           <span v-else-if="scope.row.dealResult=='0' && scope.row.blSee != '1'">未处理</span>
-          <span v-else-if="scope.row.blSee=='1'" style="background-color: #dcdcdc;">已查看未处理</span>
+          <span v-else-if="scope.row.dealResult=='0' && scope.row.blSee == '1'" style="background-color: #dcdcdc;">已查看未处理</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('回复人')" align="center" prop="reversionManName" min-width="150" />
diff --git a/src/views/emis/customerService/waybillTracking.vue b/src/views/emis/customerService/waybillTracking.vue
index 95900710..3083157e 100644
--- a/src/views/emis/customerService/waybillTracking.vue
+++ b/src/views/emis/customerService/waybillTracking.vue
@@ -105,7 +105,7 @@ export default {
     /** 查询运单列表列表 */
     getList() {
 
-      this.resetRefreshId="tracing-"+this.getUUID();
+      this.resetRefreshId="tracing-"+Math.random().toString(36).substring(3,10);
       this.loading = true;
 
       if(!this.queryParams.billCode){
diff --git a/src/views/emis/emisTmsScanRecord/deliveryScan.vue b/src/views/emis/emisTmsScanRecord/deliveryScan.vue
index f8a1a6ea..e3a51c96 100644
--- a/src/views/emis/emisTmsScanRecord/deliveryScan.vue
+++ b/src/views/emis/emisTmsScanRecord/deliveryScan.vue
@@ -2,6 +2,14 @@
   <div class="app-container">
     <el-row :gutter="0">
         <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
+          <el-col :span="8">
+            <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
+              <span slot="label">
+                <span style="color: red">{{ $t('派件员') }}</span>
+              </span>
+              <EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="7">
             <el-form-item label="扫描单号" prop="billCode" label-width="70px">
               <span slot="label">
@@ -12,14 +20,7 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
-              <span slot="label">
-                <span style="color: red">{{ $t('派件员') }}</span>
-              </span>
-              <EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="7">
             <el-form-item label="重量" prop="scanWeight" label-width="60px">
               <el-input v-model="form.scanWeight" placeholder="扫描重量" >
diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
index a894132b..728a7f8f 100644
--- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
@@ -74,8 +74,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="录单重量" prop="volumeWeight" label-width="80px">
-            <el-input v-model="record.volumeWeight" placeholder="" disabled >
+          <el-form-item label="实际重量" prop="volumeWeight" label-width="80px">
+            <el-input v-model="record.billWeight" placeholder="" disabled >
               <span slot="suffix">KG</span>
             </el-input>
           </el-form-item>
@@ -166,7 +166,7 @@
           </template>
       </el-table-column>
       <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="100" />
-      <el-table-column :label="$t('录件重量')" align="center" prop="billWeight" min-width="100" />
+      <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
       <el-table-column :label="$t('签收图片')" align="center" min-width="100">
         <el-table-column :label="$t('上传图片')" align="center" prop="picUrls" width="200" >
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 4f109ff8..87868f2e 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -571,7 +571,7 @@
 
 
     <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-      <TraceWaybillDetailView  :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
+      <TraceWaybillDetailView  :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
     </el-dialog>
 <!--
     <el-dialog title="查看运单" :visible.sync="openView" width="100%" :destroy-on-close="true"  :close-on-click-modal="false"  v-dialogDrag append-to-body>
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index 52acc3df..f7d5af26 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -571,7 +571,7 @@
 
 
     <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-      <TraceWaybillDetailView  :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
+      <TraceWaybillDetailView  :key="resetRefreshId" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
     </el-dialog>
 <!--
     <el-dialog title="查看运单" :visible.sync="openView" width="100%" :destroy-on-close="true"  :close-on-click-modal="false"  v-dialogDrag append-to-body>
@@ -662,6 +662,8 @@ export default {
   ],
   data() {
     return {
+      resetRefreshId:null,
+
       tableHeight: 200,
 
       // 遮罩层
@@ -897,6 +899,7 @@ export default {
       return '';
     },
     handleShowTraceInfo(row){
+        this.resetRefreshId="tracing-"+Math.random().toString(36).substring(3,10);
         this.currentTraceBillCode=row.billCode;
         this.currentTraceBillItem=row;
         this.openTraceInfo=true;
diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
index 64de66c8..91d9ca9f 100644
--- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
@@ -185,9 +185,10 @@
       <el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" min-width="100" />
       <el-table-column :label="$t('处理状态')" align="center" prop="dealResult" min-width="100">
         <template slot-scope="scope">
-          <span v-if="scope.row.dealResult=='2'" style="background-color: #f0e68c;">处理完毕</span>
+          <span v-if="scope.row.dealResult=='1'" style="background-color: #f0e68c;">处理中</span>
+          <span v-else-if="scope.row.dealResult=='2'" style="background-color: #f0e68c;">处理完毕</span>
           <span v-else-if="scope.row.dealResult=='0' && scope.row.blSee != '1'">未处理</span>
-          <span v-else-if="scope.row.blSee=='1'" style="background-color: #dcdcdc;">已查看未处理</span>
+          <span v-else-if="scope.row.dealResult=='0' && scope.row.blSee == '1'" style="background-color: #dcdcdc;">已查看未处理</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('是否查看')" align="center" prop="blSee" min-width="100">
@@ -820,7 +821,7 @@ export default {
   .isSeeNoDeal{
     background-color: rgb(220, 220, 220);
   }
-  
+
   :deep .el-table .disabled-row .el-checkbox__inner {
     display: none; /* 隐藏checkbox */
   }
diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
index 3345684e..ce381f7c 100644
--- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
+++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
@@ -176,9 +176,10 @@
       <el-table-column :label="$t('回复网点')" align="center" prop="reversionSiteName" min-width="100" />
       <el-table-column :label="$t('处理状态')" align="center" prop="dealResult" min-width="100">
         <template slot-scope="scope">
-          <span v-if="scope.row.dealResult=='2'" style="background-color: #f0e68c;">处理完毕</span>
+          <span v-if="scope.row.dealResult=='1'" style="background-color: #f0e68c;">处理中</span>
+          <span v-else-if="scope.row.dealResult=='2'" style="background-color: #f0e68c;">处理完毕</span>
           <span v-else-if="scope.row.dealResult=='0' && scope.row.blSee != '1'">未处理</span>
-          <span v-else-if="scope.row.blSee=='1'" style="background-color: #dcdcdc;">已查看未处理</span>
+          <span v-else-if="scope.row.dealResult=='0' && scope.row.blSee == '1'" style="background-color: #dcdcdc;">已查看未处理</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('是否查看')" align="center" prop="blSee" min-width="100">
diff --git a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
index 04e5ac0b..ac1fcfe8 100644
--- a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
@@ -163,9 +163,10 @@
       <el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" min-width="100" />
       <el-table-column :label="$t('处理状态')" align="center" prop="dealResult" min-width="100">
         <template slot-scope="scope">
-          <span v-if="scope.row.dealResult=='2'" style="background-color: #f0e68c;">处理完毕</span>
+          <span v-if="scope.row.dealResult=='1'" style="background-color: #f0e68c;">处理中</span>
+          <span v-else-if="scope.row.dealResult=='2'" style="background-color: #f0e68c;">处理完毕</span>
           <span v-else-if="scope.row.dealResult=='0' && scope.row.blSee != '1'">未处理</span>
-          <span v-else-if="scope.row.blSee=='1'" style="background-color: #dcdcdc;">已查看未处理</span>
+          <span v-else-if="scope.row.dealResult=='0' && scope.row.blSee == '1'" style="background-color: #dcdcdc;">已查看未处理</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('是否查看')" align="center" prop="blSee" min-width="100">