From 0799a3acce4ec9cf91aa66db36c74ec8a0a66820 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Mon, 3 Jun 2024 12:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=8C=85=E7=AE=A1=E7=90=86=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisTmsPack/packageManagement.vue    | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index 6ac8e58c..cc166a8f 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -141,13 +141,13 @@
           <dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('操作网点')" align="center" prop="sendStiteCode" min-width="100" />
+      <el-table-column :label="$t('操作网点')" align="center" prop="createSiteName" min-width="100" />
       <el-table-column :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="opMan" min-width="100" />
+      <el-table-column :label="$t('操作员')" align="center" prop="createByName" min-width="100" />
       <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" />
@@ -589,6 +589,14 @@ export default {
     };
   },
   created() {
+  },
+
+  mounted() {
+    const end = new Date()
+    const start = new Date()
+    start.setHours(0,0,0,0)
+    end.setHours(23,59,59,0)
+    this.dateTimeRange=[start,end];
     this.getList();
   },
   methods: {
@@ -952,12 +960,14 @@ export default {
       this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
       this.tempCoPackInfo = resData;
       for(let p = 0; p < resList.rows.length;p++){
-        let resd = await getWaybillDetail(resList.rows[p].billCode);
-        if(!resd || resd.code != 200){
-          this.$message.error(resd && resd.msg || "未知错误");
-          return;
-        }
-        this.emisCoPackDetail.push(resd.data);
+        // let resd = await getWaybillDetail(resList.rows[p].billCode);
+        // if(!resd || resd.code != 200){
+        //   this.$message.error(resd && resd.msg || "未知错误");
+        //   return;
+        // }
+        // this.emisCoPackDetail.push(resd.data);
+        ;
+        this.emisCoPackDetail.push(resList.rows[p].waybillDetail);
       }
       this.computeTotal();
       this.currentId=null;