From c35810a947f5db48ca5a9884126ebf1fbd4ef9d2 Mon Sep 17 00:00:00 2001
From: lilu <lilu@myshipping.net>
Date: Wed, 12 Apr 2023 17:04:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E8=88=B1=E8=AF=A6=E6=83=85=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=20+=20=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/BookingLedger/detail/index.vue | 23 ++++++++++++++++++-
 .../detail/modules/operationArea.vue          | 18 +++++++++++++--
 src/views/main/BookingLedger/list/index.vue   | 16 +++++--------
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index 3944f78..d1fbb81 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -22,6 +22,7 @@
                 @changePage="changePageFun"
                 @copy="copyBookingFun"
                 @addSedList="addSedList"
+                @removeOrder="removeOrderFun"
               ></operationArea>
 
               <ul class="parent-tabs-box">
@@ -151,7 +152,8 @@ import {
   BookingOrderGet,
   BookingOrderSave,
   getDjyTenantConfig,
-  GetAllData
+  GetAllData,
+  DeleteBookingOrder
 } from '@/api/modular/main/BookingLedger'
 import { mapActions, mapGetters } from 'vuex'
 import rules from './rules'
@@ -1518,6 +1520,25 @@ export default {
       if (type === 'kindpkgs') {
         this.bookingDetails.kindpkgs = val
       }
+    },
+    removeOrderFun () {
+      DeleteBookingOrder([this.bookingDetails.id].toString())
+      .then(res => {
+        if (res.success) {
+          this.$message.success('删除成功')
+          const $data = this.needSavePages
+          delete $data[this.$route.fullPath]
+          this.setNeedSavePages($data)
+          const removeIcon = document.getElementsByClassName('ant-tabs-tab-active')[0].getElementsByTagName('i')[0]
+          removeIcon.click()
+          this.$forceUpdate()
+        } else {
+          this.$message.error(res.message)
+        }
+      })
+      .catch(err => {
+        console.log(err)
+      })
     }
   }
 }
diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue
index 6106bd3..aea345f 100644
--- a/src/views/main/BookingLedger/detail/modules/operationArea.vue
+++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue
@@ -61,11 +61,19 @@
         </button>
       </div>
       <div
-        v-if="!details.hbList || details.hbList.length === 0"
         class="btn-list single-view-1"
         :style="{ width: '110px' }"
       >
-        <button @click="addChild()"><span class="iconfont icon-zhizhishu"></span>添加分单</button>
+        <a-popconfirm
+          title="确定删除当前订舱？"
+          ok-text="是"
+          cancel-text="否"
+          @confirm="removeOrder"
+          @cancel="cancelRemove"
+        >
+          <button><span class="iconfont icon-shanchu1"></span>删除</button>
+        </a-popconfirm>
+        <button @click="addChild()" v-if="!details.hbList || details.hbList.length === 0"><span class="iconfont icon-zhizhishu"></span>添加分单</button>
       </div>
     </a-card>
 
@@ -1654,6 +1662,12 @@ export default {
     },
     closedocdateChange(date, dateString) {
       this.initCabinFrom.closeDocTime = dateString
+    },
+    removeOrder () {
+      this.$emit('removeOrder')
+    },
+    cancelRemove () {
+      console.log('== 取消删除 ==')
     }
   }
 }
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 381d4f3..a38b706 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -46,7 +46,6 @@
                       </span>
                       <a class="senior-search" @click="toggleAdvanced" v-if="formData.length > 4">
                         {{ advanced ? '收起查询' : '更多查询' }}
-                        <!-- <a-icon :type="advanced ? 'up' : 'down'" /> -->
                         <i class="iconfont" :class="advanced ? 'icon-shouqi' : 'icon-zhankai'"></i>
                       </a>
                     </template>
@@ -107,7 +106,7 @@
                     @confirm="excuteShippingOrderCompareBatch"
                     @cancel="cancelRemove"
                   >
-                    <div class="nav"><i class="iconfont icon-shanchu2"></i>下货纸比对</div>
+                    <div class="nav"><i class="iconfont icon-duibi"></i>下货纸比对</div>
                   </a-popconfirm>
                   <a-popconfirm
                     title="确定删除当前选中订舱？"
@@ -896,10 +895,6 @@ export default {
         pageSize: this.gridOptions.pagerConfig.pageSize,
         pageSizes: [10, 20, 50, 100, 200, 500]
       }
-      // this.tableOrderLabel = ''
-      // this.tableOrderType = ''
-      // this.$refs.xGrid.clearSort()
-      // debugger
       this.gridOptions.data = []
       this.getList(queryParam)
     },
@@ -1377,8 +1372,7 @@ export default {
               return item
             })
             this.$set(this.gridOptions.pagerConfig, 'columns', JSON.parse(JSON.stringify(initData.columns)))
-            // debugger
-            // this.$set(this.gridOptions, 'data', [..._data])
+            this.$set(this.gridOptions, 'data', [..._data])
             this.$refs.xGrid.reloadData(_data).then(() => {
               this.$set(this.gridOptions, 'loading', false)
             })
@@ -1775,8 +1769,10 @@ export default {
         .then(res => {
           if (res.success) {
             this.$message.success('删除成功')
-            this.gridOptions.data = this.gridOptions.data.filter(item => !arr.includes(item.id))
-            this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length
+            const _data = this.gridOptions.data.filter(item => !arr.includes(item.id))
+            this.$refs.xGrid.reloadData(_data).then(() => {
+              this.gridOptions.pagerConfig.total = this.gridOptions.pagerConfig.total - arr.length
+            })
             this.$forceUpdate()
           } else {
             this.$message.error(res.message)