From 7524e544b17bf43f359e3bb332898f3b16de07e9 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Tue, 23 Jul 2024 10:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=88=E5=8C=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E5=B1=95=E7=A4=BA=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index 2f8b936c..ef8f60a7 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -68,7 +68,7 @@
     <!-- </SearchForm> -->
     </el-form>
 
-    <div slot="pageContent">
+    <div slot="pageContent" slot-scope="slotProps">
     <!-- slot-scope="slotProps"
     :style="'height:'+(slotProps.contentHeight)+'px'" -->
       <div>
@@ -271,7 +271,8 @@
         </el-tab-pane> -->
         <!-- :height="(slotProps.contentHeight-200)+'px'" -->
         <el-tab-pane label="合包列表" name="third">
-          <el-table
+          <packListView ref="packListView" :propSelect="false" :propParams="queryParams" :slotProps="slotProps"></packListView>
+          <!-- <el-table
              v-loading="loading"
             border
             size="mini"
@@ -289,7 +290,6 @@
             @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"
@@ -311,14 +311,6 @@
                 >
                   <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
                   <el-table-column :label="$t('所属主单号')" align="center" prop="mainBillCode" 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="waybillDetail.currentSiteName" min-width="100" />
                   <el-table-column :label="$t('下一网点')" align="center" prop="waybillDetail.nextSiteName" min-width="100" />
                   <el-table-column :label="$t('寄件国家')" align="center" prop="waybillDetail.sendCountryName" min-width="100">
@@ -343,10 +335,6 @@
                       <span>1</span>
                     </template>
                   </el-table-column>
-                  <!-- <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="waybillDetail.receiveName" min-width="150" />
                   <el-table-column :label="$t('收件公司')" align="center" prop="waybillDetail.receiveCompany" min-width="100">
                     <template slot-scope="scope">
@@ -395,22 +383,10 @@
               </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 :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['emis:emisTmsPack:query']"
-                >查看</el-button>
-              </template>
-            </el-table-column> -->
-          </el-table>
+          </el-table> -->
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -810,13 +786,14 @@ import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePic
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
 import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
+import PackListView from '@/views/emis/emisTmsSiteBatch/packListView';
 
 import { parseTime, dateToStr } from "@/utils/custom";
 import { formatSearchStr } from '@/utils/index'
 
 export default {
   name: "PackageManagement",
-  components: { ProblemTypePicker, EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
+  components: { ProblemTypePicker, EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView},
   dicts: ['emis_pack_status', 'emis_qujian_fangshi', 'emis_payment_type', 'emis_waybill_status'],
   data() {
     return {
@@ -974,7 +951,9 @@ export default {
           break;
         case 'third':
           this.waitPackList=[];
-          this.getList();
+          // this.getList();
+          this.queryParams.dateTimeRange = this.dateTimeRange;
+          this.$refs.packListView.getList();
           break;
         default:
           break;
diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
index cfc7be37..cca04835 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" :propParams="queryParams" :slotProps="slotProps"></packListView>
+          <packListView ref="packListView" :propSelect="true" :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 6894a3ea..de33920f 100644
--- a/src/views/emis/emisTmsSiteBatch/packListView.vue
+++ b/src/views/emis/emisTmsSiteBatch/packListView.vue
@@ -15,7 +15,7 @@
             @expand-change="expandChange"
             :row-class-name="disabledRow"
         >
-            <el-table-column type="selection" width="55" align="center">
+            <el-table-column v-if="showSelect" type="selection" width="55" align="center">
             </el-table-column>
             <el-table-column type="expand">
               <template slot-scope="scope">
@@ -133,6 +133,7 @@ export default {
   name: "PackListView",
   props:{
     propParams: {},
+    propSelect: Boolean,
     slotProps: {}
   },
   dicts: [],
@@ -152,6 +153,8 @@ export default {
 
       selection:[],// 选中的合包
 
+      showSelect: true,
+
       // 合包明细
       emisTmsDonePackList:{},
 
@@ -169,6 +172,8 @@ export default {
   },
   created() {
     // this.initData();
+    this.queryParams = this.propParams;
+    this.showSelect = this.propSelect;
   },
   watch: {
     "propParams": {