From 19cd003bbc3447caa68b99fc52a3f0626f887902 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Tue, 18 Jun 2024 19:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=8C=85=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisTmsPack/packageManagement.vue    | 102 +++++++++++++++++-
 1 file changed, 97 insertions(+), 5 deletions(-)

diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index c5f58701..3e516070 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -204,7 +204,7 @@
             </el-table-column>
           </XdTable>
         </el-tab-pane>
-        <el-tab-pane label="已合包" name="second">
+        <!-- <el-tab-pane label="已合包" name="second">
           <XdTable v-loading="loadingDone"
             :height="(slotProps.contentHeight-200)+'px'"
             border stripe
@@ -228,7 +228,6 @@
                 <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
               </template>
             </el-table-column>
-            <!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" min-width="100"  :show-overflow-tooltip="true"/> -->
             <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="sendCountryName" min-width="100">
@@ -250,7 +249,6 @@
             </el-table-column>
             <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
             <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-            <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
             <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
             <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
             <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
@@ -284,7 +282,7 @@
               </template>
             </el-table-column>
           </XdTable>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane label="合包列表" name="third">
           <XdTable v-loading="loading"
             :height="(slotProps.contentHeight-200)+'px'"
@@ -298,9 +296,89 @@
             @queryTable="handleQuery"
             @selection-change="handleSelectionChange"
             @sort-change="handleSortChange"
+            @expand-change="expandChange"
           >
             <el-table-column type="selection" width="55" align="center" />
-
+            <el-table-column type="expand">
+              <template slot-scope="props">
+                <XdTable v-loading="loadingDone"
+                  height="200px"
+                  style="margin-left: 5%;width:90%;"
+                  border stripe
+                  size="small"
+                  :data="emisTmsDonePackList"
+                  showSearch.sync="false"
+                  :queryParams="queryDoneParams"
+                  :total="doneTotal"
+                  :showRightButton="false"
+                  @queryTable="handleQueryDone"
+                  @selection-change="handleDoneSelectionChange"
+                  @sort-change="handleSortChange"
+                >
+                  <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
+                  <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
+                  <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
+                  <el-table-column :label="$t('扫描状态')" align="center" prop="waybillStatus" width="100" >
+                    <template slot-scope="scope">
+                      <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
+                    </template>
+                  </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="sendCountryName" min-width="100">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
+                  <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
+                  <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
+                    <template slot-scope="scope">
+                      <span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
+                  <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
+                  <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
+                  <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
+                  <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
+                  <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150" />
+                  <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
+                    </template>
+                  </el-table-column>
+                  <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">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.sendCompany }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.remark }}</span>
+                    </template>
+                  </el-table-column>
+                </XdTable>
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
             <el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
               <template slot-scope="scope">
@@ -899,6 +977,20 @@ export default {
           break;
       }
     },
+    async expandChange(row){
+      // row.packNo
+      this.emisTmsDonePackList=[];
+      let resList = await listEmisTmsPackDtl({packNo: row.packNo});
+      if(!resList || resList.code != 200){
+        this.$message.error(resList && resList.msg || "未知错误");
+        return;
+      }
+      // this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
+      // this.tempCoPackInfo = resData;
+      for(let p = 0; p < resList.rows.length;p++){
+        this.emisTmsDonePackList.push(resList.rows[p].waybillDetail);
+      }
+    },
     donothing(){
 
     },