From d806998a4b67e46bca95745fa1b121ae6f4851d9 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Tue, 23 Jul 2024 11:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=8C=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisTmsPack/packageManagement.vue    |  2 +-
 .../emisTmsSiteBatch/centerGenBatchMgnt.vue   |  2 +-
 .../emis/emisTmsSiteBatch/packListView.vue    | 48 +++++++++++++------
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index ef8f60a7..e016efc7 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -271,7 +271,7 @@
         </el-tab-pane> -->
         <!-- :height="(slotProps.contentHeight-200)+'px'" -->
         <el-tab-pane label="合包列表" name="third">
-          <packListView ref="packListView" :propSelect="false" :propParams="queryParams" :slotProps="slotProps"></packListView>
+          <packListView ref="packListView" propType="pack" :propParams="queryParams" :slotProps="slotProps"></packListView>
           <!-- <el-table
              v-loading="loading"
             border
diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
index cca04835..ff07a232 100644
--- a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
+++ b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
@@ -286,7 +286,7 @@
           </XdTable>
         </el-tab-pane>
         <el-tab-pane label="合包列表" name="fourth">
-          <packListView ref="packListView" :propSelect="true" :propParams="queryParams" :slotProps="slotProps"></packListView>
+          <packListView ref="packListView" propType="batch" :propParams="queryParams" :slotProps="slotProps"></packListView>
         </el-tab-pane>
         <el-tab-pane label="批次列表" name="third">
           <XdTable v-loading="loading"
diff --git a/src/views/emis/emisTmsSiteBatch/packListView.vue b/src/views/emis/emisTmsSiteBatch/packListView.vue
index de33920f..fb515500 100644
--- a/src/views/emis/emisTmsSiteBatch/packListView.vue
+++ b/src/views/emis/emisTmsSiteBatch/packListView.vue
@@ -14,8 +14,9 @@
             @selection-change="handleSelectionChange"
             @expand-change="expandChange"
             :row-class-name="disabledRow"
+            :showCustomizeTpl="false"
         >
-            <el-table-column v-if="showSelect" type="selection" width="55" align="center">
+            <el-table-column v-if="showType=='pack'" type="selection" width="55" align="center">
             </el-table-column>
             <el-table-column type="expand">
               <template slot-scope="scope">
@@ -100,24 +101,43 @@
                 </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">
+            <el-table-column v-if="showType=='batch'" :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
+            <el-table-column v-if="showType=='batch'" :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('操作网点')" align="center" prop="createSiteName" min-width="100" />
-            <el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
+            <el-table-column v-if="showType=='batch'" :label="$t('操作网点')" align="center" prop="createSiteName" min-width="100" />
+            <el-table-column v-if="showType=='batch'" :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.blUnpack == "1" ? "是" : "否" }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('操作员')" align="center" prop="createByName" min-width="150" />
-            <el-table-column :label="$t('票数')" align="center" prop="totalWaybillQty" min-width="100" />
-            <el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" 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="packDate" min-width="170" />
+            <el-table-column v-if="showType=='batch'" :label="$t('操作员')" align="center" prop="createByName" min-width="150" />
+            <el-table-column v-if="showType=='batch'" :label="$t('票数')" align="center" prop="totalWaybillQty" min-width="100" />
+            <el-table-column v-if="showType=='batch'" :label="$t('件数')" align="center" prop="totalParcelQty" min-width="100" />
+            <el-table-column v-if="showType=='batch'" :label="$t('实际重量')" align="center" prop="totalWeight" min-width="100" />
+            <el-table-column v-if="showType=='batch'" :label="$t('体积')" align="center" prop="totalVolume" min-width="100" />
+            <el-table-column v-if="showType=='batch'" :label="$t('创建时间')" align="center" prop="packDate" min-width="170" />
+
+            <el-table-column v-if="showType=='pack'" :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
+            <el-table-column v-if="showType=='pack'" :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="showType=='pack'" :label="$t('创建网点')" align="center" prop="createSiteName" min-width="100" />
+            <el-table-column v-if="showType=='pack'" :label="$t('发出网点')" align="center" prop="sendStiteName" min-width="100" />
+            <el-table-column v-if="showType=='pack'" :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
+            <el-table-column v-if="showType=='pack'" :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.blUnpack == "1" ? "是" : "否" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="showType=='pack'" :label="$t('创建人')" align="center" prop="createByName" min-width="150" />
+            <el-table-column v-if="showType=='pack'" :label="$t('件数')" align="center" prop="totalParcelQty" min-width="100" />
+            <el-table-column v-if="showType=='pack'" :label="$t('合包重量')" align="center" prop="totalWeight" min-width="100" />
+            <el-table-column v-if="showType=='pack'" :label="$t('创建时间')" align="center" prop="packDate" min-width="170" />
         </XdTable>
     </div>
 </template>
@@ -133,7 +153,7 @@ export default {
   name: "PackListView",
   props:{
     propParams: {},
-    propSelect: Boolean,
+    propType: "",
     slotProps: {}
   },
   dicts: [],
@@ -153,7 +173,7 @@ export default {
 
       selection:[],// 选中的合包
 
-      showSelect: true,
+      showType: "pack",
 
       // 合包明细
       emisTmsDonePackList:{},
@@ -173,7 +193,7 @@ export default {
   created() {
     // this.initData();
     this.queryParams = this.propParams;
-    this.showSelect = this.propSelect;
+    this.showType = this.propType;
   },
   watch: {
     "propParams": {