From 0b3f9c8217a75f9ab09ee72cb673788d86043628 Mon Sep 17 00:00:00 2001
From: lilu <lilu@myshipping.net>
Date: Fri, 31 Mar 2023 14:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E7=89=A9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=BC=B9=E7=AA=97=E9=9A=90=E8=97=8F=EF=BC=8C=20?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E8=B7=B3=E8=BD=AC=E7=9B=B4=E6=8E=A5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingLedger/detail/modules/ediMore.vue  |  6 ++-
 .../detail/modules/rightContent.vue           | 16 ++----
 src/views/main/BookingLedger/list/index.vue   | 50 ++++++++++++-------
 3 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/modules/ediMore.vue b/src/views/main/BookingLedger/detail/modules/ediMore.vue
index f215e48..a135329 100644
--- a/src/views/main/BookingLedger/detail/modules/ediMore.vue
+++ b/src/views/main/BookingLedger/detail/modules/ediMore.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="more-edi" :style="{paddingTop:'20px', paddingBottom:'10px'}">
-    <a-form-model ref="ediFrom" :model="details" :rules="rules">
+    <a-form-model ref="ediFrom" :model="details" :rules="rules" v-if="details">
       <div class="normal">
         <a-row :gutter="16">
           <a-col :span="8">
@@ -517,7 +517,9 @@ export default {
     '$route.query': {
       immediate: true,
       handler(nD, oD) {
-        this.id = this.$route.query.id
+        if (this.$route.name === 'BookingDetail') {
+          this.id = this.$route.query.id
+        }
       }
     }
   },
diff --git a/src/views/main/BookingLedger/detail/modules/rightContent.vue b/src/views/main/BookingLedger/detail/modules/rightContent.vue
index 7e352cf..6eee050 100644
--- a/src/views/main/BookingLedger/detail/modules/rightContent.vue
+++ b/src/views/main/BookingLedger/detail/modules/rightContent.vue
@@ -103,7 +103,7 @@
             <div class="remark-btn"><i class="iconfont icon-shanchu1"></i></div>
           </a-popconfirm>
         </div>
-        <div class="remark no-data" v-if="details.remark.length === 0">
+        <div class="remark no-data" v-if="!details.remark || details.remark.length === 0">
           <i class="iconfont icon-wushuju"></i>
           <div class="text">暂无内容</div>
         </div>
@@ -135,7 +135,7 @@
             <span><i class="iconfont icon-shijian1"></i>{{ file.createdTime }}</span>
           </div>
         </div>
-        <div class="no-data" v-if="details.file.length === 0">
+        <div class="no-data" v-if="!details.file || details.file.length === 0">
           <i class="iconfont icon-wushuju"></i>
           <div class="text">暂无附件</div>
         </div>
@@ -168,7 +168,7 @@
             </div>
           </div>
         </div>
-        <div class="no-data" v-if="details.statuslog.length === 0">
+        <div class="no-data" v-if="!details.statuslog || details.statuslog.length === 0">
           <i class="iconfont icon-queshengye_zanwushuju" :style="{ fontSize: '50px' }"></i>
           <div class="text">暂无动态</div>
         </div>
@@ -390,14 +390,8 @@ export default {
       immediate: true,
       handler(nD, oD) {
         console.log(nD)
-        // BookingOrderGetGoodsStatusList({ bookingId: nD.id }).then(res => {
-        //   this.booGoodsStatusItem = res.data
-        // })
-        this.id = this.$route.query.id
-        if (!nD.id) {
-          // 切换路由需要修改
-        } else if (nD.id && this.$route.name === 'BookingDetail') {
-          // this.init()
+        if (this.$route.name === 'BookingDetail') {
+          this.id = this.$route.query.id
         }
       }
     }
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index a94a9d5..1798bda 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="margin-top: -16px;margin-left:-4px;margin-right:-4px;">
+  <div style="margin-top: -16px;margin-left:-4px;margin-right:-4px;" @click="pageClick">
     <a-row :gutter="24">
       <a-col :md="24" :sm="24" style="padding: 0 0 0 0" class="content-box">
         <x-card class="content-nav">
@@ -115,6 +115,7 @@
               @cell-dblclick="handledbclick"
               @resizable-change="resizableChange"
               @sort-change="tableSortChange"
+              @scroll="pageClick"
             >
               <template #mblno="{ row }">
                 <div class="mblno">
@@ -198,7 +199,7 @@
                     </template>
                   </div>
                   <!-- @mouseover="goodStatusHover($event, row)" @mouseleave="goodStatusLeave($event, row)" -->
-                  <div class="goods-status-right" @click="goodStatusclick($event, row)" v-if="row.hasGoods > 0">
+                  <div class="goods-status-right" @click.stop="goodStatusclick($event, row)" v-if="row.hasGoods > 0">
                     <i class="iconfont icon-zhankai2"></i>
                   </div>
                 </div>
@@ -295,7 +296,8 @@
       </div>
     </div>
 
-    <div class="goods-hovers-list" :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }" v-show="goodStatusShow">
+    <!-- v-show="goodStatusShow" -->
+    <div class="goods-hovers-list" :class="{'hide-goods-hover': !goodStatusShow}" :style="{ top: `${goodStatusScreenY}px`, left: `${goodStatusScreenX}px` }" >
       <div class="title">货运动态</div>
       <template v-for="(goodStatusItem, gindex) in goodStatusData" >
         <template v-if="goodStatusItem.finishTime || goodStatusItem.remark">
