From 623bc44ffc74c83b217a992ca2b0b652a9bbc78e Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Mon, 2 Sep 2024 19:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seaexport/detail/modules/contactList.vue  | 57 ++++++++++++-------
 src/views/operation/seaexport/index.vue       | 10 ----
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/views/operation/seaexport/detail/modules/contactList.vue b/src/views/operation/seaexport/detail/modules/contactList.vue
index d61ee506..782a28cf 100644
--- a/src/views/operation/seaexport/detail/modules/contactList.vue
+++ b/src/views/operation/seaexport/detail/modules/contactList.vue
@@ -5,22 +5,26 @@
       @register="registerTable"
     >
       <template #tableTitle>
-        <h4 style="margin: 0; white-space: nowrap;">联系人信息</h4>
-        <a-button style="margin-left: 100px;" type="link" @click="create">
-          <span class="iconfont icon-new_document"></span>
-          新增
-        </a-button>
-        <a-popconfirm
-          title="确定删除当前选中数据？"
-          ok-text="是"
-          cancel-text="否"
-          @confirm="del"
-        >
-          <a-button type="link" class="ml15">
-            <span class="iconfont icon-shanchu21"></span>
-            删除
-          </a-button>
-        </a-popconfirm>
+        <div class="flex">
+          <h4 style="margin: 0; white-space: nowrap;">联系人信息</h4>
+          <div>
+            <a-button type="link" @click="create">
+              <span class="iconfont icon-new_document"></span>
+              新增
+            </a-button>
+            <a-popconfirm
+              title="确定删除当前选中数据？"
+              ok-text="是"
+              cancel-text="否"
+              @confirm="del"
+            >
+              <a-button type="link" class="ml15">
+                <span class="iconfont icon-shanchu21"></span>
+                删除
+              </a-button>
+            </a-popconfirm>
+          </div>
+        </div>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -41,7 +45,8 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, defineEmits, watch } from 'vue'
+  import { ref, defineEmits, watch, onMounted, onUnmounted } from 'vue'
+  import emitter from '/@/utils/Bus'
   import { personColumns } from './baseInfo.tsx'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
   import { GetBusinessOrderContactList, BatchDelBusinessOrderContact } from '/@/views/operation/seaexport/api/BookingLedger'
@@ -72,7 +77,7 @@
   )
   const flag = ref(true)
   // 关系人表格
-  const [registerTable, { reload, getForm, getSelectRows }] = useTable({
+  const [registerTable, { reload, getForm, getSelectRows, insertTableDataRecord }] = useTable({
     api: async (p) => {
       if (flag.value) {
         flag.value = false
@@ -151,6 +156,16 @@
       loading.value = false
     })
   }
+  // onMounted(() => {
+  //   emitter.on('customerBack', (v) => {
+  //     if (v.clientContact) {
+  //       insertTableDataRecord(v.clientContact)
+  //     }
+  //   })
+  // })
+  // onUnmounted(() => {
+  //   emitter.off('customerBack')
+  // })
 </script>
 
 <style lang="less">
@@ -161,7 +176,11 @@
     }
     .ant-btn-link {
       padding: 0!important;
-      float: right;
+    }
+    .flex {
+      align-items: center;
+      justify-content: space-between;
+      width: 100%;
     }
   }
 </style>
\ No newline at end of file
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index 3cdc8dbb..e9a0b9ac 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -271,10 +271,7 @@
 </template>
 <script lang="ts" setup name="订单管理">
 import TableActionBar from './components/tableActionBar.vue'
-<<<<<<< HEAD
 import { CheckCircleFilled, CloseCircleFilled, RedoOutlined } from '@ant-design/icons-vue';
-=======
->>>>>>> ljj_dev
 import tableActionBarRight from './components/tableActionBarRight.vue'
 import { onMounted, ref } from 'vue'
 import { BasicTable, useTable, TableAction } from '/@/components/Table'
@@ -284,15 +281,8 @@ import { columns, searchFormSchema } from './columns'
 import { useGo } from '/@/hooks/web/usePage'
 import { useMessage } from '/@/hooks/web/useMessage'
 import { formatTableData } from '/@/hooks/web/common'
-<<<<<<< HEAD
 import lstDraftCompareRlt from '../../../components/lstDraftCompareRlt/index.vue'
 import { RefreshYGT } from './api/BookingLedger.js'
-=======
-import { useOptionsStore } from '/@/store/modules/options'
-import lstDraftCompareRlt from '../../../components/lstDraftCompareRlt/index.vue'
-import { RefreshYGT } from './api/BookingLedger.js'
-import { usePermissionStore } from '/@/store/modules/permission'
->>>>>>> ljj_dev
 import { useI18n } from '/@/hooks/web/useI18n'
 const { t } = useI18n()
 import { useAppStore } from '/@/store/modules/app'