From 40e128697e7227832ecdcc4d7442895956130b77 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Fri, 7 Jun 2024 14:57:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisTmsPack/packageManagement.vue    | 74 +++++++++++++------
 .../emisTmsSiteBatch/centerGenBatchMgnt.vue   | 74 +++++++++++++------
 2 files changed, 106 insertions(+), 42 deletions(-)

diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index 801a940a..fd2734f7 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -104,9 +104,9 @@
             <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
             <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
             <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountry" min-width="100">
+            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
               <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCountry }}</span>
+                <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
               </template>
             </el-table-column>
             <el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100">
@@ -133,9 +133,17 @@
                 <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="150" />
-            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
-            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
+            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
+            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
             <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
             <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
@@ -173,9 +181,9 @@
             <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
             <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
             <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountry" min-width="100">
+            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
               <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCountry }}</span>
+                <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
               </template>
             </el-table-column>
             <el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100">
@@ -202,9 +210,17 @@
                 <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="150" />
-            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
-            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
+            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
+            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
             <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
             <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
@@ -437,9 +453,9 @@
         </el-table-column>
         <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
         <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountry" min-width="100">
+        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
           <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.sendCountry }}</span>
+            <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100">
@@ -466,9 +482,17 @@
             <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="150" />
-        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
-        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
+        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
+        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
         <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
@@ -582,9 +606,9 @@
         <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
         <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
         <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountry" min-width="100">
+        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
           <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.sendCountry }}</span>
+            <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100">
@@ -611,9 +635,17 @@
             <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="150" />
-        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
-        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
+        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
+        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
         <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
@@ -648,7 +680,7 @@ import { parseTime, dateToStr } from "@/utils/custom";
 export default {
   name: "PackageManagement",
   components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
-  dicts: ['emis_pack_status'],
+  dicts: ['emis_pack_status', 'emis_qujian_fangshi', 'emis_payment_type'],
   data() {
     return {
       // 遮罩层
diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
index f7eb033a..6545a370 100644
--- a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
+++ b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
@@ -153,9 +153,9 @@
             <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
             <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
             <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountry" min-width="100">
+            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
               <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCountry }}</span>
+                <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
               </template>
             </el-table-column>
             <el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100">
@@ -182,9 +182,17 @@
                 <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="150" />
-            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
-            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
+            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
+            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
             <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
             <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
@@ -222,9 +230,9 @@
             <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
             <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
             <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountry" min-width="100">
+            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
               <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCountry }}</span>
+                <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
               </template>
             </el-table-column>
             <el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100">
@@ -251,9 +259,17 @@
                 <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="150" />
-            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
-            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
+            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
+            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
             <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
             <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
@@ -530,9 +546,9 @@
         <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
         <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
         <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountry" min-width="100">
+        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
           <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.sendCountry }}</span>
+            <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100">
@@ -559,9 +575,17 @@
             <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="150" />
-        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
-        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
+        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
+        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
         <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
@@ -684,9 +708,9 @@
         <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
         <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
         <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountry" min-width="100">
+        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
           <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.sendCountry }}</span>
+            <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100">
@@ -713,9 +737,17 @@
             <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeCode" min-width="150" />
-        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
-        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
+        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
+        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
         <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
@@ -751,7 +783,7 @@ import { parseTime, dateToStr } from "@/utils/custom";
 export default {
   name: "CenterGenBatchMgnt",
   components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
-  dicts: ['emis_pack_status', 'emis_payment_type', 'emis_biz_shipping_method'],
+  dicts: ['emis_pack_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi'],
   data() {
     return {
       // 遮罩层