From e3c1b91d287deb882d3366b6ad9a61f41afc0c61 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Wed, 31 Jul 2024 22:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emisTmsSiteBatch/panel/BigBatchPanel.vue  | 43 ++++++++++++++++---
 .../emisTmsSiteBatch/panel/ExpressPanel.vue   | 41 +++++++++++++++---
 2 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
index 85f3a227..811899a4 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
@@ -145,17 +145,32 @@
                 <el-tag v-else-if="scope.row.declareResStatus==0" type="warning">{{ $t('未上传') }}</el-tag>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('航空提单号')" align="center" prop="airBilllNo" min-width="170" />
+            <!-- <el-table-column :label="$t('运输方式')" align="center" prop="airBilllNo" min-width="170" /> -->
+            <el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="150">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('单号')" align="center" prop="" min-width="170">
+              <template slot-scope="scope">
+                <span v-if="scope.row.transType==2">{{scope.row.airBilllNo}}</span>
+                <span v-else-if="scope.row.transType==4">{{scope.row.shipNo}}</span>
+                <span v-else>{{scope.row.carNo}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('时间')" align="center" prop="etd" min-width="170" />
             <el-table-column :label="$t('异常信息')" align="center" prop="remark" min-width="170">
               <template slot-scope="scope">
                 <span class="ellipsis">{{ scope.row.remark }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('发件国家')" align="center" prop="sendCountryName" min-width="100">
+            <!-- <el-table-column :label="$t('发件国家')" align="center" prop="sendCountryName" min-width="100">
               <template slot-scope="scope">
                 <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
               </template>
-            </el-table-column>
+            </el-table-column> -->
+            <el-table-column :label="$t('起始网点')" align="center" prop="startSiteName" min-width="150" />
+            <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="150" />
             <el-table-column :label="$t('目的国家')" align="center" prop="destCountryName" min-width="100">
               <template slot-scope="scope">
                 <span class="ellipsis">{{ scope.row.destCountryName }}</span>
@@ -223,7 +238,7 @@
                 <span slot="label">
                   <span style="color: red">{{ $t('下一网点') }}</span>
                 </span>
-                <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.nextSiteCode"  ></EmisSiteSimplePicker>
+                <EmisSiteSimplePicker :placeholder="$t('请选择')"  @change="onNextSiteSelect"  v-model="coData.nextSiteCode"  ></EmisSiteSimplePicker>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -1085,6 +1100,15 @@ export default {
       this.coData.startSiteCode=item && item.siteCode;
       this.coData.startSiteName=item && item.siteName;
     },
+    onNextSiteSelect(item){
+      if(!item){
+        this.coData.nextSiteCode = null;
+        this.coData.nextSiteName = null;
+        return;
+      }
+      this.coData.nextSiteCode=item && item.siteCode;
+      this.coData.nextSiteName=item && item.siteName;
+    },
     onDateSelect(value){
       console.log("date picker---->", value)
       this.dateTimeRange=value;
@@ -1131,6 +1155,7 @@ export default {
         startSiteCode: this.coData.startSiteCode || null,
         startSiteName: this.coData.startSiteName || null,
         nextSiteCode: this.coData.nextSiteCode || null,
+        nextSiteName: this.coData.nextSiteName || null,
         airBilllNo: this.coData.airBilllNo || null,
         carNo: this.coData.carNo || null,
         shipNo: this.coData.shipNo || null,
@@ -1229,6 +1254,7 @@ export default {
           this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
           this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
           this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
+          this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
           this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
           this.tempCoPackInfo.etd = this.coData.etd;
           this.tempCoPackInfo.carNo = this.coData.carNo;
@@ -1445,6 +1471,7 @@ export default {
         this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
         this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
         this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
+        this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
         this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
         this.tempCoPackInfo.etd = this.coData.etd;
         this.tempCoPackInfo.carNo = this.coData.carNo;
@@ -1505,6 +1532,7 @@ export default {
         this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
         this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
         this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
+        this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
         this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
         this.tempCoPackInfo.etd = this.coData.etd;
         this.tempCoPackInfo.carNo = this.coData.carNo;
@@ -1587,8 +1615,10 @@ export default {
               this.computeTotal();
               // 更新主表
               this.tempCoPackInfo.destCountry = this.coData.destCountry;
-              this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
+              // this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
+              // this.tempCoPackInfo.sendStiteName = this.coData.sendStiteName || null;
               this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
+              this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
               this.tempCoPackInfo.blUnpack = this.blUnpack;
               this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
               this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty;
@@ -1649,8 +1679,10 @@ export default {
         item.destCountry = this.coData.destCountry;
         // item.sendSiteCode = this.coData.sendSiteCode;
         item.startSiteCode = this.coData.startSiteCode;
+        item.startSiteName = this.coData.startSiteName;
         // item.nextSiteCode = this.coData.nextSiteCode;
         item.nextSiteCode = this.coData.nextSiteCode;
+        item.nextSiteName = this.coData.nextSiteName;
         item.blUnpack = this.blUnpack;
       })
       this.coData.totalWaybillQty=this.emisCoPackDetail.length;
@@ -1704,6 +1736,7 @@ export default {
       this.coData.destCountryName = null;
       // this.coData.sendSiteCode = null;
       this.coData.nextSiteCode = null;
+      this.coData.nextSiteName = null;
       this.coData.nextStation = null;
       // this.blUnpack = "1";
 
diff --git a/src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue
index 6f94e0e7..ba3c0b80 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue
@@ -143,17 +143,31 @@
                 <el-tag v-else-if="scope.row.declareResStatus==0" type="warning">{{ $t('未上传') }}</el-tag>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('航空提单号')" align="center" prop="airBilllNo" min-width="170" />
+            <el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="150">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('单号')" align="center" prop="" min-width="170">
+              <template slot-scope="scope">
+                <span v-if="scope.row.transType==2">{{scope.row.airBilllNo}}</span>
+                <span v-else-if="scope.row.transType==4">{{scope.row.shipNo}}</span>
+                <span v-else>{{scope.row.carNo}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('时间')" align="center" prop="etd" min-width="170" />
             <el-table-column :label="$t('异常信息')" align="center" prop="remark" min-width="170">
               <template slot-scope="scope">
                 <span class="ellipsis">{{ scope.row.remark }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('发件国家')" align="center" prop="sendCountryName" min-width="100">
+            <!-- <el-table-column :label="$t('发件国家')" align="center" prop="sendCountryName" min-width="100">
               <template slot-scope="scope">
                 <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
               </template>
-            </el-table-column>
+            </el-table-column> -->
+            <el-table-column :label="$t('起始网点')" align="center" prop="startSiteName" min-width="150" />
+            <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="150" />
             <el-table-column :label="$t('目的国家')" align="center" prop="destCountryName" min-width="100">
               <template slot-scope="scope">
                 <span class="ellipsis">{{ scope.row.destCountryName }}</span>
@@ -213,7 +227,7 @@
                 <span slot="label">
                   <span style="color: red">{{ $t('下一网点') }}</span>
                 </span>
-                <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.nextSiteCode"  ></EmisSiteSimplePicker>
+                <EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onNextSiteSelect" v-model="coData.nextSiteCode"  ></EmisSiteSimplePicker>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -1031,6 +1045,15 @@ export default {
       this.coData.startSiteCode=item && item.siteCode;
       this.coData.startSiteName=item && item.siteName;
     },
+    onNextSiteSelect(item){
+      if(!item){
+        this.coData.nextSiteCode = null;
+        this.coData.nextSiteName = null;
+        return;
+      }
+      this.coData.nextSiteCode=item && item.siteCode;
+      this.coData.nextSiteName=item && item.siteName;
+    },
     onDateSelect(value){
       console.log("date picker---->", value)
       this.dateTimeRange=value;
@@ -1077,6 +1100,7 @@ export default {
         startSiteCode: this.coData.startSiteCode || null,
         startSiteName: this.coData.startSiteName || null,
         nextSiteCode: this.coData.nextSiteCode || null,
+        nextSiteName: this.coData.nextSiteName || null,
         airBilllNo: this.coData.airBilllNo || null,
         carNo: this.coData.carNo || null,
         shipNo: this.coData.shipNo || null,
@@ -1175,6 +1199,7 @@ export default {
           this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
           this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
           this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
+          this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
           this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
           this.tempCoPackInfo.etd = this.coData.etd;
           this.tempCoPackInfo.carNo = this.coData.carNo;
@@ -1359,6 +1384,7 @@ export default {
         this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
         this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
         this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
+        this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
         this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
         this.tempCoPackInfo.etd = this.coData.etd;
         this.tempCoPackInfo.carNo = this.coData.carNo;
@@ -1419,6 +1445,7 @@ export default {
         this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
         this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
         this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
+        this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
         this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
         this.tempCoPackInfo.etd = this.coData.etd;
         this.tempCoPackInfo.carNo = this.coData.carNo;
@@ -1501,8 +1528,9 @@ export default {
               this.computeTotal();
               // 更新主表
               this.tempCoPackInfo.destCountry = this.coData.destCountry;
-              this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
+              // this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
               this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
+              this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
               this.tempCoPackInfo.blUnpack = this.blUnpack;
               this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
               this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty;
@@ -1563,8 +1591,10 @@ export default {
         item.destCountry = this.coData.destCountry;
         // item.sendSiteCode = this.coData.sendSiteCode;
         item.startSiteCode = this.coData.startSiteCode;
+        item.startSiteName = this.coData.startSiteName;
         // item.nextSiteCode = this.coData.nextSiteCode;
         item.nextSiteCode = this.coData.nextSiteCode;
+        item.nextSiteName = this.coData.nextSiteName;
         item.blUnpack = this.blUnpack;
       })
       this.coData.totalWaybillQty=this.emisCoPackDetail.length;
@@ -1618,6 +1648,7 @@ export default {
       this.coData.destCountryName = null;
       // this.coData.sendSiteCode = null;
       this.coData.nextSiteCode = null;
+      this.coData.nextSiteName = null;
       this.coData.nextStation = null;
       // this.blUnpack = "1";