From 17eb981cb6a9c13f4d06474a1eaa8fece09b3797 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Mon, 14 Oct 2024 15:19:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E8=A3=85=E7=AE=B1=E5=A4=8D=E5=88=B6bu?=
 =?UTF-8?q?g=EF=BC=8C=E5=AE=A1=E5=8D=95=E9=80=89=E8=88=B1=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seaexport/detail/components/journal.vue   |  1 -
 .../operation/seaexport/detail/index.vue      | 10 ++---
 .../detail/modules/operationArea.vue          | 41 +++++++++++--------
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/views/operation/seaexport/detail/components/journal.vue b/src/views/operation/seaexport/detail/components/journal.vue
index b7e4321a..b6eef219 100644
--- a/src/views/operation/seaexport/detail/components/journal.vue
+++ b/src/views/operation/seaexport/detail/components/journal.vue
@@ -39,7 +39,6 @@
 
 <script lang="ts" setup>
   import { ref, onMounted, defineProps } from 'vue'
-  import { GetSeaExportLogList } from '/@/views/operation/seaexport/api/BookingLedger'
   const props = defineProps({
     id: {
       type: String
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index 35663d1b..b0154b81 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -870,7 +870,7 @@
   // 选择舱位完成后，审核订单，创建订舱任务
   const approveAndCreateTast = (type) => {
     createTask(type)
-    seaExportTaskAudit(null)
+    seaExportTaskAudit(null, false)
   }
   // 创建任务
   const createTask = async (type) => {
@@ -1036,18 +1036,17 @@
             sspace.value.init()
           } else {
             // 非现舱直接审核通过
-            seaExportTaskAudit(remark)
-            AutomaticBooking(id.value)
+            seaExportTaskAudit(remark, true)
           }
         } else {
           // 不是最后一个审批人，直接审核
-          seaExportTaskAudit(remark)
+          seaExportTaskAudit(remark, false)
         }
       })
     }
   }
   // 审单接口
-  const seaExportTaskAudit = (remark) => {
+  const seaExportTaskAudit = (remark, b) => {
     const postData = {
       result: remark ? 2 : 1,
       ids: [id.value],
@@ -1059,6 +1058,7 @@
     SeaExportTaskAudit(postData).then(res => {
       loading.value = false
       createMessage.success(res.message)
+      if (b) AutomaticBooking(id.value)
       // 关闭当前页面
       const { fullPath } = route //获取当前路径
       tabStore.closeTabByKey(fullPath, router)
diff --git a/src/views/operation/seaexport/detail/modules/operationArea.vue b/src/views/operation/seaexport/detail/modules/operationArea.vue
index 82f4ca57..bda4162e 100644
--- a/src/views/operation/seaexport/detail/modules/operationArea.vue
+++ b/src/views/operation/seaexport/detail/modules/operationArea.vue
@@ -589,19 +589,16 @@
     UploadOcrFile,
     GetOcrImg,
     DownloadBookingOrClosingEDI,
-    CheckAndInitVOLTAEdi,
     CancelAllocationSlot,
     GetOcrText,
     SendTrace,
     SubmitTelex,
     GetClientParamListById,
-    PrintShippingOrderLetterPDF,
     GetChangeOrderStatus,
     CreateChangeTaskAsync
   } from '/@/views/operation/seaexport/api/BookingLedger.js'
-   import { Divider } from 'ant-design-vue'
   import { BookingTruckGetTruckListByBooking } from '/@/views/operation/seaexport/api/SendCar.js'
-  import { ref, reactive, getCurrentInstance, h, watch, onMounted } from 'vue'
+  import { ref, reactive, h, watch, nextTick } from 'vue'
   import { Modal } from 'ant-design-vue'
   import { useModal } from '/@/components/Modal'
   import { useAppStore } from '/@/store/modules/app'
@@ -1084,20 +1081,26 @@
       if (res.data == '未审单') {
         createMessage.warning('此单未审，可直接编辑调整！')
       } else {
-        if (res.data == '已审未出号') {
-          setFieldsValue({
-            orderProgress: 1
-          })
-        } else if (res.data == '已出号未申报') {
-          setFieldsValue({
-            orderProgress: 2
-          })
-        } else if (res.data == '已申报') {
-          setFieldsValue({
-            orderProgress: 3
-          })
-        }
         changeConfigFlag.value = true
+        nextTick(() => {
+          if (res.data == '已审未出号') {
+            setFieldsValue({
+              orderProgress: 1
+            })
+          } else if (res.data == '已出号未申报') {
+            setFieldsValue({
+              orderProgress: 2
+            })
+          } else if (res.data == '已申报') {
+            setFieldsValue({
+              orderProgress: 3
+            })
+          }
+        })
+        setFieldsValue({
+          changeReason: null,
+          changeRemark: null
+        })
       }
     })
   }
@@ -1126,9 +1129,11 @@
     const postData = await validate()
     postData['id'] = props.id
     CreateChangeTaskAsync(postData).then(res => {
-      createMessage.success(res.message)
+      createMessage.success('已进入改配页面！')
       emit('changeConfig')
       changeConfigFlag.value = false
+    }).catch(() => {
+      changeConfigFlag.value = false
     })
   }
   function downloadBookingOrEDI(type) {