@@ -687,10 +689,7 @@ export default {
       columns: JSON.parse(JSON.stringify(initData.columns)),
       data: []
     }
-    console.log('== 设置，清空了列表数据 ==')
-    next(vm => {
-      console.log('== 开始跳转 ==')
-    })
+    next()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
@@ -723,15 +722,25 @@ export default {
       if (Object.keys(this.gridOptions).length > 0) {
         if (Object.keys(this.bookingGridOptions) === 0) { return false }
         const newData = JSON.parse(JSON.stringify(this.bookingGridOptions))
+        // 默认取前十条或者前N条，暂时屏蔽
+        // if (this.bookingGridOptions.data && this.bookingGridOptions.data.length > 0) {
+        //   const copyArr = JSON.parse(JSON.stringify(this.bookingGridOptions.data))
+        //   const first = copyArr.splice(0, 10)
+        //   const more = this.bookingGridOptions.data.splice(10, this.bookingGridOptions.data.length)
+        //   newData.data = first
+        //   this.gridOptions = { ...this.gridOptions, ...newData }
+        //   setTimeout(() => {
+        //     this.gridOptions.data = [...this.gridOptions.data, ...more]
+        //   }, 1500)
+        // }
+
+        // 默认获取全部数据
         if (this.bookingGridOptions.data && this.bookingGridOptions.data.length > 0) {
           const copyArr = JSON.parse(JSON.stringify(this.bookingGridOptions.data))
-          const first = copyArr.splice(0, 10)
-          const more = this.bookingGridOptions.data.splice(10, this.bookingGridOptions.data.length)
-          newData.data = first
-          this.gridOptions = { ...this.gridOptions, ...newData }
+          newData.data = copyArr
           setTimeout(() => {
-            this.gridOptions.data = [...this.gridOptions.data, ...more]
-          }, 1500)
+            this.gridOptions = { ...this.gridOptions, ...newData }
+          }, 200)
         }
       }
     },
@@ -864,7 +873,6 @@ export default {
             //   break
           }
         })
-        console.log('获取到自定义数据', $data)
         if (Object.keys($data).includes('booking_list_cond')) {
           this.setFormData($data.booking_list_cond, false, true)
         } else {
@@ -1472,7 +1480,6 @@ export default {
     },
     goodStatusHover(e, data) {
       const maxWidth = window.innerWidth
-      console.log(maxWidth, e.pageX, maxWidth - e.pageX)
       if (maxWidth - e.pageX > 230) {
         // this.goodStatusScreenX = e.pageX + 20
         this.goodStatusScreenX = e.pageX - 139
@@ -1484,12 +1491,10 @@ export default {
       this.goodStatusScreenY = e.pageY + 25
       this.goodStatusData = data.goodsStatusList
       this.goodStatusShow = true
-      console.log('== 鼠标滑过 ==', this.goodStatusScreenX, this.goodStatusScreenY, this.goodStatusShow, this.goodStatusData)
     },
     goodStatusLeave(e, data) {
       this.goodStatusShow = false
       this.goodStatusData = null
-      console.log('== 鼠标离开 ==')
     },
     openTraceModel() {
       const select = this.$refs.xGrid.getCheckboxRecords()
@@ -1722,6 +1727,10 @@ export default {
     },
     cancelRemove () {
       console.log('== 取消 ==')
+    },
+    pageClick () {
+      this.goodStatusShow = false
+      this.goodStatusData = null
     }
   }
 }
@@ -2378,6 +2387,13 @@ export default {
   white-space: normal;
   text-align: left;
   z-index: 999 !important;
+  transition: .5s all;
+  display: block;
+  opacity: 1;
+  &.hide-goods-hover{
+    display: none;
+    opacity: 0;
+  }
   // overflow: auto;
   &::before{
     content: '';