From 7ab05b26aa88997cba9d5f4c1824e3a6447d076b Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Tue, 11 Jul 2023 17:57:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/modules/operationArea.vue          | 29 ++++++++++++---
 src/views/main/BookingLedger/list/index.vue   | 14 ++++++--
 src/views/main/BookingTemplate/index.vue      | 35 ++++++++++++-------
 3 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/src/views/main/BookingLedger/detail/modules/operationArea.vue b/src/views/main/BookingLedger/detail/modules/operationArea.vue
index 6e12dae..27f27b2 100644
--- a/src/views/main/BookingLedger/detail/modules/operationArea.vue
+++ b/src/views/main/BookingLedger/detail/modules/operationArea.vue
@@ -708,11 +708,6 @@
                   <a-input size="small" v-model="hisSearch.bookingno" />
                 </a-form-model-item>
               </a-col>
-              <a-col :span="8">
-                <a-form-model-item label="委托编号">
-                  <a-input size="small" v-model="hisSearch.name" />
-                </a-form-model-item>
-              </a-col>
               <a-col :span="8">
                 <a-form-model-item label="委托单位">
                   <selectView
@@ -920,6 +915,30 @@ export default {
           dataIndex: 'fromPhone',
           width: 120
         },
+        {
+          title: '截单时间',
+          key: 'closeDocTime',
+          dataIndex: 'closeDocTime',
+          width: 120
+        },
+        {
+          title: '截港时间',
+          key: 'closingTime',
+          dataIndex: 'closingTime',
+          width: 120
+        },
+        {
+          title: '截VGM时间',
+          key: 'vgmTime',
+          dataIndex: 'vgmTime',
+          width: 120
+        },
+        {
+          title: '场站',
+          key: 'yard',
+          dataIndex: 'yard',
+          width: 120
+        },
         {
           title: '操作',
           key: 'action',
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index 4e9910e..4fa738b 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -127,7 +127,7 @@
                 </template>
                 <template #tools>
                   <div class="right BookTopButton">
-                    <span class="tab-btn" @click="tableRefresh">
+                    <span class="tab-btn" @click="tableRefreshFirst">
                       <a-icon type="redo" :style="{ fontSize: '14px', transform: 'rotate(278deg)' }" />
                     </span>
                     <span class="tab-btn" @click="tableHeaderEdit">
@@ -833,6 +833,7 @@ export default {
       spinning: false,
       isUpload: false,
       refshYZloading: false,
+      nowFirst:false,
       copyMoreForm: this.$form.createForm(this, { number: '' }),
       copyMoreFlag: false,
       percent: 0,
@@ -1692,6 +1693,15 @@ export default {
     },
     tableRefresh() {
       const data = { ...this.formRes }
+      this.nowFirst = false
+      data.multisort = this.searchData.multisort
+      this.searchData = JSON.parse(JSON.stringify(data))
+      this.init(this.searchData)
+      this.formRes = data
+    },
+    tableRefreshFirst() {
+      const data = { ...this.formRes }
+      this.nowFirst = true
       data.multisort = this.searchData.multisort
       this.searchData = JSON.parse(JSON.stringify(data))
       this.init(this.searchData)
@@ -1908,7 +1918,7 @@ export default {
         query.MBLNO = arr.toString()
       }
       const firstFlag = this.firstFlag
-      if (firstFlag) {
+      if (firstFlag || this.nowFirst) {
         query.firstFlag = true
       }
 
diff --git a/src/views/main/BookingTemplate/index.vue b/src/views/main/BookingTemplate/index.vue
index 92e2eff..4f8a07a 100644
--- a/src/views/main/BookingTemplate/index.vue
+++ b/src/views/main/BookingTemplate/index.vue
@@ -65,9 +65,19 @@
             <vxe-button type="text" @click="$refs.editForm.edit(row)">
               <a-icon type="form" :style="{ color: '#13c2c2' }" />
             </vxe-button>
-            <vxe-button type="text" @click="handleOpen(row)">
-              <a-icon type="bulb" :style="{ color: '#13c2c2' }" />
-            </vxe-button>
+            <a-popconfirm
+              :title="row.isShared?'确认取消共享吗？':'确认共享给所有人吗？'"
+              ok-text="是"
+              cancel-text="否"
+              @confirm="
+                e => {
+                  handleShareAll(row)
+                }
+              ">
+              <vxe-button type="text">
+                <a-icon type="share-alt" :style="{ color: '#13c2c2' }" />
+              </vxe-button>
+            </a-popconfirm>
             <a-popconfirm
               title="请确认删除?"
               ok-text="是"
@@ -183,25 +193,26 @@ export default {
       const data = {
         tempId: this.row.id
       }
-      CancelShare(data).then(res => {
+    },
+    handleShareAll(row) {
+      const data = {
+        tempId: row.id
+      }
+      if (row.isShared) {
+        CancelShare(data).then(res => {
         if (res.success) {
           this.$message.success('取消成功')
-          this.visible = false
           this.FnGetData()
         }
       })
-    },
-    handleShareAll() {
-      const data = {
-        tempId: this.row.id
-      }
-      ShareToAll(data).then(res => {
+      } else {
+        ShareToAll(data).then(res => {
         if (res.success) {
           this.$message.success('分享成功')
-          this.visible = false
           this.FnGetData()
         }
       })
+      }
     },
     handleChange(value, option) {
       this.selectUserId = value