From 5f12990e04e6ddb33f35ad7da41b16ca9b1af1c1 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Sat, 22 Jun 2024 19:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E5=96=84=E9=80=89=E6=8B=A9=E5=90=88=E5=8C=85?=
 =?UTF-8?q?=E5=8E=BB=E7=BB=84=E6=89=B9=E6=AC=A1=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emisTmsSiteBatch/centerGenBatchMgnt.vue     |  7 ++++++-
 .../emis/emisTmsSiteBatch/packListView.vue      | 17 ++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
index c1f616ea..cdd22236 100644
--- a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
+++ b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
@@ -1244,6 +1244,11 @@ export default {
     onDateSelect(value){
       console.log("date picker---->", value)
       this.dateTimeRange=value;
+      if(this.queryParams.params.queryOrderDateType == '1'){
+        // 下单时间
+        this.queryParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
+        this.queryParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
+      }
     },
     onWayBillDateSelect(value){
       console.log("date picker---->", value)
@@ -1731,7 +1736,7 @@ export default {
         //   }
         //   this.emisCoPackDetail.push(this.waitPackList[p]);
         // }
-        let res = this.$refs.packListView.getPackBillList();
+        let res = await this.$refs.packListView.getPackBillList();
         if(res.code == -1){
           this.$message.error(res.message);
           return;
diff --git a/src/views/emis/emisTmsSiteBatch/packListView.vue b/src/views/emis/emisTmsSiteBatch/packListView.vue
index 04561a12..7a1d7787 100644
--- a/src/views/emis/emisTmsSiteBatch/packListView.vue
+++ b/src/views/emis/emisTmsSiteBatch/packListView.vue
@@ -64,7 +64,11 @@
                   <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="receiveName" min-width="150">
+                    <template slot-scope="scope">
+                      <span class="ellipsis">{{ scope.row.receiveName }}</span>
+                    </template>
+                  </el-table-column>
                   <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
                     <template slot-scope="scope">
                       <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
@@ -200,6 +204,7 @@ export default {
       }
     },
     async getPackBillList(){
+      debugger;
       let billList = [];
       let destCountry = "";
       for(let i = 0; i < this.canSelectList.length; i++ ){
@@ -212,7 +217,7 @@ export default {
           };
         }
         for(let p = 0; p < resList.rows.length;p++){
-          if(resList.rows[p].main_bill_code){
+          if(resList.rows[p].mainBillCode){
             if(!destCountry){
               destCountry = resList.rows[p].destCountry;
             }else if(destCountry != resList.rows[p].destCountry){
@@ -353,7 +358,13 @@ export default {
     font-weight: normal;
   }
 }
-
+.ellipsis {
+    width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: top;
+    white-space: nowrap;
+  }
 .el-table .disabled-row .cell .el-checkbox__inner {
   display: none; /* 隐藏checkbox */
 }