From 409d4257a184e6333e70751ac87fe71702adbfad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Mon, 14 Oct 2024 10:53:12 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=A2=E6=88=B7=20=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/baseinfo/infoclient/TenantAuditStepModal.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index 328c65fc..e0c0621d 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -415,13 +415,12 @@
       'isContract',
     ]
     if (CustomerOrSupplier.value == 'isCustomer') {
-      console.log('客户')
       updateSchema({
         label: '客户属性',
         field: 'ArrclientTag',
         component: 'ApiSelect',
         colProps: { span: 12 },
-        defaultValue: 'isController',
+        defaultValue: ['isController'],
         componentProps: () => {
           return {
             api: () => {
@@ -446,8 +445,8 @@
           }
         },
       })
+      setFieldsValue({ ArrclientTag: ['isController'] })
     } else if (CustomerOrSupplier.value == 'isSupplier') {
-      console.log('供应商')
       updateSchema({
         label: '客户属性',
         field: 'ArrclientTag',
@@ -478,14 +477,14 @@
           }
         },
       })
+      setFieldsValue({ ArrclientTag: [] })
     } else if (CustomerOrSupplier.value == 'isCustomerAndisSupplier') {
-      console.log('供应商及客户')
       updateSchema({
         label: '客户属性',
         field: 'ArrclientTag',
         component: 'ApiSelect',
         colProps: { span: 12 },
-        defaultValue: 'isController',
+        defaultValue: ['isController'],
         componentProps: ({ formModel }) => {
           return {
             api: () => {
@@ -504,6 +503,7 @@
           }
         },
       })
+      setFieldsValue({ ArrclientTag: ['isController'] })
     }
   }
   function ChangeCustomerOrSupplier() {

From b2660508d27ee8ed05effcef3d6cc0d864e6100a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Mon, 14 Oct 2024 12:03:49 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=A2=E6=88=B7=20=E5=B9=B2=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TenantAuditStepModal.vue                  |  9 ++--
 .../infoclient/ClientStakeholder/api.ts       |  8 ++--
 .../infoclient/ClientStakeholder/columns.tsx  | 45 +++++++++++++++++--
 .../infoclient/ClientStakeholder/index.vue    | 25 ++++++++---
 4 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue
index 2c05ca94..3527187c 100644
--- a/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue
@@ -3,7 +3,7 @@
     v-bind="$attrs"
     :use-wrapper="true"
     :title="getTitle"
-    width="60%"
+    width="30%"
     @register="registerModal"
     @ok="handleSave"
   >
@@ -57,6 +57,8 @@
   })
 
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    console.log(data)
+
     resetFields()
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
@@ -68,12 +70,9 @@
         setFieldsValue({
           ...res.data,
         })
-        // console.log('返回数据Form', getFieldsValue());
-        // setFieldsValue({ trainId: unref(res.data.trainId) });
       }
-      // setModalProps({ confirmLoading: false });
     } else {
-      setFieldsValue({ permissionIdentity: unref(2) })
+      setFieldsValue({ clientId: data.clientId })
     }
     setModalProps({ loading: false })
   })
diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/api.ts b/src/views/baseinfo/infoclient/ClientStakeholder/api.ts
index c2904cd6..508f8555 100644
--- a/src/views/baseinfo/infoclient/ClientStakeholder/api.ts
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/api.ts
@@ -33,12 +33,12 @@ export function ApiGet(query) {
     params: query,
   })
 }
-// 获取客户干系人 (Auth)
-export function ApiEdit(query) {
+// 更新客户干系人 (Auth)
+export function ApiEdit(data) {
   return request<DataResult>({
     url: Api.edit,
-    method: 'get',
-    params: query,
+    method: 'post',
+    data,
   })
 }
 // 详情 (Auth)
diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx b/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx
index defd34ee..d8a0a4ff 100644
--- a/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx
@@ -1,4 +1,5 @@
 import { BasicColumn, FormSchema } from '/@/components/Table'
+import { GetUserList } from '/@/api/common'
 
 export const columns: BasicColumn[] = [
   {
@@ -45,20 +46,57 @@ export const formSchema: FormSchema[] = [
     show: false,
   },
   {
-    field: 'carrierId',
     label: '',
+    field: 'clientId',
     component: 'Input',
     show: false,
   },
+  {
+    label: '干系人Name',
+    field: 'createByName',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '干系人',
+    field: 'createBy',
+    component: 'ApiSelect',
+    required: false,
+    defaultValue: null,
+    dynamicDisabled: false,
+    colProps: { span: 24 },
+    componentProps: ({ formModel }) => {
+      return {
+        api: GetUserList,
+        labelField: 'label',
+        valueField: 'value',
+        resultField: 'data',
+        getPopupContainer: () => document.body,
+        onChange: (e, obj) => {
+          if (e && obj) {
+            console.log(e, obj)
+            formModel.createBy = obj.value
+            formModel.createByName = obj.label
+          }
+          if (!e && !obj) {
+            formModel.createBy = ''
+            formModel.createByName = ''
+          }
+        },
+      }
+    },
+  },
+
   {
     field: 'startDate',
     label: '生效日期',
     component: 'DatePicker',
     required: true,
-    colProps: { span: 20 },
+    colProps: { span: 24 },
     defaultValue: '',
     componentProps: {
       style: 'width:100%',
+      getPopupContainer: () => document.body,
     },
   },
   {
@@ -66,10 +104,11 @@ export const formSchema: FormSchema[] = [
     label: '失效日期',
     component: 'DatePicker',
     required: true,
-    colProps: { span: 20 },
+    colProps: { span: 24 },
     defaultValue: '',
     componentProps: {
       style: 'width:100%',
+      getPopupContainer: () => document.body,
     },
   },
   {
diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
index fdfa400a..868012f5 100644
--- a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
@@ -1,15 +1,16 @@
 <template>
   <div>
     <BasicTable class="ds-table-detail" @register="registerTable">
-      <!-- <template #tableTitle>
+      <template #tableTitle>
+        <span class="title">干系人列表</span>
         <a-button type="link" @click="handleCreate">
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
-        <a-button type="link" @click="handleDel">
+        <!-- <a-button type="link" @click="handleDel">
           <span class="iconfont icon-shanchu2"></span>
           删除
-        </a-button>
+        </a-button> -->
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -23,7 +24,7 @@
             ]"
           />
         </template>
-      </template> -->
+      </template>
     </BasicTable>
     <TenantAuditStepModal @register="registerModal" @success="handleSuccess" />
     <a-modal
@@ -138,8 +139,8 @@
   }
   function handleCreate() {
     openModal(true, {
-      isParent: false,
       isUpdate: false,
+      clientId: props.clientId,
     })
   }
   function handleDel() {
@@ -160,3 +161,17 @@
     reload()
   }
 </script>
+<style lang="less" scoped>
+  .ds-table-detail {
+    margin-top: -16px;
+    .title {
+      font-size: 12px;
+      font-weight: 700;
+      letter-spacing: 1px;
+      line-height: 15.84px;
+      color: rgba(51, 56, 61, 1);
+      text-align: left;
+      vertical-align: bottom;
+    }
+  }
+</style>

From 06e15e3c0dd3514d624bacbe0d6313ac30eba3cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Mon, 14 Oct 2024 14:39:14 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=20=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/baseinfo/clientflowtemplate/columns.tsx | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/baseinfo/clientflowtemplate/columns.tsx b/src/views/baseinfo/clientflowtemplate/columns.tsx
index c2d11516..8bc7326b 100644
--- a/src/views/baseinfo/clientflowtemplate/columns.tsx
+++ b/src/views/baseinfo/clientflowtemplate/columns.tsx
@@ -92,17 +92,16 @@ export const formSchema: FormSchema[] = [
   {
     field: 'status',
     label: '是否启用',
-    component: 'RadioButtonGroup',
-    defaultValue: 1,
-    colProps: { span: 12 },
+    component: 'Switch',
+    colProps: { span: 6 },
+    defaultValue: 0,
     componentProps: {
-      options: [
-        { label: '是', value: 0 },
-        { label: '否', value: 1 },
-      ],
+      checkedChildren: '启用',
+      checkedValue: 0,
+      unCheckedChildren: '禁用',
+      unCheckedValue: 1,
     },
   },
-
   {
     field: 'columnView',
     label: '关联表',

From 7bd0031ffb4b76b9f70f9c30952e6431c24c371a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Mon, 14 Oct 2024 15:08:15 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B8=AF=E5=8F=A3=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/baseinfo/port/columns.tsx | 2 +-
 src/views/baseinfo/port/index.vue   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/baseinfo/port/columns.tsx b/src/views/baseinfo/port/columns.tsx
index 2045ea96..2a4aa6ba 100644
--- a/src/views/baseinfo/port/columns.tsx
+++ b/src/views/baseinfo/port/columns.tsx
@@ -138,7 +138,7 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'CnName:portName:ediCode',
+    field: 'cnName:portName:ediCode',
     label: '港口名称',
     component: 'Input',
     colProps: { span: 4 },
diff --git a/src/views/baseinfo/port/index.vue b/src/views/baseinfo/port/index.vue
index 9f86a9f5..f84fde0e 100644
--- a/src/views/baseinfo/port/index.vue
+++ b/src/views/baseinfo/port/index.vue
@@ -76,7 +76,9 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p)
+      let RData = formatParams(p)
+      RData.queryCondition = RData.queryCondition.replace(`{"Key":1,"Value"`, `{"Key":0,"Value"`)
+      return RData
     },
     columns,
     formConfig: {

From c76d348859c3f33a0a53c61a972be34deaf5c395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Mon, 14 Oct 2024 15:16:46 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=9B=BF=E6=8D=A2=20?=
 =?UTF-8?q?=E5=9B=BD=E5=AE=B6=20=E4=B8=BA=20=E5=9B=BD=E5=AE=B6=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/configOptions.ts            |    6 +-
 src/store/modules/options.ts                  |    4 +-
 .../baseinfo/country/TenantAuditStepModal.vue |    2 +-
 src/views/baseinfo/country/columns.tsx        |   22 +-
 src/views/baseinfo/country/index.vue          |    4 +-
 src/views/baseinfo/infoclient/EditColumns.tsx |    2 +-
 src/views/baseinfo/infoclient/api.ts          |    2 +-
 src/views/baseinfo/infoclient/columns.tsx     |   10 +-
 .../baseinfo/infoclientAudit/columns.tsx      |    2 +-
 src/views/baseinfo/port/columns.tsx           |   10 +-
 src/views/baseinfo/sendReciveTem/columns.tsx  |   14 +-
 src/views/baseinfo/shipping/columns.tsx       |    6 +-
 .../bookingcabin/CabinInventory/columns.tsx   |   68 +-
 .../bookingcabin/CabinManagement/columns.tsx  |    2 +-
 .../detail/components/applyInfoColumns.tsx    |   28 +-
 .../detail/components/applyInfoColumns.tsx    |   28 +-
 .../operation/seaexport/api/BookingLedger.js  |   44 +-
 .../detail/components/ladingInfo.tsx          |  187 +-
 .../seaexport/detail/modules/preOrder.tsx     |  115 +-
 .../seaexport/detail/modules/preOrder.vue     | 1754 +++++++++--------
 .../detail/modules/preOrderData.json          |   12 +-
 .../taskList/transPlanHasChange.vue           |  392 ++--
 22 files changed, 1411 insertions(+), 1303 deletions(-)

diff --git a/src/store/modules/configOptions.ts b/src/store/modules/configOptions.ts
index 63b8cfd1..7b5d9188 100644
--- a/src/store/modules/configOptions.ts
+++ b/src/store/modules/configOptions.ts
@@ -25,7 +25,7 @@ import {
   GetCodeCountryList,
   GetClientGoodsList,
   GetYardClientList,
-  GetControllerClientList
+  GetControllerClientList,
 } from '/@/views/operation/seaexport/api/BookingLedger'
 import { getList } from '/@/views/flowcenter/flowInstances/api'
 import {
@@ -33,7 +33,7 @@ import {
   GetClientListByCode,
   GetCtnSelectList,
   GetTenantParamSelectList,
-  getOrgList
+  getOrgList,
 } from '/@/api/common/index'
 import { getClientBankList } from '/@/views/baseinfo/infoclient/api'
 export default {
@@ -185,7 +185,7 @@ export default {
       return res.data
     })
   },
-  // 国家
+  // 国家地区
   GetCodeCountryList: () => {
     return GetCodeCountryList().then((res) => {
       return res.data
diff --git a/src/store/modules/options.ts b/src/store/modules/options.ts
index 8149930c..11a986a9 100644
--- a/src/store/modules/options.ts
+++ b/src/store/modules/options.ts
@@ -46,7 +46,7 @@ export const useOptionsStore = defineStore({
     GetFeeCurrencySelectList: null,
     // 用户表
     GetUserList: null,
-    // 国家
+    // 国家地区
     GetCodeCountryList: null,
     // 车队
     GetTruckClientList: null,
@@ -67,7 +67,7 @@ export const useOptionsStore = defineStore({
     // 场站
     GetYardClientList: null,
     // 委托单位
-    GetControllerClientList: null
+    GetControllerClientList: null,
   }),
   getters: {
     // 通过code获取下拉字典（code)就是接口尾部单词
diff --git a/src/views/baseinfo/country/TenantAuditStepModal.vue b/src/views/baseinfo/country/TenantAuditStepModal.vue
index b3326ccb..fa7f8c76 100644
--- a/src/views/baseinfo/country/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/country/TenantAuditStepModal.vue
@@ -79,7 +79,7 @@
     setModalProps({ loading: false })
   })
 
-  const getTitle = computed(() => (!unref(isUpdate) ? '新增国家信息' : '编辑国家信息'))
+  const getTitle = computed(() => (!unref(isUpdate) ? '新增国家地区信息' : '编辑国家地区信息'))
 
   async function handleSave(exit) {
     try {
diff --git a/src/views/baseinfo/country/columns.tsx b/src/views/baseinfo/country/columns.tsx
index c58a87da..07304880 100644
--- a/src/views/baseinfo/country/columns.tsx
+++ b/src/views/baseinfo/country/columns.tsx
@@ -2,17 +2,17 @@ import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
 export const columns: BasicColumn[] = [
   {
-    title: '国家唯一代码',
+    title: '国家地区唯一代码',
     dataIndex: 'countryCode',
     width: 150,
   },
   {
-    title: '国家名称',
+    title: '国家地区名称',
     dataIndex: 'countryName',
     width: 200,
   },
   {
-    title: '国家英文名称',
+    title: '国家地区英文名称',
     dataIndex: 'countryEnName',
     width: 200,
   },
@@ -37,12 +37,12 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '国家3字代码',
+    title: '国家地区3字代码',
     dataIndex: 'countryCode3',
     width: 200,
   },
   {
-    title: '国家描述',
+    title: '国家地区描述',
     dataIndex: 'explain',
     width: 200,
   },
@@ -74,7 +74,7 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'CountryName',
-    label: '国家名称',
+    label: '国家地区名称',
     component: 'Input',
     colProps: { span: 6 },
   },
@@ -89,7 +89,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'countryCode',
-    label: '国家唯一代码',
+    label: '国家地区唯一代码',
     component: 'Input',
     required: true,
     colProps: { span: 12 },
@@ -99,14 +99,14 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'countryName',
-    label: '国家名称',
+    label: '国家地区名称',
     component: 'Input',
     required: true,
     colProps: { span: 12 },
   },
   {
     field: 'countryEnName',
-    label: '国家英文名称',
+    label: '国家地区英文名称',
     component: 'Input',
 
     colProps: { span: 12 },
@@ -139,14 +139,14 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'countryCode3',
-    label: '国家3字代码',
+    label: '国家地区3字代码',
     component: 'Input',
 
     colProps: { span: 12 },
   },
   {
     field: 'explain',
-    label: '国家描述',
+    label: '国家地区描述',
     component: 'InputTextArea',
 
     colProps: { span: 12 },
diff --git a/src/views/baseinfo/country/index.vue b/src/views/baseinfo/country/index.vue
index bcf54225..5e966411 100644
--- a/src/views/baseinfo/country/index.vue
+++ b/src/views/baseinfo/country/index.vue
@@ -20,7 +20,7 @@
         <Divider type="vertical" />
         <a-button type="link" @click="importFlow" :disabled="checkPermissions('op:country:import')">
           <span class="iconfont icon-xiazai"></span>
-          导入国家信息
+          导入国家地区信息
         </a-button>
       </template>
       <template #bodyCell="{ column, record }">
@@ -41,7 +41,7 @@
     <TenantAuditStepModal @register="registerModal" @success="handleSuccess" />
     <a-modal
       :visible="visible"
-      title="导入国家信息"
+      title="导入国家地区信息"
       width="70%"
       @ok="handleOk"
       @cancel="handleCancel"
diff --git a/src/views/baseinfo/infoclient/EditColumns.tsx b/src/views/baseinfo/infoclient/EditColumns.tsx
index 150197ce..9a7f6bd6 100644
--- a/src/views/baseinfo/infoclient/EditColumns.tsx
+++ b/src/views/baseinfo/infoclient/EditColumns.tsx
@@ -321,7 +321,7 @@ export const EditformSchema: FormSchema[] = [
   },
   {
     field: 'country',
-    label: '国家',
+    label: '国家地区',
     component: 'DEdit',
     colProps: { span: 4 },
     defaultValue: '',
diff --git a/src/views/baseinfo/infoclient/api.ts b/src/views/baseinfo/infoclient/api.ts
index de95a7e5..c5af1d1e 100644
--- a/src/views/baseinfo/infoclient/api.ts
+++ b/src/views/baseinfo/infoclient/api.ts
@@ -105,7 +105,7 @@ export function getClientSourceSelectList(query) {
     params: query,
   })
 }
-// 获取国家信息下拉列表-客户端 (Auth)
+// 获取国家地区信息下拉列表-客户端 (Auth)
 export function getClientCountrySelectList(query) {
   return request<DataResult>({
     url: Api.GetClientCountrySelectList,
diff --git a/src/views/baseinfo/infoclient/columns.tsx b/src/views/baseinfo/infoclient/columns.tsx
index 2fe91769..80313921 100644
--- a/src/views/baseinfo/infoclient/columns.tsx
+++ b/src/views/baseinfo/infoclient/columns.tsx
@@ -201,7 +201,7 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '国家',
+    title: '国家地区',
     dataIndex: 'country',
     sorter: true,
     width: 150,
@@ -371,7 +371,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'country',
-    label: '国家',
+    label: '国家地区',
     component: 'Select',
     colProps: { span: 4 },
     componentProps: () => {
@@ -695,7 +695,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'country',
-    label: '国家',
+    label: '国家地区',
     component: 'Select',
     colProps: { span: 4 },
 
@@ -1545,14 +1545,14 @@ export const CADformSchema: FormSchema[] = [
   },
   {
     field: 'countryName',
-    label: '国家名称',
+    label: '国家地区名称',
     component: 'Input',
     colProps: { span: 6 },
     show: false,
   },
   {
     field: 'countryId',
-    label: '国家',
+    label: '国家地区',
     component: 'Select',
     colProps: { span: 6 },
 
diff --git a/src/views/baseinfo/infoclientAudit/columns.tsx b/src/views/baseinfo/infoclientAudit/columns.tsx
index 3c7581c7..5482c028 100644
--- a/src/views/baseinfo/infoclientAudit/columns.tsx
+++ b/src/views/baseinfo/infoclientAudit/columns.tsx
@@ -203,7 +203,7 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '国家',
+    title: '国家地区',
     dataIndex: 'country',
     sorter: true,
     width: 150,
diff --git a/src/views/baseinfo/port/columns.tsx b/src/views/baseinfo/port/columns.tsx
index 2a4aa6ba..f71bb700 100644
--- a/src/views/baseinfo/port/columns.tsx
+++ b/src/views/baseinfo/port/columns.tsx
@@ -40,7 +40,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '国家名称',
+    title: '国家地区名称',
     dataIndex: 'countryName',
     sorter: true,
     width: 200,
@@ -73,7 +73,7 @@ export const columns: BasicColumn[] = [
     },
   },
   // {
-  //   title: '国家',
+  //   title: '国家地区',
   //   dataIndex: 'countryId',
   //   sorter: true,
   //   width: 200,
@@ -149,7 +149,7 @@ export const searchFormSchema: FormSchema[] = [
 
   {
     field: 'countryId',
-    label: '国家',
+    label: '国家地区',
     component: 'Select',
     colProps: { span: 4 },
     defaultValue: '',
@@ -205,7 +205,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'countryName',
-    label: '国家名称',
+    label: '国家地区名称',
     component: 'Input',
     colProps: { span: 12 },
     show: false,
@@ -235,7 +235,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'countryId',
-    label: '国家',
+    label: '国家地区',
     component: 'Select',
     colProps: { span: 12 },
     defaultValue: '',
diff --git a/src/views/baseinfo/sendReciveTem/columns.tsx b/src/views/baseinfo/sendReciveTem/columns.tsx
index a320e16b..1a73f658 100644
--- a/src/views/baseinfo/sendReciveTem/columns.tsx
+++ b/src/views/baseinfo/sendReciveTem/columns.tsx
@@ -36,7 +36,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '国家',
+    title: '国家地区',
     dataIndex: 'countryName',
     sorter: true,
     width: 200,
@@ -57,9 +57,9 @@ export const columns: BasicColumn[] = [
       if (record.type) {
         RData = record.type
       }
-      RData = RData.replace("1", "收货人")
-      RData = RData.replace("2", "发货人")
-      RData = RData.replace("3", "通知人")
+      RData = RData.replace('1', '收货人')
+      RData = RData.replace('2', '发货人')
+      RData = RData.replace('3', '通知人')
       return RData
     },
   },
@@ -125,7 +125,7 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 12 },
   },
   {
-    label: '国家code',
+    label: '国家地区code',
     field: 'countryName',
     component: 'Input',
     defaultValue: '',
@@ -133,7 +133,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'country',
-    label: '国家',
+    label: '国家地区',
     component: 'Select',
     required: false,
     dynamicDisabled: false,
@@ -203,6 +203,6 @@ export const formSchema: FormSchema[] = [
     field: 'content',
     label: '模版内容',
     component: 'InputTextArea',
-    colProps: { span: 24 }
+    colProps: { span: 24 },
   },
 ]
diff --git a/src/views/baseinfo/shipping/columns.tsx b/src/views/baseinfo/shipping/columns.tsx
index 76c47150..2dcbc419 100644
--- a/src/views/baseinfo/shipping/columns.tsx
+++ b/src/views/baseinfo/shipping/columns.tsx
@@ -24,7 +24,7 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '国家',
+    title: '国家地区',
     dataIndex: 'countryName',
     width: 120,
   },
@@ -114,7 +114,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'countryId',
-    label: '国家',
+    label: '国家地区',
     required: true,
     component: 'Select',
     colProps: { span: 12 },
@@ -138,7 +138,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'countryName',
-    label: '国家名称',
+    label: '国家地区名称',
     show: false,
     component: 'Input',
   },
diff --git a/src/views/bookingcabin/CabinInventory/columns.tsx b/src/views/bookingcabin/CabinInventory/columns.tsx
index 974da678..f11e6fe9 100644
--- a/src/views/bookingcabin/CabinInventory/columns.tsx
+++ b/src/views/bookingcabin/CabinInventory/columns.tsx
@@ -1,15 +1,17 @@
-
 import { ref } from 'vue'
 import { BasicColumn, FormSchema } from '/@/components/Table'
-import { GetCarrierlist, GetClientPortSelectList } from '/@/views/operation/seaexport/api/BookingLedger'
-import { GetCtnSelectList,GetCarrierSelectList } from '/@/api/common'
+import {
+  GetCarrierlist,
+  GetClientPortSelectList,
+} from '/@/views/operation/seaexport/api/BookingLedger'
+import { GetCtnSelectList, GetCarrierSelectList } from '/@/api/common'
 import { getDictOption } from '/@/utils/dictUtil'
 import { useOptionsStore } from '/@/store/modules/options'
 
 const optionsStore = useOptionsStore()
 const FnblType = ref([])
 const FncargoId = ref([])
-getDictOption('bl_type').then(res => {
+getDictOption('bl_type').then((res) => {
   FncargoId.value = res
 })
 export const searchFormSchema: FormSchema[] = [
@@ -34,7 +36,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: {
       allowClear: true,
-    }
+    },
   },
   {
     field: 'PORTLOAD',
@@ -51,11 +53,9 @@ export const searchFormSchema: FormSchema[] = [
         valueField: 'ediCode',
         showName: 'ediCode',
         immediate: false,
-        onChange: (e, obj) => {
-          
-        }
+        onChange: (e, obj) => {},
       }
-    }
+    },
   },
   {
     field: 'carrier',
@@ -85,9 +85,9 @@ export const searchFormSchema: FormSchema[] = [
         api: GetCtnSelectList,
         labelField: 'ctnName',
         valueField: 'ediCode',
-        resultField: 'data'
+        resultField: 'data',
       }
-    }
+    },
   },
   {
     field: 'etA_START',
@@ -98,7 +98,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: {
       allowClear: true,
-    }
+    },
   },
   {
     field: 'etA_END',
@@ -109,7 +109,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: {
       allowClear: true,
-    }
+    },
   },
 
   {
@@ -129,15 +129,13 @@ export const searchFormSchema: FormSchema[] = [
         showName: 'ediCode',
         valueField: 'ediCode',
         immediate: false,
-        onChange: (e, obj) => {
-        
-        }
+        onChange: (e, obj) => {},
       }
-    }
+    },
   },
   {
     field: 'PORTDISCHARGE_COUNTRY_CODE',
-    label: '国家',
+    label: '国家地区',
     component: 'Input',
     colProps: { span: 4 },
   },
@@ -162,25 +160,25 @@ export const columns: BasicColumn[] = [
     title: '订舱抬头',
     align: 'center',
     width: 200,
-    dataIndex: 'bookingParty'
+    dataIndex: 'bookingParty',
   },
   {
     title: '合约号',
     align: 'center',
     width: 100,
-    dataIndex: 'contractNo'
+    dataIndex: 'contractNo',
   },
   {
     title: '订舱方式',
     align: 'center',
     width: 100,
-    dataIndex: 'bookingSlotTypeName'
+    dataIndex: 'bookingSlotTypeName',
   },
   {
     title: '总库存',
     align: 'center',
     width: 100,
-    dataIndex: 'totalOrders'
+    dataIndex: 'totalOrders',
   },
   {
     title: '剩余库存',
@@ -192,55 +190,55 @@ export const columns: BasicColumn[] = [
     title: '取消库存',
     align: 'center',
     width: 100,
-    dataIndex: 'cancelNum'
+    dataIndex: 'cancelNum',
   },
   {
     title: '收货地',
     align: 'center',
     width: 100,
-    dataIndex: 'placeReceipt'
+    dataIndex: 'placeReceipt',
   },
   {
     title: '交货地',
     align: 'center',
     width: 100,
-    dataIndex: 'placeDelivery'
+    dataIndex: 'placeDelivery',
   },
   {
     title: '装货港',
     align: 'center',
     width: 100,
-    dataIndex: 'portLoad'
+    dataIndex: 'portLoad',
   },
   {
     title: '卸货港',
     align: 'center',
     width: 100,
-    dataIndex: 'portDischarge'
+    dataIndex: 'portDischarge',
   },
   {
-    title: '卸货港国家',
+    title: '卸货港国家地区',
     align: 'center',
     width: 100,
-    dataIndex: 'portDischargeCountry'
+    dataIndex: 'portDischargeCountry',
   },
   {
     title: '航线',
     align: 'center',
     width: 100,
-    dataIndex: 'laneName'
+    dataIndex: 'laneName',
   },
   {
     title: '箱型箱量',
     align: 'center',
     width: 100,
-    dataIndex: 'ctnStat'
+    dataIndex: 'ctnStat',
   },
   {
     title: '剩余箱型箱量',
     align: 'center',
     width: 110,
-    dataIndex: 'remainCtnStat'
+    dataIndex: 'remainCtnStat',
   },
   {
     title: 'ETD',
@@ -258,8 +256,6 @@ export const columns: BasicColumn[] = [
     title: '船公司',
     align: 'center',
     width: 150,
-    dataIndex: 'carrier'
-  }
+    dataIndex: 'carrier',
+  },
 ]
-
-
diff --git a/src/views/bookingcabin/CabinManagement/columns.tsx b/src/views/bookingcabin/CabinManagement/columns.tsx
index 55610878..784db641 100644
--- a/src/views/bookingcabin/CabinManagement/columns.tsx
+++ b/src/views/bookingcabin/CabinManagement/columns.tsx
@@ -533,7 +533,7 @@ export const columns: BasicColumn[] = [
     customCell: sharedOnCell,
   },
   {
-    title: '卸货港国家',
+    title: '卸货港国家地区',
     align: 'center',
     width: 180,
     dataIndex: 'portDischargeCountry',
diff --git a/src/views/finance/paymentSettlement/detail/components/applyInfoColumns.tsx b/src/views/finance/paymentSettlement/detail/components/applyInfoColumns.tsx
index 199e1925..1293ed93 100644
--- a/src/views/finance/paymentSettlement/detail/components/applyInfoColumns.tsx
+++ b/src/views/finance/paymentSettlement/detail/components/applyInfoColumns.tsx
@@ -1,7 +1,7 @@
 /*
  * @Author: lijingjia lijj_xl@163.com
  * @Date: 2024-06-21 16:59:01
- * @Description: 
+ * @Description:
  */
 import { commentProps } from 'ant-design-vue/lib/comment'
 import { BasicColumn, FormSchema } from '/@/components/Table'
@@ -64,11 +64,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'originalCurrency',
     width: 100,
   },
-//   {
-//     title: '原始汇率',
-//     dataIndex: 'originalCurrency',
-//     width: 200,
-//   },
+  //   {
+  //     title: '原始汇率',
+  //     dataIndex: 'originalCurrency',
+  //     width: 200,
+  //   },
   {
     title: '折算汇率',
     dataIndex: 'exchangeRate',
@@ -79,11 +79,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'originalAmount',
     width: 100,
   },
-//   {
-//     title: '进项/销项税率',
-//     dataIndex: 'originalCurrency',
-//     width: 200,
-//   },
+  //   {
+  //     title: '进项/销项税率',
+  //     dataIndex: 'originalCurrency',
+  //     width: 200,
+  //   },
   {
     title: '揽货人',
     dataIndex: 'note',
@@ -99,8 +99,8 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'CountryName',
-    label: '国家名称',
+    label: '国家地区名称',
     component: 'Input',
-    colProps: { span: 6 }
-  }
+    colProps: { span: 6 },
+  },
 ]
diff --git a/src/views/operation/paidApply/detail/components/applyInfoColumns.tsx b/src/views/operation/paidApply/detail/components/applyInfoColumns.tsx
index 199e1925..1293ed93 100644
--- a/src/views/operation/paidApply/detail/components/applyInfoColumns.tsx
+++ b/src/views/operation/paidApply/detail/components/applyInfoColumns.tsx
@@ -1,7 +1,7 @@
 /*
  * @Author: lijingjia lijj_xl@163.com
  * @Date: 2024-06-21 16:59:01
- * @Description: 
+ * @Description:
  */
 import { commentProps } from 'ant-design-vue/lib/comment'
 import { BasicColumn, FormSchema } from '/@/components/Table'
@@ -64,11 +64,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'originalCurrency',
     width: 100,
   },
-//   {
-//     title: '原始汇率',
-//     dataIndex: 'originalCurrency',
-//     width: 200,
-//   },
+  //   {
+  //     title: '原始汇率',
+  //     dataIndex: 'originalCurrency',
+  //     width: 200,
+  //   },
   {
     title: '折算汇率',
     dataIndex: 'exchangeRate',
@@ -79,11 +79,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'originalAmount',
     width: 100,
   },
-//   {
-//     title: '进项/销项税率',
-//     dataIndex: 'originalCurrency',
-//     width: 200,
-//   },
+  //   {
+  //     title: '进项/销项税率',
+  //     dataIndex: 'originalCurrency',
+  //     width: 200,
+  //   },
   {
     title: '揽货人',
     dataIndex: 'note',
@@ -99,8 +99,8 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'CountryName',
-    label: '国家名称',
+    label: '国家地区名称',
     component: 'Input',
-    colProps: { span: 6 }
-  }
+    colProps: { span: 6 },
+  },
 ]
diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js
index a2384467..06d88a60 100644
--- a/src/views/operation/seaexport/api/BookingLedger.js
+++ b/src/views/operation/seaexport/api/BookingLedger.js
@@ -610,7 +610,7 @@ export function GetShippingBillTemplateSelectList(parameter) {
     params: parameter,
   })
 }
-//获取国家信息下拉列表-客户端 (Auth)
+//获取国家地区信息下拉列表-客户端 (Auth)
 export function GetClientCountrySelectList(parameter) {
   return request({
     url: '/mainApi/Common/GetClientCountrySelectList',
@@ -652,7 +652,7 @@ export function GetFactorySelectList(parameter) {
     params: parameter,
   })
 }
-// 获取国家下拉列表-客户端 (Auth)
+// 获取国家地区下拉列表-客户端 (Auth)
 export function GetCodeCountryList(parameter) {
   return request({
     url: '/mainApi/CodeCountry/GetCodeCountrySelectList',
@@ -2067,7 +2067,7 @@ export function Withdraw(data) {
   return request({
     url: '/opApi/SeaExportTask/Withdraw',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2076,7 +2076,7 @@ export function SeaExportTaskAudit(data) {
   return request({
     url: '/opApi/SeaExportTask/Audit',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2085,7 +2085,7 @@ export function RefreshYGT(data) {
   return request({
     url: '/opApi/SeaExport/RefreshYGT',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2094,7 +2094,7 @@ export function GetClientGoodsList(params) {
   return request({
     url: '/mainApi/ClientCommon/GetClientGoodsList',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -2103,7 +2103,7 @@ export function BatchDelBusinessOrderContact(data) {
   return request({
     url: '/opApi/BusinessOrderContact/BatchDelBusinessOrderContact',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2112,7 +2112,7 @@ export function GetAvailableBookingSlots(data) {
   return request({
     url: '/opApi/BookingSlotService/GetAvailableBookingSlots',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2121,7 +2121,7 @@ export function BringInBookingSlotToOrder(data) {
   return request({
     url: '/opApi/BookingSlotService/BringInBookingSlotToOrder',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2130,7 +2130,7 @@ export function SetTaskStatus(data) {
   return request({
     url: '/opApi/SeaExportTask/SetTaskStatus',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2138,7 +2138,7 @@ export function SetTaskStatus(data) {
 export function AutomaticBooking(id) {
   return request({
     url: '/opApi/SeaExportTask/AutomaticBooking?businessId=' + id,
-    method: 'post'
+    method: 'post',
   })
 }
 
@@ -2147,7 +2147,7 @@ export function GetSeaExportLogList(params) {
   return request({
     url: '/opApi/SeaExport/GetSeaExportLogList',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -2156,7 +2156,7 @@ export function PrintShippingOrderLetterPDF(params) {
   return request({
     url: '/opApi/SeaExport/PrintShippingOrderLetterPDF',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -2165,7 +2165,7 @@ export function GetBookingContractNoList(params) {
   return request({
     url: '/mainApi/ClientCommon/GetBookingContractNoList',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -2174,7 +2174,7 @@ export function BatchDelBusinessCtnPrice(data) {
   return request({
     url: '/opApi/BusinessCtnPrice/BatchDelBusinessCtnPrice',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2183,7 +2183,7 @@ export function GetClientPortInfoByCode(params) {
   return request({
     url: '/mainApi/ClientCommon/GetClientPortInfoByCode',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -2192,7 +2192,7 @@ export function GetShippingBillShortList(params) {
   return request({
     url: '/opApi/ShippingBill/GetShippingBillShortList',
     method: 'post',
-    params
+    params,
   })
 }
 
@@ -2210,7 +2210,7 @@ export function CreateMultipleTask(data) {
   return request({
     url: '/opApi/SeaExportTask/CreateMultipleTask',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2219,7 +2219,7 @@ export function SubmitAudit(data) {
   return request({
     url: '/opApi/SeaExportTask/SubmitAudit',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2228,7 +2228,7 @@ export function GetChangeOrderStatus(params) {
   return request({
     url: '/opApi/SeaExportRefund/GetChangeOrderStatus',
     method: 'get',
-    params
+    params,
   })
 }
 
@@ -2237,7 +2237,7 @@ export function CreateChangeTaskAsync(data) {
   return request({
     url: '/opApi/SeaExportRefund/CreateChangeTaskAsync',
     method: 'post',
-    data
+    data,
   })
 }
 
@@ -2246,6 +2246,6 @@ export function IsLastMarker(params) {
   return request({
     url: '/mainApi/ClientFlowInstance/IsLastMarker',
     method: 'get',
-    params
+    params,
   })
 }
diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.tsx b/src/views/operation/seaexport/detail/components/ladingInfo.tsx
index 267f3ea5..00d69a4f 100644
--- a/src/views/operation/seaexport/detail/components/ladingInfo.tsx
+++ b/src/views/operation/seaexport/detail/components/ladingInfo.tsx
@@ -1,7 +1,12 @@
 import { FormSchema, BasicColumn } from '/@/components/Table'
 import { useOptionsStore } from '/@/store/modules/options'
 import { GetClientListByCode } from '/@/api/common'
-import { GetPackageSelectList, GetShippingBillTemplateSelectList, GetClientPortSelectList, GetVesselSelectList } from '/@/views/operation/seaexport/api/BookingLedger'
+import {
+  GetPackageSelectList,
+  GetShippingBillTemplateSelectList,
+  GetClientPortSelectList,
+  GetVesselSelectList,
+} from '/@/views/operation/seaexport/api/BookingLedger'
 import { useMessage } from '/@/hooks/web/useMessage'
 const { createMessage } = useMessage()
 const optionsStore = useOptionsStore()
@@ -70,9 +75,9 @@ export const formSchema1: FormSchema[] = [
         slice: [30, 35, 40],
         onCut: (v) => {
           formModel.shipperContent = v
-        }
+        },
       }
-    }
+    },
   },
   {
     label: '',
@@ -124,9 +129,9 @@ export const formSchema1: FormSchema[] = [
         slice: [30, 35, 40],
         onCut: (v) => {
           formModel.consigneeContent = v
-        }
+        },
       }
-    }
+    },
   },
   {
     label: '',
@@ -181,9 +186,9 @@ export const formSchema1: FormSchema[] = [
         slice: [30, 35, 40],
         onCut: (v) => {
           formModel.notifyPartyContent = v
-        }
+        },
       }
-    }
+    },
   },
   {
     label: '',
@@ -236,9 +241,9 @@ export const formSchema1: FormSchema[] = [
           if (!e && !obj) {
             formModel.agentId = ''
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'agentContent',
@@ -249,9 +254,9 @@ export const formSchema1: FormSchema[] = [
     // defaultValue: '',
     colProps: { span: 24 },
     componentProps: {
-      rows: 5
-    }
-  }
+      rows: 5,
+    },
+  },
 ]
 
 // 下面的表单2
@@ -265,7 +270,7 @@ export const formSchema2: FormSchema[] = [
     componentProps: {
       allowClear: true,
       valueFormat: 'YYYY-MM-DD',
-    }
+    },
   },
   {
     field: 'eta',
@@ -275,8 +280,8 @@ export const formSchema2: FormSchema[] = [
     defaultValue: null,
     componentProps: {
       allowClear: true,
-      valueFormat: 'YYYY-MM-DD'
-    }
+      valueFormat: 'YYYY-MM-DD',
+    },
   },
   {
     label: '',
@@ -307,9 +312,9 @@ export const formSchema2: FormSchema[] = [
           if (!e && !obj) {
             formModel.vesselId = null
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     label: '船司航次',
@@ -392,10 +397,10 @@ export const formSchema2: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
-          formModel.loadPort = formModel.loadPort.replace(/[\u4e00-\u9fa5]/ig,'')
-        }
+          formModel.loadPort = formModel.loadPort.replace(/[\u4e00-\u9fa5]/gi, '')
+        },
       }
-    }
+    },
   },
   {
     label: '',
@@ -412,10 +417,10 @@ export const formSchema2: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
-          formModel.dischargePort = formModel.dischargePort.replace(/[\u4e00-\u9fa5]/ig,'')
-        }
+          formModel.dischargePort = formModel.dischargePort.replace(/[\u4e00-\u9fa5]/gi, '')
+        },
       }
-    }
+    },
   },
   {
     label: '',
@@ -490,10 +495,10 @@ export const formSchema2: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
-          formModel.deliveryPlace = formModel.deliveryPlace.replace(/[\u4e00-\u9fa5]/ig,'')
-        }
+          formModel.deliveryPlace = formModel.deliveryPlace.replace(/[\u4e00-\u9fa5]/gi, '')
+        },
       }
-    }
+    },
   },
   {
     label: '',
@@ -510,10 +515,10 @@ export const formSchema2: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
-          formModel.receiptPlace = formModel.receiptPlace.replace(/[\u4e00-\u9fa5]/ig,'')
-        }
+          formModel.receiptPlace = formModel.receiptPlace.replace(/[\u4e00-\u9fa5]/gi, '')
+        },
       }
-    }
+    },
   },
   {
     label: '',
@@ -568,17 +573,17 @@ export const formSchema2: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         oninput: () => {
-          formModel.transPort = formModel.transPort.replace(/[\u4e00-\u9fa5]/ig,'')
-        }
+          formModel.transPort = formModel.transPort.replace(/[\u4e00-\u9fa5]/gi, '')
+        },
       }
-    }
+    },
   },
   {
     label: '',
     field: 'transPortId',
     component: 'Input',
     show: false,
-  }
+  },
 ]
 
 // 箱数或件数表单
@@ -609,7 +614,7 @@ export const formSchema3: FormSchema[] = [
           }
           formModel.pkgs = pkgs
           formActionType ? formActionType.submit() : null
-        }
+        },
       }
     },
   },
@@ -618,20 +623,20 @@ export const formSchema3: FormSchema[] = [
     field: 'pkgs',
     component: 'Input',
     colProps: { span: 12 },
-    dynamicDisabled: true
+    dynamicDisabled: true,
   },
   {
     label: '包装',
     field: 'kindPkgsName',
     component: 'Input',
     colProps: { span: 12 },
-    dynamicDisabled: true
+    dynamicDisabled: true,
   },
   {
     label: '',
     field: 'kindPkgs',
     component: 'Input',
-    show: false
+    show: false,
   },
   {
     label: '毛重（公斤）',
@@ -656,7 +661,7 @@ export const formSchema3: FormSchema[] = [
             }
           }
           formModel.kgs = pkgs
-        }
+        },
       }
     },
   },
@@ -664,7 +669,7 @@ export const formSchema3: FormSchema[] = [
     label: '总总量（KGS）',
     field: 'kgs',
     component: 'Input',
-    colProps: { span: 24 }
+    colProps: { span: 24 },
   },
   {
     label: '尺码（立方米）',
@@ -689,7 +694,7 @@ export const formSchema3: FormSchema[] = [
             }
           }
           formModel.cbm = pkgs
-        }
+        },
       }
     },
   },
@@ -697,8 +702,8 @@ export const formSchema3: FormSchema[] = [
     label: '总尺码（CBM）',
     field: 'cbm',
     component: 'Input',
-    colProps: { span: 24 }
-  }
+    colProps: { span: 24 },
+  },
 ]
 
 export const formSchema4: FormSchema[] = [
@@ -727,9 +732,9 @@ export const formSchema4: FormSchema[] = [
         valueField: 'id',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'issueDate',
@@ -745,16 +750,16 @@ export const formSchema4: FormSchema[] = [
         valueFormat: 'YYYY-MM-DD',
         onChange: (e) => {
           formActionType ? formActionType.linkageForm(e) : null
-        }
+        },
       }
-    }
+    },
   },
   {
     label: '签单地点',
     field: 'issuePlace',
     component: 'Input',
     required: false,
-    colProps: { span: 6 }
+    colProps: { span: 6 },
   },
   {
     field: 'noBill',
@@ -795,9 +800,9 @@ export const formSchema4: FormSchema[] = [
           if (e && obj) {
             formActionType ? formActionType.linkageForm(e) : null
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     label: '',
@@ -836,7 +841,7 @@ export const formSchema4: FormSchema[] = [
             formModel.prepareAtId = null
             formModel.prepareAtCode = null
           }
-        }
+        },
       }
     },
   },
@@ -844,13 +849,13 @@ export const formSchema4: FormSchema[] = [
     label: '',
     field: 'payableAtId',
     component: 'Input',
-    show: false
+    show: false,
   },
   {
     label: '',
     field: 'payableAtCode',
     component: 'Input',
-    show: false
+    show: false,
   },
   {
     field: 'payableAt',
@@ -877,9 +882,9 @@ export const formSchema4: FormSchema[] = [
             formModel.payableAtId = null
             formModel.payableAtCode = null
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'service',
@@ -898,9 +903,9 @@ export const formSchema4: FormSchema[] = [
         valueField: 'id',
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        }
+        },
       }
-    }
+    },
   },
   {
     label: '其他备注',
@@ -909,8 +914,8 @@ export const formSchema4: FormSchema[] = [
     required: false,
     colProps: { span: 12 },
     componentProps: {
-      autoSize: { minRows: 3, maxRows: 3 }
-    }
+      autoSize: { minRows: 3, maxRows: 3 },
+    },
   },
   {
     label: '备注',
@@ -919,8 +924,8 @@ export const formSchema4: FormSchema[] = [
     required: false,
     colProps: { span: 12 },
     componentProps: {
-      autoSize: { minRows: 3, maxRows: 3 }
-    }
+      autoSize: { minRows: 3, maxRows: 3 },
+    },
   },
 ]
 
@@ -931,7 +936,7 @@ export const formSchema5: FormSchema[] = [
     field: 'mblno',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
     label: '分提单号',
@@ -939,8 +944,8 @@ export const formSchema5: FormSchema[] = [
     component: 'Input',
     required: true,
     defaultValue: null,
-    colProps: { span: 12 }
-  }
+    colProps: { span: 12 },
+  },
 ]
 
 // 历史提单表格
@@ -1008,8 +1013,8 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: {
       allowClear: true,
       valueFormat: 'YYYY-MM-DD',
-    }
-  }
+    },
+  },
 ]
 
 // 其他信息表单
@@ -1019,85 +1024,85 @@ export const formSchema6: FormSchema[] = [
     field: 'shipperCode',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
-    label: '国家代码',
+    label: '国家地区代码',
     field: 'shipperCountry',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
     label: '电话',
     field: 'shipperTel',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
     label: '邮箱',
     field: 'shipperEmail',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
     label: '企业代码',
     field: 'consigneeCode',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
-    label: '国家代码',
+    label: '国家地区代码',
     field: 'consigneeCountry',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
     label: '电话',
     field: 'consigneeTel',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
     label: '邮箱',
     field: 'consigneeEmail',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
     label: '企业代码',
     field: 'notifyPartyCode',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
-    label: '国家代码',
+    label: '国家地区代码',
     field: 'notifyPartyCountry',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
     label: '电话',
     field: 'notifyPartyTel',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
     label: '邮箱',
     field: 'notifyPartyEmail',
     component: 'Input',
     defaultValue: '',
-    colProps: { span: 12 }
-  }
+    colProps: { span: 12 },
+  },
 ]
 
 // 仓位列表
@@ -1110,7 +1115,7 @@ export const storageColumns: BasicColumn[] = [
   {
     title: '箱型箱量（余量）',
     dataIndex: 'ctnStat',
-    width: 120
+    width: 120,
   },
   {
     title: '合约号',
@@ -1155,13 +1160,13 @@ export const storageColumns: BasicColumn[] = [
   {
     title: '交货地',
     dataIndex: 'placeDelivery',
-    width: 150
+    width: 150,
   },
   {
     title: '订舱编号',
     dataIndex: 'slotNo',
-    width: 150
-  }
+    width: 150,
+  },
 ]
 
 // 仓位表格过滤表单
@@ -1170,30 +1175,30 @@ export const storageSearchFormSchema: FormSchema[] = [
     field: 'portLoad',
     label: '装货地',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'placeDelivery',
     label: '交货地',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'vessel',
     label: '船名',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'voyno',
     label: '航次',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'slotNo',
     label: '编号',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
-]
\ No newline at end of file
+]
diff --git a/src/views/operation/seaexport/detail/modules/preOrder.tsx b/src/views/operation/seaexport/detail/modules/preOrder.tsx
index b08193f6..2ddeab30 100644
--- a/src/views/operation/seaexport/detail/modules/preOrder.tsx
+++ b/src/views/operation/seaexport/detail/modules/preOrder.tsx
@@ -18,12 +18,12 @@ export const baseSchema: FormSchema[] = [
     field: 'id',
     show: false,
     defaultValue: '0',
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'isPart',
     show: false,
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'mblno',
@@ -36,7 +36,7 @@ export const baseSchema: FormSchema[] = [
     show: ({ values }) => {
       return !values.isPart
     },
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'hblno',
@@ -49,23 +49,23 @@ export const baseSchema: FormSchema[] = [
     componentProps: ({ formActionType }) => {
       return {
         onChange: (e, obj) => {
-          if(e){
+          if (e) {
             formActionType ? formActionType.linkageForm(e.target.value) : null
           }
-        }
+        },
       }
     },
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'vesselId',
     show: false,
-    component: 'Input'
+    component: 'Input',
   },
   {
     field: 'innerVoyno',
     show: false,
-    component: 'Input'
+    component: 'Input',
   },
   {
     label: '船名',
@@ -106,7 +106,7 @@ export const baseSchema: FormSchema[] = [
         labelField: 'voyNo',
         valueField: 'voyNo',
         resultField: 'data',
-        immediate: false
+        immediate: false,
       }
     },
   },
@@ -134,14 +134,14 @@ export const baseSchema: FormSchema[] = [
           if (!e && !obj) {
             formModel.shipAgencyId = ''
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'carrierId',
     show: false,
-    component: 'Input'
+    component: 'Input',
   },
   {
     label: '船公司',
@@ -165,9 +165,9 @@ export const baseSchema: FormSchema[] = [
           if (!e && !obj) {
             formModel.carrierId = ''
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'etd',
@@ -178,7 +178,7 @@ export const baseSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: {
       allowClear: true,
-      valueFormat: 'YYYY-MM-DD'
+      valueFormat: 'YYYY-MM-DD',
     },
   },
   {
@@ -205,15 +205,15 @@ export const baseSchema: FormSchema[] = [
             formModel.loadPortId = null
             formModel.loadPort = null
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'loadPort',
     label: '装货港',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'loadPortId',
@@ -245,15 +245,15 @@ export const baseSchema: FormSchema[] = [
             formModel.dischargePortId = null
             formModel.dischargePort = null
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'dischargePort',
     label: '卸货港',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'dischargePortId',
@@ -286,15 +286,15 @@ export const baseSchema: FormSchema[] = [
             formModel.receiptPladeliveryPlacece = null
             formModel.deliveryPlaceId = null
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'deliveryPlace',
     label: '收货地',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'deliveryPlaceId',
@@ -306,7 +306,7 @@ export const baseSchema: FormSchema[] = [
     field: 'remark',
     label: '备注',
     component: 'Input',
-    colProps: { span: 24 }
+    colProps: { span: 24 },
   },
 ]
 // 收发通
@@ -353,9 +353,9 @@ export const mailingSchema: FormSchema[] = [
             formModel.shipperContent = null
             formModel.shipper = ''
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     label: '',
@@ -398,15 +398,15 @@ export const mailingSchema: FormSchema[] = [
             formModel.consignee = null
             formModel.consigneeContent = ''
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     label: '',
     field: 'notifyPartyId',
     component: 'Input',
-    show: false
+    show: false,
   },
   {
     label: '通知人',
@@ -443,49 +443,49 @@ export const mailingSchema: FormSchema[] = [
             formModel.notifyPartyContent = null
             formModel.notifyParty = ''
           }
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'shipperName',
     label: '名称',
     component: 'Input',
-    colProps: { span: 8 }
+    colProps: { span: 8 },
   },
   {
     field: 'consigneeName',
     label: '名称',
     component: 'Input',
-    colProps: { span: 8 }
+    colProps: { span: 8 },
   },
   {
     field: 'notifyPartyName',
     label: '名称',
     component: 'Input',
-    colProps: { span: 8 }
+    colProps: { span: 8 },
   },
   {
     field: 'shipperAddress',
     label: '地址',
     component: 'Input',
-    colProps: { span: 8 }
+    colProps: { span: 8 },
   },
   {
     field: 'consigneeAddress',
     label: '地址',
     component: 'Input',
-    colProps: { span: 8 }
+    colProps: { span: 8 },
   },
   {
     field: 'notifyPartyAddress',
     label: '地址',
     component: 'Input',
-    colProps: { span: 8 }
+    colProps: { span: 8 },
   },
   {
     field: 'shipperCountry',
-    label: '国家',
+    label: '国家地区',
     component: 'Select',
     componentProps: ({ formModel }) => {
       return {
@@ -497,7 +497,7 @@ export const mailingSchema: FormSchema[] = [
           value: 'countryCode',
         },
         filterOption: (input: string, option: any) => {
-          return option.showName.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          return option.showName.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: (e, obj) => {
           if (e && obj) {
@@ -509,22 +509,22 @@ export const mailingSchema: FormSchema[] = [
         },
       }
     },
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'shipperCountryName',
     component: 'Input',
-    show: false
+    show: false,
   },
   {
     field: 'shipperCountryTel',
     label: '电话',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'consigneeCountry',
-    label: '国家',
+    label: '国家地区',
     component: 'Select',
     componentProps: ({ formModel }) => {
       return {
@@ -549,22 +549,22 @@ export const mailingSchema: FormSchema[] = [
         },
       }
     },
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'consigneeCountryName',
     component: 'Input',
-    show: false
+    show: false,
   },
   {
     field: 'consigneeCountryTel',
     label: '电话',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'notifyPartyCountry',
-    label: '国家',
+    label: '国家地区',
     component: 'Select',
     componentProps: ({ formModel }) => {
       return {
@@ -588,18 +588,18 @@ export const mailingSchema: FormSchema[] = [
         },
       }
     },
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
   {
     field: 'notifyPartyCountryName',
     component: 'Input',
-    show: false
+    show: false,
   },
   {
     field: 'notifyPartyCountryTel',
     label: '电话',
     component: 'Input',
-    colProps: { span: 4 }
+    colProps: { span: 4 },
   },
 ]
 // 场站
@@ -631,20 +631,21 @@ export const yardSchema: FormSchema[] = [
           if (!e && !obj) {
             formModel.yardId = ''
           }
-        }
+        },
       }
-    }
+    },
   },
 ]
 
-
 function getCountryList() {
-  const arr = localStorage.getItem('ds-country') ? JSON.parse(localStorage.getItem('ds-country')) : []
+  const arr = localStorage.getItem('ds-country')
+    ? JSON.parse(localStorage.getItem('ds-country'))
+    : []
   if (arr.length > 0) {
     countryList = arr
   } else {
-    GetClientCountrySelectList().then(res => {
-      res.data.forEach(item=>{
+    GetClientCountrySelectList().then((res) => {
+      res.data.forEach((item) => {
         item.showName = item.countryName + '/' + item.countryCode
       })
       countryList = res.data
diff --git a/src/views/operation/seaexport/detail/modules/preOrder.vue b/src/views/operation/seaexport/detail/modules/preOrder.vue
index 69f11655..e9a1f98f 100644
--- a/src/views/operation/seaexport/detail/modules/preOrder.vue
+++ b/src/views/operation/seaexport/detail/modules/preOrder.vue
@@ -1,14 +1,17 @@
 <template>
-  <a-modal class="ds-pre-order" width="90vw" :maskClosable="false" v-model:visible="openPreOrderShow" @cancel="close">
-    <template #footer>
-    </template>
-    <div class="pre-order" style="padding-top: 30px;">
+  <a-modal
+    class="ds-pre-order"
+    width="90vw"
+    :maskClosable="false"
+    v-model:visible="openPreOrderShow"
+    @cancel="close"
+  >
+    <template #footer> </template>
+    <div class="pre-order" style="padding-top: 30px">
       <div class="flex">
         <div>
-          <h4>
-            预配舱单
-          </h4>
-          <div class="ds-card" style="width: 320px;">
+          <h4> 预配舱单 </h4>
+          <div class="ds-card" style="width: 320px">
             <div class="left-title">
               <a-button v-repeat type="link" @click="addOrder">
                 <span class="iconfont icon-new_document"></span>
@@ -22,13 +25,23 @@
                 <span class="iconfont icon-baocun"></span>
                 保存
               </a-button>
-              <a-popconfirm title="是否删除当前选中预配舱单？" ok-text="是" cancel-text="否" @confirm="removeOrder()">
+              <a-popconfirm
+                title="是否删除当前选中预配舱单？"
+                ok-text="是"
+                cancel-text="否"
+                @confirm="removeOrder()"
+              >
                 <a-button type="link" class="pt0">
                   <span class="iconfont icon-shanchu21"></span>
                   删除
                 </a-button>
               </a-popconfirm>
-              <a-popconfirm title="会覆盖当前数据，确认刷新吗？" ok-text="是" cancel-text="否" @confirm="handleRef">
+              <a-popconfirm
+                title="会覆盖当前数据，确认刷新吗？"
+                ok-text="是"
+                cancel-text="否"
+                @confirm="handleRef"
+              >
                 <a-button type="link" class="pt0">
                   <span class="iconfont icon-shuaxin"></span>
                   刷新
@@ -41,8 +54,11 @@
                 <template v-for="(sedDetail, sindex) in orderList" :key="sindex + 'f'">
                   <div class="order-box" v-if="!sedDetail.isPart">
                     <a-checkbox class="check-btn mb10" v-model:checked="sedDetail.checked" />
-                    <span class="order-label" :class="{ active: sindex == editIndex }"
-                      @click.stop="changeOrder(sindex)">
+                    <span
+                      class="order-label"
+                      :class="{ active: sindex == editIndex }"
+                      @click.stop="changeOrder(sindex)"
+                    >
                       <template v-if="!sedDetail.isPart">
                         {{ sedDetail.mblno || '请填写主提单号' }}
                       </template>
@@ -55,8 +71,11 @@
                 <template v-for="(sedDetail, sindex) in orderList" :key="sindex">
                   <div class="order-box" v-if="sedDetail.isPart">
                     <a-checkbox class="check-btn mb10" v-model:checked="sedDetail.checked" />
-                    <span class="order-label" :class="{ active: sindex == editIndex }"
-                      @click.stop="changeOrder(sindex)">
+                    <span
+                      class="order-label"
+                      :class="{ active: sindex == editIndex }"
+                      @click.stop="changeOrder(sindex)"
+                    >
                       <template v-if="sedDetail.isPart">
                         {{ sedDetail.hblno || '请填写分单号' }}
                       </template>
@@ -74,30 +93,41 @@
             <BasicForm @linkageForm="linkageForm" @register="baseForm"></BasicForm>
           </div>
           <div class="box baseinfo">
-            <div class="title ">收发通</div>
+            <div class="title">收发通</div>
             <BasicForm @register="mailingForm">
               <!-- 发货人 -->
               <template #shipper="{ model }">
-                <span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn"
-                  @click="save(model, 'shipper')"></span>
+                <span
+                  title="保存到收发通模版(save)"
+                  class="iconfont icon-baocun save-btn"
+                  @click="save(model, 'shipper')"
+                ></span>
               </template>
               <!-- 收货人 -->
               <template #consignee="{ model }">
-                <span title="复制通知人" class="iconfont icon-fuzhi3 copy-btn" style="font-size: 13px;"
-                  @click="copyNotify"></span>
+                <span
+                  title="复制通知人"
+                  class="iconfont icon-fuzhi3 copy-btn"
+                  style="font-size: 13px"
+                  @click="copyNotify"
+                ></span>
                 <!-- <span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn"
                   @click="save(model, 'consignee')"></span> -->
               </template>
               <!-- 通知人 -->
               <template #notifyParty="{ model }">
-                <span title="复制收货人" class="iconfont icon-fuzhi3 copy-btn" style="font-size: 13px;"
-                  @click="copyConsignee"></span>
+                <span
+                  title="复制收货人"
+                  class="iconfont icon-fuzhi3 copy-btn"
+                  style="font-size: 13px"
+                  @click="copyConsignee"
+                ></span>
                 <!-- <span title="保存到收发通模版(save)" class="iconfont icon-baocun save-btn"
                   @click="save(model, 'notifyParty')"></span> -->
               </template>
             </BasicForm>
           </div>
-          <div style="padding-left: 14px;">
+          <div style="padding-left: 14px">
             <cargoInfo :isPreOrder="true" :details="book" ref="RefcargoInfo"></cargoInfo>
           </div>
           <div class="box">
@@ -118,38 +148,64 @@
                 </a-button>
               </div>
               <div class="yard">
-                <BasicForm @register="yardForm">
-
-                </BasicForm>
+                <BasicForm @register="yardForm"> </BasicForm>
               </div>
             </div>
-            <hot-table style="margin-left: 14px;" ref="hotpreOrder" :data="ctnList" :settings="settings">
+            <hot-table
+              style="margin-left: 14px"
+              ref="hotpreOrder"
+              :data="ctnList"
+              :settings="settings"
+            >
             </hot-table>
             <div class="table-calc">
               合计：
-              <span class="table-calc-box">件数: <span>{{ totalPkgs }}</span></span>
-              <span class="table-calc-box">重量: <span>{{ totalKgs }}</span>KGS</span>
-              <span class="table-calc-box">尺码: <span>{{ totalCbm }}</span>CBM</span>
+              <span class="table-calc-box"
+                >件数: <span>{{ totalPkgs }}</span></span
+              >
+              <span class="table-calc-box"
+                >重量: <span>{{ totalKgs }}</span
+                >KGS</span
+              >
+              <span class="table-calc-box"
+                >尺码: <span>{{ totalCbm }}</span
+                >CBM</span
+              >
             </div>
           </div>
-
-
         </div>
       </div>
-      <a-modal width="50vw" :maskClosable="false" v-model:visible="showSendModel" title="发送预配舱单" @cancel="sendClose">
+      <a-modal
+        width="50vw"
+        :maskClosable="false"
+        v-model:visible="showSendModel"
+        title="发送预配舱单"
+        @cancel="sendClose"
+      >
         <div class="trace-box">
           <a-form>
             <a-row :gutter="16">
               <a-col :span="24" class="book-model-box">
-                <a-form-item label="操作类型" :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback>
+                <a-form-item
+                  label="操作类型"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+                  has-feedback
+                >
                   <a-radio-group :options="sendOption" v-model:value="sendType" />
                 </a-form-item>
 
-                <a-form-item label="备注" :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
-                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }" has-feedback>
-                  <a-textarea v-model:value="sendRemarkVal" placeholder="请输入备注"
-                    :auto-size="{ minRows: 3, maxRows: 5 }" />
+                <a-form-item
+                  label="备注"
+                  :labelCol="{ xs: { span: 24 }, sm: { span: 6 } }"
+                  :wrapperCol="{ xs: { span: 24 }, sm: { span: 15 } }"
+                  has-feedback
+                >
+                  <a-textarea
+                    v-model:value="sendRemarkVal"
+                    placeholder="请输入备注"
+                    :auto-size="{ minRows: 3, maxRows: 5 }"
+                  />
                 </a-form-item>
               </a-col>
             </a-row>
@@ -164,897 +220,927 @@
   </a-modal>
 </template>
 <script lang="ts" setup>
-import { ref, reactive, onMounted, nextTick, watch } from 'vue'
-import {
-  GetPackageSelectList,
-  GetShippingBillList,
-  SaveShippingBillAsync,
-  SendShippingBill,
-  BatchDelShippingBill,
-  GetCtnSelectList,
-  GetShippingBillCtnList,
-  GetClientPortInfoByCode,
-  GetShippingBillShortList
-} from '/@/views/operation/seaexport/api/BookingLedger'
-import { preOrderD } from '/@/views/operation/seaexport/detail/modules/preOrderColumns'
-import { useMessage } from '/@/hooks/web/useMessage'
-import cargoInfo from './cargoInfo.vue'
-const { notification, createMessage } = useMessage()
-import { useRoute } from 'vue-router'
-const route = useRoute()
-import { HotTable } from '@handsontable/vue3'
-import { registerAllModules } from 'handsontable/registry'
-import { BasicForm, useForm } from '/@/components/Form/index'
-import { mailingSchema, baseSchema, yardSchema } from './preOrder'
-import { resolve } from 'path'
-registerAllModules()
-const props = defineProps({
-  details: { type: Object, default: {} },
-})
-const book = {
-  marks: '11'
-}
-const openPreOrderShow = ref(false)
-const id = ref(route.query.id)
-// -----------------------弹窗相关------------------------
-function init() {
-  // 打开窗口调接口 如果接口有数据就回显 没有数据用主单的信息
-  openPreOrderShow.value = true
-  orderList.valeue = []
-  // resetFieldsBase()
-  // resetFieldsMail()
-  if (id.value) {
-    FngetPageESeaeEdi()
-  } else {
-  }
-  nextTick(() => {
-    initTable()
+  import { ref, reactive, onMounted, nextTick, watch } from 'vue'
+  import {
+    GetPackageSelectList,
+    GetShippingBillList,
+    SaveShippingBillAsync,
+    SendShippingBill,
+    BatchDelShippingBill,
+    GetCtnSelectList,
+    GetShippingBillCtnList,
+    GetClientPortInfoByCode,
+    GetShippingBillShortList,
+  } from '/@/views/operation/seaexport/api/BookingLedger'
+  import { preOrderD } from '/@/views/operation/seaexport/detail/modules/preOrderColumns'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  import cargoInfo from './cargoInfo.vue'
+  const { notification, createMessage } = useMessage()
+  import { useRoute } from 'vue-router'
+  const route = useRoute()
+  import { HotTable } from '@handsontable/vue3'
+  import { registerAllModules } from 'handsontable/registry'
+  import { BasicForm, useForm } from '/@/components/Form/index'
+  import { mailingSchema, baseSchema, yardSchema } from './preOrder'
+  import { resolve } from 'path'
+  registerAllModules()
+  const props = defineProps({
+    details: { type: Object, default: {} },
   })
-}
-
-// 基础信息
-const [
-  baseForm,
-  { getFieldsValue: getFieldsValueBase, updateSchemaBase, validateFieldsBase, resetFields: resetFieldsBase, setFieldsValue: setFieldsValueBase, validateBase },
-] = useForm({
-  labelWidth: 80,
-  schemas: baseSchema,
-  showActionButtonGroup: false,
-  size: 'small',
-})
-
-// 收发通
-const [
-  mailingForm,
-  { getFieldsValue: getFieldsValueMail, updateSchemaMail, validateFieldsMail, resetFields: resetFieldsMail, setFieldsValue: setFieldsValueMail, validateMail },
-] = useForm({
-  labelWidth: 80,
-  schemas: mailingSchema,
-  showActionButtonGroup: false,
-  size: 'small',
-})
-
-// 场站
-const [
-  yardForm,
-  { getFieldsValue: getFieldsValueYard, resetFields: resetFieldsYard, setFieldsValue: setFieldsValueYard },
-] = useForm({
-  labelWidth: 80,
-  wrapperCol: { span: 24 },
-  schemas: yardSchema,
-  showActionButtonGroup: false,
-  size: 'small',
-})
-const ctnList = ref([]) as any
-watch(() => ctnList.value, (val) => {
-  let totalPkgsStr = 0
-  let totalKgsStr = 0
-  let totalCbmStr = 0
-  val.forEach(item => {
-    if (item.pkgs) {
-      totalPkgsStr += parseInt(item.pkgs)
-    }
-    if (item.kgs) {
-      totalKgsStr += Number(Number(item.kgs).toFixed(2))
-    }
-    if (item.cbm) {
-      totalCbmStr += Number(Number(item.cbm).toFixed(2))
+  const book = {
+    marks: '11',
+  }
+  const openPreOrderShow = ref(false)
+  const id = ref(route.query.id)
+  // -----------------------弹窗相关------------------------
+  function init() {
+    // 打开窗口调接口 如果接口有数据就回显 没有数据用主单的信息
+    openPreOrderShow.value = true
+    orderList.valeue = []
+    // resetFieldsBase()
+    // resetFieldsMail()
+    if (id.value) {
+      FngetPageESeaeEdi()
+    } else {
     }
-  })
-  totalPkgs.value = totalPkgsStr
-  totalKgs.value = totalKgsStr
-  totalCbm.value = totalCbmStr
-}, { deep: true })
+    nextTick(() => {
+      initTable()
+    })
+  }
 
+  // 基础信息
+  const [
+    baseForm,
+    {
+      getFieldsValue: getFieldsValueBase,
+      updateSchemaBase,
+      validateFieldsBase,
+      resetFields: resetFieldsBase,
+      setFieldsValue: setFieldsValueBase,
+      validateBase,
+    },
+  ] = useForm({
+    labelWidth: 80,
+    schemas: baseSchema,
+    showActionButtonGroup: false,
+    size: 'small',
+  })
 
+  // 收发通
+  const [
+    mailingForm,
+    {
+      getFieldsValue: getFieldsValueMail,
+      updateSchemaMail,
+      validateFieldsMail,
+      resetFields: resetFieldsMail,
+      setFieldsValue: setFieldsValueMail,
+      validateMail,
+    },
+  ] = useForm({
+    labelWidth: 80,
+    schemas: mailingSchema,
+    showActionButtonGroup: false,
+    size: 'small',
+  })
 
-onMounted(() => {
-})
-function initTable() {
-  const hot = hotpreOrder.value.hotInstance
-  hot.addHook('beforeKeyDown', function (event) {
-    if (event.key === 'ArrowDown') {
-      if (hot.getSelected()[0][0] == ctnList.value.length - 1 && !hot.getActiveEditor()?._opened) {
-        ctnList.value.push({})
-        nextTick(() => {
-          hot.selectCell(ctnList.value.length - 1, 3)
-        })
-        return false
-      }
-    }
+  // 场站
+  const [
+    yardForm,
+    {
+      getFieldsValue: getFieldsValueYard,
+      resetFields: resetFieldsYard,
+      setFieldsValue: setFieldsValueYard,
+    },
+  ] = useForm({
+    labelWidth: 80,
+    wrapperCol: { span: 24 },
+    schemas: yardSchema,
+    showActionButtonGroup: false,
+    size: 'small',
   })
-}
+  const ctnList = ref([]) as any
+  watch(
+    () => ctnList.value,
+    (val) => {
+      let totalPkgsStr = 0
+      let totalKgsStr = 0
+      let totalCbmStr = 0
+      val.forEach((item) => {
+        if (item.pkgs) {
+          totalPkgsStr += parseInt(item.pkgs)
+        }
+        if (item.kgs) {
+          totalKgsStr += Number(Number(item.kgs).toFixed(2))
+        }
+        if (item.cbm) {
+          totalCbmStr += Number(Number(item.cbm).toFixed(2))
+        }
+      })
+      totalPkgs.value = totalPkgsStr
+      totalKgs.value = totalKgsStr
+      totalCbm.value = totalCbmStr
+    },
+    { deep: true },
+  )
 
-// 添加行
-function addboxLine() {
-  ctnList.value.push({})
-}
-// 保存收发通模版
-const save = (model, key) => {
+  onMounted(() => {})
+  function initTable() {
+    const hot = hotpreOrder.value.hotInstance
+    hot.addHook('beforeKeyDown', function (event) {
+      if (event.key === 'ArrowDown') {
+        if (
+          hot.getSelected()[0][0] == ctnList.value.length - 1 &&
+          !hot.getActiveEditor()?._opened
+        ) {
+          ctnList.value.push({})
+          nextTick(() => {
+            hot.selectCell(ctnList.value.length - 1, 3)
+          })
+          return false
+        }
+      }
+    })
+  }
 
-}
-function copyNotify() {
-  const data = getFieldsValueMail()
-  setFieldsValueMail({
-    consigneeName: data.notifyPartyName,
-    consigneeAddress: data.notifyPartyAddress,
-    consigneeCountry: data.notifyPartyCountry,
-    consigneeCountryName: data.notifyPartyCountryName,
-    consigneeCountryTel: data.notifyPartyCountryTel,
-  })
-}
-function copyConsignee() {
-  const data = getFieldsValueMail()
-  setFieldsValueMail({
-    notifyPartyName: data.consigneeName,
-    notifyPartyAddress: data.consigneeAddress,
-    notifyPartyCountry: data.consigneeCountry,
-    notifyPartyCountryName: data.consigneeCountryName,
-    notifyPartyCountryTel: data.consigneeCountryTel,
-  })
-}
-const linkageForm = async (val) => {
-  orderList.value[editIndex.value].hblno = val
-}
+  // 添加行
+  function addboxLine() {
+    ctnList.value.push({})
+  }
+  // 保存收发通模版
+  const save = (model, key) => {}
+  function copyNotify() {
+    const data = getFieldsValueMail()
+    setFieldsValueMail({
+      consigneeName: data.notifyPartyName,
+      consigneeAddress: data.notifyPartyAddress,
+      consigneeCountry: data.notifyPartyCountry,
+      consigneeCountryName: data.notifyPartyCountryName,
+      consigneeCountryTel: data.notifyPartyCountryTel,
+    })
+  }
+  function copyConsignee() {
+    const data = getFieldsValueMail()
+    setFieldsValueMail({
+      notifyPartyName: data.consigneeName,
+      notifyPartyAddress: data.consigneeAddress,
+      notifyPartyCountry: data.consigneeCountry,
+      notifyPartyCountryName: data.consigneeCountryName,
+      notifyPartyCountryTel: data.consigneeCountryTel,
+    })
+  }
+  const linkageForm = async (val) => {
+    orderList.value[editIndex.value].hblno = val
+  }
 
-function close() {
-  openPreOrderShow.value = false
-}
-// -----------------------左侧------------------------
-const orderList = ref<any>([])
-const formState = ref<any>({})
-const editIndex = ref(0)
-const floading = ref(false)
-const RefcargoInfo = ref(null) as any
-const sendOption = ref([
-  { label: '新增', value: '0' },
-  { label: '修改', value: '1' },
-  { label: '删除', value: '2' },
-])
-// 获取列表数据
-function FngetPageESeaeEdi() {
-  floading.value = true
-  let ApiData = {
-    id: id.value
+  function close() {
+    openPreOrderShow.value = false
   }
-  GetShippingBillShortList(ApiData)
-    .then((res) => {
-      floading.value = false
-      if (res.succeeded) {
-        if (!res.data) {
-          res.data = []
-        }
-        // 有数据直接回显
-        if (res.data.length > 0) {
-          res.data.map((item, index) => {
-            item.checked = false
-            Object.assign(item, item.detail);
-            item.ctnInfo = item.ctnList
-            delete item.detail
-            delete item.ctnList
-            if (item.isPart === false) {
-              setFieldsValueBase(item)
-              if (!item.cargoId) {
-                item.cargoId = 'S'
+  // -----------------------左侧------------------------
+  const orderList = ref<any>([])
+  const formState = ref<any>({})
+  const editIndex = ref(0)
+  const floading = ref(false)
+  const RefcargoInfo = ref(null) as any
+  const sendOption = ref([
+    { label: '新增', value: '0' },
+    { label: '修改', value: '1' },
+    { label: '删除', value: '2' },
+  ])
+  // 获取列表数据
+  function FngetPageESeaeEdi() {
+    floading.value = true
+    let ApiData = {
+      id: id.value,
+    }
+    GetShippingBillShortList(ApiData)
+      .then((res) => {
+        floading.value = false
+        if (res.succeeded) {
+          if (!res.data) {
+            res.data = []
+          }
+          // 有数据直接回显
+          if (res.data.length > 0) {
+            res.data.map((item, index) => {
+              item.checked = false
+              Object.assign(item, item.detail)
+              item.ctnInfo = item.ctnList
+              delete item.detail
+              delete item.ctnList
+              if (item.isPart === false) {
+                setFieldsValueBase(item)
+                if (!item.cargoId) {
+                  item.cargoId = 'S'
+                }
+                RefcargoInfo.value.preOrderInit(item)
+                setFieldsValueMail(item)
+                setFieldsValueYard(item)
+                ctnList.value = item.ctnInfo ? item.ctnInfo : []
+                hotpreOrder.value.hotInstance.loadData(ctnList.value)
+                editIndex.value = index
               }
-              RefcargoInfo.value.preOrderInit(item)
-              setFieldsValueMail(item)
-              setFieldsValueYard(item)
-              ctnList.value = item.ctnInfo ? item.ctnInfo : []
-              hotpreOrder.value.hotInstance.loadData(ctnList.value)
-              editIndex.value = index
+            })
+            orderList.value = res.data
+          } else {
+            //处理接口没数据的情况
+            const propsDetail = JSON.parse(JSON.stringify(props.details))
+            propsDetail.id = '0'
+            propsDetail.isPart = false
+            //处理基础信息
+            setFieldsValueBase(propsDetail)
+            //拆分主单的收发通 发货人国家地区默认是中国 通知人和收货人为卸货港的国家地区
+            const arr = propsDetail.shipperContent ? propsDetail.shipperContent.split('\n') : []
+            const arr1 = propsDetail.consigneeContent
+              ? propsDetail.consigneeContent.split('\n')
+              : []
+            const arr2 = propsDetail.notifyPartyContent
+              ? propsDetail.notifyPartyContent.split('\n')
+              : []
+            setFieldsValueMail({
+              shipperName: arr[0],
+              shipperAddress: arr[1],
+              consigneeName: arr1[0],
+              consigneeAddress: arr1[1],
+              notifyPartyName: arr2[0],
+              notifyPartyAddress: arr2[1],
+              shipperCountryName: '中国(CHINA)',
+              shipperCountry: 'CN',
+            })
+            GetClientPortInfoByCode({ queryKey: propsDetail.dischargePortCode }).then((res) => {
+              const arr = localStorage.getItem('ds-country')
+                ? JSON.parse(localStorage.getItem('ds-country'))
+                : []
+              if (res.data) {
+                arr.forEach((item) => {
+                  if (item.id == res.data.countryId) {
+                    setFieldsValueMail({
+                      consigneeCountryName: item.countryName,
+                      consigneeCountry: item.countryCode,
+                      notifyPartyCountryName: item.countryName,
+                      notifyPartyCountry: item.countryCode,
+                    })
+                  }
+                })
+              }
+            })
+            //处理货物信息
+            if (!propsDetail.cargoId) {
+              propsDetail.cargoId = 'S'
             }
-          })
-          orderList.value = res.data
+            RefcargoInfo.value.preOrderInit(propsDetail)
+            // 处理场站
+            setFieldsValueYard({
+              yardId: propsDetail.yardId,
+              yard: propsDetail.yard,
+            })
+            // 处理箱信息
+            ctnList.value = propsDetail.ctnInfo ? propsDetail.ctnInfo : []
+            ctnList.value.forEach((item) => {
+              delete item.id
+            })
+            hotpreOrder.value.hotInstance.loadData(ctnList.value)
+            const data = JSON.parse(JSON.stringify(propsDetail))
+            data.mblno = propsDetail.mblno
+            data.isPart = false
+            data.checked = false
+            orderList.value[0] = data
+          }
+        }
+      })
+      .catch((err) => {
+        floading.value = false
+      })
+  }
+  // 保存当前信息
+  function saveOrderInfo() {
+    return new Promise((resolve) => {
+      ctnList.value.forEach((item) => {
+        item.pid = getFieldsValueBase().id ? getFieldsValueBase().id : '0'
+      })
+      const data = {
+        ...getFieldsValueMail(),
+        ...getFieldsValueBase(),
+        ...getFieldsValueYard(),
+        ...RefcargoInfo.value.getFieldsValue(),
+        ctnInfo: ctnList.value,
+        businessId: id.value ? id.value : '',
+      }
+      orderList.value[editIndex.value] = data
+      resolve(true)
+    })
+  }
+  // 添加分单 保存当前单
+  function addOrder() {
+    saveOrderInfo().then((res) => {
+      // 分单内容要复制主单的
+      let mblData = {} as any
+      let hblList = [] as any
+      orderList.value.forEach((item) => {
+        if (!item.isPart) {
+          mblData = JSON.parse(JSON.stringify(item))
         } else {
-          //处理接口没数据的情况
-          const propsDetail = JSON.parse(JSON.stringify(props.details))
-          propsDetail.id = '0'
-          propsDetail.isPart = false
-          //处理基础信息
-          setFieldsValueBase(propsDetail)
-          //拆分主单的收发通 发货人国家默认是中国 通知人和收货人为卸货港的国家
-          const arr = propsDetail.shipperContent ? propsDetail.shipperContent.split('\n') : []
-          const arr1 = propsDetail.consigneeContent ? propsDetail.consigneeContent.split('\n') : []
-          const arr2 = propsDetail.notifyPartyContent ? propsDetail.notifyPartyContent.split('\n') : []
-          setFieldsValueMail({
-            shipperName: arr[0],
-            shipperAddress: arr[1],
-            consigneeName: arr1[0],
-            consigneeAddress: arr1[1],
-            notifyPartyName: arr2[0],
-            notifyPartyAddress: arr2[1],
-            shipperCountryName: '中国(CHINA)',
-            shipperCountry: 'CN'
-          })
-          GetClientPortInfoByCode({ queryKey: propsDetail.dischargePortCode }).then(res => {
-            const arr = localStorage.getItem('ds-country') ? JSON.parse(localStorage.getItem('ds-country')) : []
-            if (res.data) {
-              arr.forEach(item => {
-                if (item.id == res.data.countryId) {
-                  setFieldsValueMail({
-                    consigneeCountryName: item.countryName,
-                    consigneeCountry: item.countryCode,
-                    notifyPartyCountryName: item.countryName,
-                    notifyPartyCountry: item.countryCode
-                  })
-                }
-              })
+          hblList.push(JSON.parse(JSON.stringify(item)))
+        }
+      })
+      mblData.id = '0'
+      mblData.hblno = ''
+      if (mblData.ctnInfo) {
+        mblData.ctnInfo.forEach((item) => {
+          delete item.id
+        })
+      }
+      console.log(mblData, hblList)
+      calcCtnInfo(mblData, hblList)
+    })
+  }
+  // 添加分单计算箱信息 需要用主单减掉分单的信息
+  function calcCtnInfo(mblData, hblList) {
+    mblData.ctnInfo.forEach((item) => {
+      if (item.kgs) {
+        let totalKgs = 0
+        hblList.forEach((ite) => {
+          ite.ctnInfo.forEach((it) => {
+            console.log(it.cntrNo, item.cntrNo)
+            if (it.cntrNo === item.cntrNo) {
+              console.log(it.kgs, 12312331)
+              totalKgs += Number(it.kgs)
             }
           })
-          //处理货物信息 
-          if (!propsDetail.cargoId) {
-            propsDetail.cargoId = 'S'
-          }
-          RefcargoInfo.value.preOrderInit(propsDetail)
-          // 处理场站
-          setFieldsValueYard({
-            yardId: propsDetail.yardId,
-            yard: propsDetail.yard
+        })
+        item.kgs = (Number(item.kgs) - totalKgs).toFixed(2)
+      }
+      if (item.cbm) {
+        let totalCbm = 0
+        hblList.forEach((ite) => {
+          ite.ctnInfo.forEach((it) => {
+            if (it.cntrNo === item.cntrNo) {
+              totalCbm += Number(it.cbm)
+            }
           })
-          // 处理箱信息
-          ctnList.value = propsDetail.ctnInfo ? propsDetail.ctnInfo : []
-          ctnList.value.forEach(item => {
-            delete item.id
+        })
+        item.cbm = (Number(item.cbm) - totalCbm).toFixed(2)
+      }
+      if (item.pkgs) {
+        let totalPkgs = 0
+        hblList.forEach((ite) => {
+          ite.ctnInfo.forEach((it) => {
+            if (it.cntrNo === item.cntrNo) {
+              totalPkgs += Number(it.pkgs)
+            }
           })
-          hotpreOrder.value.hotInstance.loadData(ctnList.value)
-          const data = JSON.parse(JSON.stringify(propsDetail))
-          data.mblno = propsDetail.mblno
-          data.isPart = false
-          data.checked = false
-          orderList.value[0] = data
-        }
+        })
+        item.pkgs = Number(item.pkgs) - totalPkgs
       }
     })
-    .catch((err) => {
-      floading.value = false
-    })
-}
-// 保存当前信息
-function saveOrderInfo() {
-  return new Promise((resolve) => {
-    ctnList.value.forEach(item => {
-      item.pid = getFieldsValueBase().id ? getFieldsValueBase().id : '0'
+    // data.ctnInfo.forEach(item => {
+    //   mblData.ctnInfo.forEach(ite => {
+    //     if (item.ctnInfo == ite.ctnInfo) {
+    //       item.kgs = (Number(ite.kgs) - hblTotalKgs).toFixed(2)
+    //       item.cbm = (Number(ite.cbm) - hblTotalCbm).toFixed(2)
+    //       item.pkgs =Number(ite.pkgs) - hblTotalPkgs
+    //     }
+    //   })
+    // })
+
+    // console.log(hblTotalKgs, hblTotalPkgs, hblTotalCbm);
+    setFieldsValueBase(mblData)
+    RefcargoInfo.value.preOrderInit(mblData)
+    setFieldsValueMail(mblData)
+    setFieldsValueYard(mblData)
+    ctnList.value = mblData.ctnInfo ? mblData.ctnInfo : []
+    hotpreOrder.value.hotInstance.loadData(ctnList.value)
+    mblData.isPart = true
+    orderList.value.push({ checked: true, isPart: true, ...mblData })
+    editIndex.value = orderList.value.length - 1
+  }
+  // 保存
+  function saveOrder() {
+    saveOrderInfo().then((res) => {
+      floading.value = true
+      SaveShippingBillAsync(orderList.value)
+        .then((res) => {
+          floading.value = false
+          if (res.succeeded) {
+            orderList.value[editIndex.value].id = res.data
+            createMessage.success(res.message)
+            FngetPageESeaeEdi()
+          }
+        })
+        .catch(() => {
+          floading.value = false
+        })
     })
-    const data = {
-      ...getFieldsValueMail(),
-      ...getFieldsValueBase(),
-      ...getFieldsValueYard(),
-      ...RefcargoInfo.value.getFieldsValue(),
-      ctnInfo: ctnList.value,
-      businessId: id.value ? id.value : '',
+  }
+  // 删除
+  function removeOrder() {
+    const arr = [] as any
+    for (let i = orderList.value.length - 1; i >= 0; i--) {
+      if (orderList.value[i].checked && !orderList.value[i].isPart) {
+        createMessage.error('主单不能被删除')
+        return false
+      }
     }
-    orderList.value[editIndex.value] = data
-    resolve(true)
-  })
-}
-// 添加分单 保存当前单
-function addOrder() {
-  saveOrderInfo().then(res => {
-    // 分单内容要复制主单的
-    let mblData = {} as any
-    let hblList = [] as any
-    orderList.value.forEach(item => {
-      if (!item.isPart) {
-        mblData = JSON.parse(JSON.stringify(item))
-      } else {
-        hblList.push(JSON.parse(JSON.stringify(item)))
+    for (let i = orderList.value.length - 1; i >= 0; i--) {
+      if (orderList.value[i].checked && orderList.value[i].isPart) {
+        arr.push(orderList.value[i].id)
+        orderList.value.splice(i, 1)
       }
-    })
-    mblData.id = '0'
-    mblData.hblno = ''
-    if (mblData.ctnInfo) {
-      mblData.ctnInfo.forEach(item => {
-        delete item.id
-      })
     }
-    console.log(mblData, hblList);
-    calcCtnInfo(mblData, hblList)
-  })
-}
-// 添加分单计算箱信息 需要用主单减掉分单的信息
-function calcCtnInfo(mblData, hblList) {
-  mblData.ctnInfo.forEach(item => {
-    if(item.kgs){
-      let totalKgs = 0
-      hblList.forEach(ite=>{
-        ite.ctnInfo.forEach(it=>{
-          console.log(it.cntrNo,item.cntrNo);
-          if(it.cntrNo === item.cntrNo){
-            console.log(it.kgs,12312331);
-            totalKgs += Number(it.kgs)
-          }
-        })
-      })
-      item.kgs = (Number(item.kgs) - totalKgs).toFixed(2)
+    for (let i = arr.length - 1; i >= 0; i--) {
+      if (arr[i] == 0) {
+        arr.splice(i, 1)
+      }
     }
-    if(item.cbm){
-      let totalCbm = 0
-      hblList.forEach(ite=>{
-        ite.ctnInfo.forEach(it=>{
-          if(it.cntrNo === item.cntrNo){
-            totalCbm += Number(it.cbm)
+    if (arr.length > 0) {
+      floading.value = true
+      BatchDelShippingBill({ ids: arr })
+        .then((res) => {
+          if (res.succeeded) {
+            editOrder(0)
           }
+          floading.value = false
         })
-      })
-      item.cbm = (Number(item.cbm) - totalCbm).toFixed(2)
-    }
-    if(item.pkgs){
-      let totalPkgs = 0
-      hblList.forEach(ite=>{
-        ite.ctnInfo.forEach(it=>{
-          if(it.cntrNo === item.cntrNo){
-            totalPkgs += Number(it.pkgs)
-          }
+        .catch(() => {
+          floading.value = false
         })
-      })
-      item.pkgs = (Number(item.pkgs) - totalPkgs)
+    } else {
+      editOrder(0)
     }
-  })
-  // data.ctnInfo.forEach(item => {
-  //   mblData.ctnInfo.forEach(ite => {
-  //     if (item.ctnInfo == ite.ctnInfo) {
-  //       item.kgs = (Number(ite.kgs) - hblTotalKgs).toFixed(2)
-  //       item.cbm = (Number(ite.cbm) - hblTotalCbm).toFixed(2)
-  //       item.pkgs =Number(ite.pkgs) - hblTotalPkgs
-  //     }
-  //   })
-  // })
+  }
+  const showSendModel = ref(false)
+  const sendType = ref('')
+  const sendRemarkVal = ref('')
+  const sendLoading = ref(false)
 
-  // console.log(hblTotalKgs, hblTotalPkgs, hblTotalCbm);
-  setFieldsValueBase(mblData)
-  RefcargoInfo.value.preOrderInit(mblData)
-  setFieldsValueMail(mblData)
-  setFieldsValueYard(mblData)
-  ctnList.value = mblData.ctnInfo ? mblData.ctnInfo : []
-  hotpreOrder.value.hotInstance.loadData(ctnList.value)
-  mblData.isPart = true
-  orderList.value.push({ checked: true, isPart: true, ...mblData })
-  editIndex.value = orderList.value.length - 1
-}
-// 保存
-function saveOrder() {
-  saveOrderInfo().then(res => {
-    floading.value = true
-    SaveShippingBillAsync(orderList.value).then((res) => {
-      floading.value = false
-      if (res.succeeded) {
-        orderList.value[editIndex.value].id = res.data
-        createMessage.success(res.message)
-        FngetPageESeaeEdi()
+  // 发送
+  function sendOrderFun() {
+    const SelectArr = [] as any
+    for (let i = 0; i < orderList.value.length; i++) {
+      if (orderList.value[i].checked && orderList.value[i].id == 0) {
+        createMessage.error('请先保存')
+        return false
       }
-    }).catch(() => {
-      floading.value = false
-    })
-  })
-}
-// 删除
-function removeOrder() {
-  const arr = [] as any
-  for (let i = orderList.value.length - 1; i >= 0; i--) {
-    if (orderList.value[i].checked && !orderList.value[i].isPart) {
-      createMessage.error('主单不能被删除')
-      return false
     }
-  }
-  for (let i = orderList.value.length - 1; i >= 0; i--) {
-    if (orderList.value[i].checked && orderList.value[i].isPart) {
-      arr.push(orderList.value[i].id)
-      orderList.value.splice(i, 1)
+    for (let i = 0; i < orderList.value.length; i++) {
+      if (orderList.value[i].checked) {
+        SelectArr.push(orderList.value[i])
+      }
+    }
+
+    if (SelectArr.length) {
+      showSendModel.value = true
+    } else {
+      notification.error({ message: '请选择发送单号', duration: 3 })
     }
   }
-  for (let i = arr.length - 1; i >= 0; i--) {
-    if (arr[i] == 0) {
-      arr.splice(i, 1)
+  function delboxLine() {
+    for (let i = ctnList.value.length - 1; i >= 0; i--) {
+      if (ctnList.value[i].selected) {
+        ctnList.value.splice(i, 1)
+      }
     }
+    hotpreOrder.value.hotInstance.loadData(ctnList.value)
   }
-  if (arr.length > 0) {
-    floading.value = true
-    BatchDelShippingBill({ ids: arr }).then((res) => {
-      if (res.succeeded) {
-        editOrder(0)
+  function copyboxLine() {
+    const arr = [] as any
+    ctnList.value.forEach((item) => {
+      if (item.selected) {
+        arr.push(item)
       }
-      floading.value = false
-    }).catch(() => {
-      floading.value = false
     })
-  } else {
-    editOrder(0)
-  }
-}
-const showSendModel = ref(false)
-const sendType = ref('')
-const sendRemarkVal = ref('')
-const sendLoading = ref(false)
-
-// 发送
-function sendOrderFun() {
-  const SelectArr = [] as any
-  for (let i = 0; i < orderList.value.length; i++) {
-    if (orderList.value[i].checked && orderList.value[i].id == 0) {
-      createMessage.error('请先保存')
+    if (arr.length > 1) {
+      createMessage.error('请选择一条数据复制')
       return false
     }
+    if (arr.length == 1) {
+      ctnList.value.push(JSON.parse(JSON.stringify(arr[0])))
+      hotpreOrder.value.hotInstance.loadData(ctnList.value)
+    }
+    console.log(arr)
   }
-  for (let i = 0; i < orderList.value.length; i++) {
-    if (orderList.value[i].checked) {
-      SelectArr.push(orderList.value[i])
+  // 确认发送
+  function sendSubmit() {
+    sendLoading.value = true
+    let SendIds: any = []
+    orderList.value.forEach((e) => {
+      if (e.checked) {
+        SendIds.push(e.id)
+      }
+    })
+    let ApiData = {
+      ids: SendIds,
+      type: sendType.value,
+      sendRemark: sendRemarkVal.value,
     }
+    SendShippingBill(ApiData)
+      .then((res) => {
+        let message = ''
+        if (res.succeeded) {
+          switch (sendType.value) {
+            case '0':
+              message = '新增发送成功'
+              break
+            case '1':
+              message = '修改发送成功'
+              break
+            default:
+              message = '删除发送成功'
+              break
+          }
+          notification.success({ message: message, duration: 3 })
+          sendClose()
+        }
+        sendLoading.value = false
+      })
+      .catch((err) => {
+        sendLoading.value = false
+      })
   }
-
-  if (SelectArr.length) {
-    showSendModel.value = true
-  } else {
-    notification.error({ message: '请选择发送单号', duration: 3 })
+  // 关闭
+  function sendClose() {
+    showSendModel.value = false
+    sendType.value = ''
+    sendRemarkVal.value = ''
   }
-}
-function delboxLine() {
-  for (let i = ctnList.value.length - 1; i >= 0; i--) {
-    if (ctnList.value[i].selected) {
-      ctnList.value.splice(i, 1)
-    }
+  // 刷新
+  function handleRef() {
+    init()
   }
-  hotpreOrder.value.hotInstance.loadData(ctnList.value)
-}
-function copyboxLine() {
-  const arr = [] as any
-  ctnList.value.forEach(item => {
-    if (item.selected) {
-      arr.push(item)
-    }
-  })
-  if (arr.length > 1) {
-    createMessage.error('请选择一条数据复制')
-    return false
+  // 点击列表 保存原先信息 然后切换
+
+  function changeOrder(index) {
+    saveOrderInfo().then((res) => {
+      editOrder(index)
+    })
   }
-  if (arr.length == 1) {
-    ctnList.value.push(JSON.parse(JSON.stringify(arr[0])))
+  function editOrder(index) {
+    editIndex.value = index
+    const data = orderList.value[index]
+    orderList.value.forEach((item) => {
+      item.checked = false
+    })
+    orderList.value[index].checked = true
+    setFieldsValueBase(data)
+    RefcargoInfo.value.preOrderInit(data)
+    setFieldsValueMail(data)
+    setFieldsValueYard(data)
+    setFieldsValueMail({
+      shipper: '',
+      shipperId: '',
+      consignee: '',
+      consigneeId: '',
+      notifyParty: '',
+      notifyPartyId: '',
+    })
+    ctnList.value = data.ctnInfo ? data.ctnInfo : []
     hotpreOrder.value.hotInstance.loadData(ctnList.value)
   }
-  console.log(arr);
-}
-// 确认发送
-function sendSubmit() {
-  sendLoading.value = true
-  let SendIds: any = []
-  orderList.value.forEach((e) => {
-    if (e.checked) {
-      SendIds.push(e.id)
-    }
-  })
-  let ApiData = {
-    ids: SendIds,
-    type: sendType.value,
-    sendRemark: sendRemarkVal.value,
-  }
-  SendShippingBill(ApiData).then((res) => {
-    let message = ''
-    if (res.succeeded) {
-      switch (sendType.value) {
-        case '0':
-          message = '新增发送成功'
-          break
-        case '1':
-          message = '修改发送成功'
-          break
-        default:
-          message = '删除发送成功'
-          break
-      }
-      notification.success({ message: message, duration: 3 })
-      sendClose()
-    }
-    sendLoading.value = false
-  }).catch((err) => {
-    sendLoading.value = false
-  })
-}
-// 关闭
-function sendClose() {
-  showSendModel.value = false
-  sendType.value = ''
-  sendRemarkVal.value = ''
-}
-// 刷新
-function handleRef() {
-  init()
-}
-// 点击列表 保存原先信息 然后切换
 
-function changeOrder(index) {
-  saveOrderInfo().then(res => {
-    editOrder(index)
-  })
-}
-function editOrder(index) {
-  editIndex.value = index
-  const data = orderList.value[index]
-  orderList.value.forEach(item => {
-    item.checked = false
-  })
-  orderList.value[index].checked = true
-  setFieldsValueBase(data)
-  RefcargoInfo.value.preOrderInit(data)
-  setFieldsValueMail(data)
-  setFieldsValueYard(data)
-  setFieldsValueMail({
-    shipper: '',
-    shipperId: '',
-    consignee: '',
-    consigneeId: '',
-    notifyParty: '',
-    notifyPartyId: '',
-  })
-  ctnList.value = data.ctnInfo ? data.ctnInfo : []
-  hotpreOrder.value.hotInstance.loadData(ctnList.value)
-}
-
-
-// -----------------------下侧表格------------------------
-const list = ref<any>([])
-const ctnDict = ref([])
-const kindPkgsDict = ref([])
-const hotpreOrder = ref(null) as any
-const mainPkgs = ref([]) as any
-const totalPkgs = ref(0)
-const totalKgs = ref(0)
-const totalCbm = ref(0)
-const columns = [
-  {
-    data: 'selected',
-    type: 'checkbox',
-    title: ' ',
-    width: 32,
-    className: 'htCenter',
-    readOnly: false,
-  },
-  {
-    title: '箱型代码',
-    width: 80,
-    data: 'ctnCode',
-  },
-  {
-    title: '箱型',
-    width: 120,
-    data: 'ctn',
-    type: 'dropdown',
-    source: async (query, process) => {
-      const res = ctnDict.value.length ? ctnDict.value : (await GetCtnSelectList())?.data
-      if (!ctnDict.value.length) ctnDict.value = res
-      const dict = res.map((res) => {
-        return res.ctnName
-      })
-      process(dict)
+  // -----------------------下侧表格------------------------
+  const list = ref<any>([])
+  const ctnDict = ref([])
+  const kindPkgsDict = ref([])
+  const hotpreOrder = ref(null) as any
+  const mainPkgs = ref([]) as any
+  const totalPkgs = ref(0)
+  const totalKgs = ref(0)
+  const totalCbm = ref(0)
+  const columns = [
+    {
+      data: 'selected',
+      type: 'checkbox',
+      title: ' ',
+      width: 32,
+      className: 'htCenter',
+      readOnly: false,
     },
-  },
-  {
-    title: '箱号',
-    width: 150,
-    data: 'cntrNo',
-  },
-  {
-    title: '封号',
-    width: 150,
-    data: 'sealNo',
-  },
-  {
-    title: '件数',
-    width: 100,
-    data: 'pkgs',
-  },
-  {
-    title: '包装',
-    width: 120,
-    data: 'kindPkgsName',
-    type: 'dropdown',
-    // 下拉框数据，可以同步或者异步返回(异步需要process返回)
-    source: async (query, process) => {
-      const res = (await GetPackageSelectList({ queryKey: query }))?.data
-      mainPkgs.value = res
-      const dict = res.map((res) => {
-        return res.packageName
-      })
-      process(dict)
+    {
+      title: '箱型代码',
+      width: 80,
+      data: 'ctnCode',
     },
-  },
-  {
-    title: '重量',
-    width: 100,
-    data: 'kgs',
-  },
-  {
-    title: '尺码',
-    width: 100,
-    data: 'cbm',
-  },
-  {
-    title: 'hs编码',
-    width: 120,
-    data: 'hsCode',
-  },
-]
-// 表格配置项
-const settings = {
-  height: '208',
-  autoWrapRow: true,
-  autoWrapCol: true,
-  // 每行的高度
-  rowHeights: 26,
-  fixedColumnsLeft: 1,
-  // 需要隐藏的列
-  hiddenColumns: {
-    columns: [1],
-    indicators: true,
-  },
-  // 控制回车移动
-  enterMoves: 'row',
-  columnSorting: true,
-  // 如果通过复制或者填写校验出现错误，清空输入框
-  afterValidate: function (isValid, value, row, prop, source) {
-    if (!isValid) {
-      hotpreOrder.value.hotInstance.setDataAtRowProp(row, prop, '')
-    }
-  },
-  columns: columns,
-  // 此行直接复制，必须(非商用)
-  licenseKey: 'non-commercial-and-evaluation',
-  // 定义所有单元格发生变化的回调处理
-  async afterChange(changes, source) {
-    // 这里定义了编辑，自动填充和拷贝数据的处理逻辑
-    if (source === 'edit' || source === 'Autofill.fill' || source === 'CopyPaste.paste') {
-      let dict: any = {}
-      // 选择箱型联动逻辑
-      if (changes[0][1] === 'ctn') {
+    {
+      title: '箱型',
+      width: 120,
+      data: 'ctn',
+      type: 'dropdown',
+      source: async (query, process) => {
         const res = ctnDict.value.length ? ctnDict.value : (await GetCtnSelectList())?.data
         if (!ctnDict.value.length) ctnDict.value = res
-        const item = res.filter((item) => {
-          return item.ctnName === changes[0][3]
+        const dict = res.map((res) => {
+          return res.ctnName
         })
-        if (item) dict = item[0]
-        ctnList.value[changes[0][0]]['ctn'] = dict?.ctnName
-        ctnList.value[changes[0][0]]['ctnCode'] = dict?.ediCode
-        ctnList.value[changes[0][0]]['size'] = dict?.ctnSize
-        if (ctnList.value[changes[0][0]]['ctnNum']) {
-          ctnList.value[changes[0][0]]['teu'] =
-            parseInt(dict.teu || 0) * parseInt(ctnList.value[changes[0][0]]['ctnNum'])
-        }
-        ctnList.value[changes[0][0]]['tareWeight'] = dict?.ctnWeight
-      }
-      if (changes[0][1] === 'kindPkgsName') {
-        const res = mainPkgs.value
-        const item = res.filter((item) => {
-          return item.packageName === changes[0][3]
+        process(dict)
+      },
+    },
+    {
+      title: '箱号',
+      width: 150,
+      data: 'cntrNo',
+    },
+    {
+      title: '封号',
+      width: 150,
+      data: 'sealNo',
+    },
+    {
+      title: '件数',
+      width: 100,
+      data: 'pkgs',
+    },
+    {
+      title: '包装',
+      width: 120,
+      data: 'kindPkgsName',
+      type: 'dropdown',
+      // 下拉框数据，可以同步或者异步返回(异步需要process返回)
+      source: async (query, process) => {
+        const res = (await GetPackageSelectList({ queryKey: query }))?.data
+        mainPkgs.value = res
+        const dict = res.map((res) => {
+          return res.packageName
         })
-        if (item) dict = item[0]
-        ctnList.value[changes[0][0]]['kindPkgs'] = dict?.id
-        ctnList.value[changes[0][0]]['kindPkgsName'] = dict?.packageName
+        process(dict)
+      },
+    },
+    {
+      title: '重量',
+      width: 100,
+      data: 'kgs',
+    },
+    {
+      title: '尺码',
+      width: 100,
+      data: 'cbm',
+    },
+    {
+      title: 'hs编码',
+      width: 120,
+      data: 'hsCode',
+    },
+  ]
+  // 表格配置项
+  const settings = {
+    height: '208',
+    autoWrapRow: true,
+    autoWrapCol: true,
+    // 每行的高度
+    rowHeights: 26,
+    fixedColumnsLeft: 1,
+    // 需要隐藏的列
+    hiddenColumns: {
+      columns: [1],
+      indicators: true,
+    },
+    // 控制回车移动
+    enterMoves: 'row',
+    columnSorting: true,
+    // 如果通过复制或者填写校验出现错误，清空输入框
+    afterValidate: function (isValid, value, row, prop, source) {
+      if (!isValid) {
+        hotpreOrder.value.hotInstance.setDataAtRowProp(row, prop, '')
       }
-      // // 计算件数
-      // if (changes[0][1] === 'pkgs') {
-      //   let RData = 0
-      //   ctnList.value.forEach((e) => {
-      //     if (e.pkgs) {
-      //       RData = RData + parseInt(e.pkgs)
-      //     }
-      //   })
-      //   totalPkgs.value = RData
-      // }
-      // // 计算毛重
-      // if (changes[0][1] === 'kgs') {
-      //   let RData = 0
-      //   ctnList.value.forEach((e) => {
-      //     if (e.kgs) {
-      //       RData = RData + Number(e.kgs)
-      //     }
-      //   })
-      //   totalKgs.value = RData.toFixed(2)
-      // }
-      // // 计算尺码
-      // if (changes[0][1] === 'cbm') {
-      //   let RData = 0
-      //   ctnList.value.forEach((e) => {
-      //     if (e.cbm) {
-      //       RData = RData + Number(e.cbm)
-      //     }
-      //   })
-      //   totalCbm.value = RData.toFixed(2)
-      // }
-    }
-  },
-}
-function GetCtnList() {
-  if (orderList.value[editIndex.value].id) {
-    let ApiData = {
-      queryCondition: JSON.stringify([
-        {
-          FieldName: 'pid',
-          FieldValue: orderList.value[editIndex.value].id,
-          ConditionalType: 1,
+    },
+    columns: columns,
+    // 此行直接复制，必须(非商用)
+    licenseKey: 'non-commercial-and-evaluation',
+    // 定义所有单元格发生变化的回调处理
+    async afterChange(changes, source) {
+      // 这里定义了编辑，自动填充和拷贝数据的处理逻辑
+      if (source === 'edit' || source === 'Autofill.fill' || source === 'CopyPaste.paste') {
+        let dict: any = {}
+        // 选择箱型联动逻辑
+        if (changes[0][1] === 'ctn') {
+          const res = ctnDict.value.length ? ctnDict.value : (await GetCtnSelectList())?.data
+          if (!ctnDict.value.length) ctnDict.value = res
+          const item = res.filter((item) => {
+            return item.ctnName === changes[0][3]
+          })
+          if (item) dict = item[0]
+          ctnList.value[changes[0][0]]['ctn'] = dict?.ctnName
+          ctnList.value[changes[0][0]]['ctnCode'] = dict?.ediCode
+          ctnList.value[changes[0][0]]['size'] = dict?.ctnSize
+          if (ctnList.value[changes[0][0]]['ctnNum']) {
+            ctnList.value[changes[0][0]]['teu'] =
+              parseInt(dict.teu || 0) * parseInt(ctnList.value[changes[0][0]]['ctnNum'])
+          }
+          ctnList.value[changes[0][0]]['tareWeight'] = dict?.ctnWeight
+        }
+        if (changes[0][1] === 'kindPkgsName') {
+          const res = mainPkgs.value
+          const item = res.filter((item) => {
+            return item.packageName === changes[0][3]
+          })
+          if (item) dict = item[0]
+          ctnList.value[changes[0][0]]['kindPkgs'] = dict?.id
+          ctnList.value[changes[0][0]]['kindPkgsName'] = dict?.packageName
+        }
+        // // 计算件数
+        // if (changes[0][1] === 'pkgs') {
+        //   let RData = 0
+        //   ctnList.value.forEach((e) => {
+        //     if (e.pkgs) {
+        //       RData = RData + parseInt(e.pkgs)
+        //     }
+        //   })
+        //   totalPkgs.value = RData
+        // }
+        // // 计算毛重
+        // if (changes[0][1] === 'kgs') {
+        //   let RData = 0
+        //   ctnList.value.forEach((e) => {
+        //     if (e.kgs) {
+        //       RData = RData + Number(e.kgs)
+        //     }
+        //   })
+        //   totalKgs.value = RData.toFixed(2)
+        // }
+        // // 计算尺码
+        // if (changes[0][1] === 'cbm') {
+        //   let RData = 0
+        //   ctnList.value.forEach((e) => {
+        //     if (e.cbm) {
+        //       RData = RData + Number(e.cbm)
+        //     }
+        //   })
+        //   totalCbm.value = RData.toFixed(2)
+        // }
+      }
+    },
+  }
+  function GetCtnList() {
+    if (orderList.value[editIndex.value].id) {
+      let ApiData = {
+        queryCondition: JSON.stringify([
+          {
+            FieldName: 'pid',
+            FieldValue: orderList.value[editIndex.value].id,
+            ConditionalType: 1,
+          },
+        ]),
+        pageCondition: {
+          pageIndex: 1,
+          pageSize: 999,
+          sortConditions: [],
         },
-      ]),
-      pageCondition: {
-        pageIndex: 1,
-        pageSize: 999,
-        sortConditions: [],
-      },
+      }
+      GetShippingBillCtnList(ApiData).then((res) => {
+        list.vale = res.data
+      })
     }
-    GetShippingBillCtnList(ApiData).then((res) => {
-      list.vale = res.data
-    })
   }
-}
 
-defineExpose({
-  init,
-})
+  defineExpose({
+    init,
+  })
 </script>
 <style lang="less" scoped>
-.ds-pre-order {
-  .pl0 {
-    padding-left: 0 !important;
-  }
+  .ds-pre-order {
+    .pl0 {
+      padding-left: 0 !important;
+    }
 
-  .pb0 {
-    padding-bottom: 0 !important;
-  }
+    .pb0 {
+      padding-bottom: 0 !important;
+    }
 
-  .pt0 {
-    padding-top: 0 !important;
-  }
+    .pt0 {
+      padding-top: 0 !important;
+    }
 
-  .ant-modal-body .ant-form {
-    background: #ffffff;
-    padding: 0 15px;
-  }
+    .ant-modal-body .ant-form {
+      background: #ffffff;
+      padding: 0 15px;
+    }
 
-  .sft-save-btn {
-    position: absolute;
-    right: -10px;
-    top: -26px;
-  }
+    .sft-save-btn {
+      position: absolute;
+      right: -10px;
+      top: -26px;
+    }
 
-  .sft-select {
-    position: absolute;
-    left: 40px;
-    top: -18px;
-    width: 90px;
+    .sft-select {
+      position: absolute;
+      left: 40px;
+      top: -18px;
+      width: 90px;
 
-    .ant-select-selector {
-      height: 16px !important;
+      .ant-select-selector {
+        height: 16px !important;
 
-      .ant-select-selection-item {
-        height: 20px;
-        position: relative;
-        top: -5px;
+        .ant-select-selection-item {
+          height: 20px;
+          position: relative;
+          top: -5px;
+        }
       }
     }
   }
-}
 
-.baseinfo {
-  .ds-textarea {
-    position: relative;
-    top: -6px;
+  .baseinfo {
+    .ds-textarea {
+      position: relative;
+      top: -6px;
 
-    textarea {
-      height: 102px;
+      textarea {
+        height: 102px;
+      }
     }
-  }
 
-  .ant-divider-horizontal {
-    margin: 8px 0 8px !important;
-    background: #E8EBED;
-  }
+    .ant-divider-horizontal {
+      margin: 8px 0 8px !important;
+      background: #e8ebed;
+    }
+
+    h4 {
+      margin: 12px 0 5px 0;
+    }
 
-  h4 {
-    margin: 12px 0 5px 0;
+    .iconfont {
+      display: inline-block;
+      height: 18px;
+      width: 32px;
+      border-radius: 2px;
+      font-size: 12px;
+      text-align: center;
+      background: #f5f9fc;
+      color: #257afa;
+      margin-right: 0;
+      margin-left: 4px;
+      margin-bottom: 4px;
+      cursor: pointer;
+    }
+
+    .copy-btn,
+    .save-btn {
+      float: right;
+    }
   }
 
-  .iconfont {
-    display: inline-block;
-    height: 18px;
-    width: 32px;
-    border-radius: 2px;
+  .title {
     font-size: 12px;
-    text-align: center;
-    background: #F5F9FC;
-    color: #257AFA;
-    margin-right: 0;
-    margin-left: 4px;
-    margin-bottom: 4px;
-    cursor: pointer;
+    font-weight: bold;
+    color: black;
+    margin-bottom: 5px;
+    padding-left: 14px;
+    display: flex;
+    align-items: center;
   }
 
-  .copy-btn,
-  .save-btn {
-    float: right;
+  .box {
+    margin-bottom: 10px;
   }
-}
-
 
-.title {
-  font-size: 12px;
-  font-weight: bold;
-  color: black;
-  margin-bottom: 5px;
-  padding-left: 14px;
-  display: flex;
-  align-items: center;
-}
-
-.box {
-  margin-bottom: 10px
-}
+  .right {
+    width: calc(100% - 320px);
+    height: 80vh;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
 
-.right {
-  width: calc(100% - 320px);
-  height: 80vh;
-  overflow-y: auto;
-  overflow-x: hidden;
-}
+  .left-title {
+    display: flex;
 
-.left-title {
-  display: flex;
+    /deep/ .ant-btn-link {
+      padding: 0px !important;
+      margin-right: 10px;
+    }
 
-  /deep/ .ant-btn-link {
-    padding: 0px !important;
-    margin-right: 10px;
+    border-bottom: 1px solid #e8ebed;
+    margin-bottom: 10px;
   }
 
-  border-bottom: 1px solid #e8ebed;
-  margin-bottom: 10px;
-}
-
-.order-label {
-  margin-left: 10px;
-  cursor: pointer;
+  .order-label {
+    margin-left: 10px;
+    cursor: pointer;
 
-  &.active {
-    color: #257AFA
+    &.active {
+      color: #257afa;
+    }
   }
-}
 
-.sec-order {
-  border-bottom: 1px solid #e8ebed;
-}
+  .sec-order {
+    border-bottom: 1px solid #e8ebed;
+  }
 
-.yard {
-  width: 400px;
-}
+  .yard {
+    width: 400px;
+  }
 
-.table-calc {
-  margin-top: 8px;
-  font-size: 12px;
+  .table-calc {
+    margin-top: 8px;
+    font-size: 12px;
 
-  &-box {
-    display: inline-block;
-    background: #f5f9fc;
-    padding: 2px 6px;
-    margin-right: 6px;
+    &-box {
+      display: inline-block;
+      background: #f5f9fc;
+      padding: 2px 6px;
+      margin-right: 6px;
 
-    span {
-      color: #257afa;
+      span {
+        color: #257afa;
+      }
     }
   }
-}
 </style>
diff --git a/src/views/operation/seaexport/detail/modules/preOrderData.json b/src/views/operation/seaexport/detail/modules/preOrderData.json
index 8f1e4eb0..6c75dc25 100644
--- a/src/views/operation/seaexport/detail/modules/preOrderData.json
+++ b/src/views/operation/seaexport/detail/modules/preOrderData.json
@@ -60,11 +60,11 @@ nullable: true
 shipperCountry	string
 nullable: true
 
-发货人国家code
+发货人国家地区code
 shipperCountryName	string
 nullable: true
 
-发货人国家
+发货人国家地区
 shipperCountryTel	string
 nullable: true
 
@@ -80,11 +80,11 @@ nullable: true
 consigneeCountry	string
 nullable: true
 
-收货人国家code
+收货人国家地区code
 consigneeCountryName	string
 nullable: true
 
-收货人国家
+收货人国家地区
 consigneeCountryTel	string
 nullable: true
 
@@ -100,11 +100,11 @@ nullable: true
 notifyPartyCountry	string
 nullable: true
 
-通知人国家code
+通知人国家地区code
 notifyPartyCountryName	string
 nullable: true
 
-通知人国家
+通知人国家地区
 notifyPartyCountryTel	string
 nullable: true
 
diff --git a/src/views/taskmanage/taskList/transPlanHasChange.vue b/src/views/taskmanage/taskList/transPlanHasChange.vue
index 91c9a83f..c6ce26c6 100644
--- a/src/views/taskmanage/taskList/transPlanHasChange.vue
+++ b/src/views/taskmanage/taskList/transPlanHasChange.vue
@@ -1,225 +1,245 @@
 <template>
-    <div class="main">
-        <a-spin :spinning="spinning">
-            <div class="main-box">
-                <div class="box">
-                    <div class="LeftHead">
-                        <p>
-                            <i style="color: orange;margin-right: 10px;font-size: 16px"
-                                class="icon-lunchuan iconfont"></i>
-                            货物运输计划已变更 {{ taskData.carrier }}
-                        </p>
-                        <p>时间：{{ taskData.createTime }}</p>
-                    </div>
-                    <a-row>
-                        <a-col :span="4">
-                            <div class="text">提单号</div>
-                            {{ taskData.billNo }}
-                        </a-col>
-                        <a-col :span="4">
-                            <div class="text">此订舱号派生自原单号</div>
-                            {{ taskData.origBillNo }}
-                        </a-col>
-                    </a-row>
-                    <a-row>
-                        <a-col :span="4">
-                            <div class="text">订舱号</div>
-                            {{ taskData.bookingNo }}
-                        </a-col>
-                        <a-col :span="4">
-                            <div class="text">集装箱号</div>
-                            {{ taskData.contaNoList }}
-                        </a-col>
-                    </a-row>
-                    <a-row>
-                        <a-col :span="20">
-                            <div class="text">变更原因</div>
-                            {{ taskData.changeReasonNotes }}
-                        </a-col>
-                    </a-row>
-                </div>
-                <div class="box">
-                    <div class="LeftHead">
-                        <div style="font-weight: bold;">出运计划</div>
-                    </div>
-                    <div style="display: flex;margin-top: 15px;">
-                        <div style="width: 33%;">
-                            <div style="font-weight: bold;font-size: 13px;">港口名,国家,码头</div>
-                            <div :class="{
-                                gray: taskData.from.portList.length == 1,
-                                red: taskData.from.portList.length > 1 && item.isRemoved,
-                                green: taskData.from.portList.length > 1 && !item.isRemoved
-                            }" v-for="(item, index) in taskData.from.portList" :key="index">
-                                {{ item.portName }},{{ item.countryCode }},{{ item.terminalName }}</div>
-                        </div>
-                        <div style="width: 33%;">
-                            <div style="font-weight: bold;font-size: 13px;">预计离港日</div>
-                            <div :class="{
-                                gray: taskData.from.dateList.length == 1,
-                                red: taskData.from.dateList.length > 1 && item.isRemoved,
-                                green: taskData.from.dateList.length > 1 && !item.isRemoved
-                            }" v-for="(item, index) in taskData.from.dateList" :key="index">
-                                {{ item.dateVal }}</div>
-                        </div>
-                        <div style="width: 33%;">
-                            <div style="font-weight: bold;font-size: 13px;">船名,航次,船旗</div>
-                            <div :class="{
-                                gray: taskData.from.vesselList.length == 1,
-                                red: taskData.from.vesselList.length > 1 && item.isRemoved,
-                                green: taskData.from.vesselList.length > 1 && !item.isRemoved
-                            }" v-for="(item, index) in taskData.from.vesselList" :key="index">
-                                {{ item.vessel }},{{ item.voyno }},{{ item.flag }}</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="box">
-                    <div class="LeftHead">
-                        <div style="font-weight: bold;">到达计划</div>
-                    </div>
-                    <div style="display: flex;margin-top: 15px;">
-                        <div style="width: 33%;">
-                            <div style="font-weight: bold;font-size: 13px;">港口名,国家,码头</div>
-                            <div :class="{
-                                gray: taskData.to.portList.length == 1,
-                                red: taskData.to.portList.length > 1 && item.isRemoved,
-                                green: taskData.to.portList.length > 1 && !item.isRemoved
-                            }" v-for="(item, index) in taskData.to.portList" :key="index">
-                                {{ item.portName }},{{ item.countryCode }},{{ item.terminalName }}</div>
-                        </div>
-                        <div style="width: 33%;">
-                            <div style="font-weight: bold;font-size: 13px;">预计到港日</div>
-                            <div :class="{
-                                gray: taskData.to.dateList.length == 1,
-                                red: taskData.to.dateList.length > 1 && item.isRemoved,
-                                green: taskData.to.dateList.length > 1 && !item.isRemoved
-                            }" v-for="(item, index) in taskData.to.dateList" :key="index">
-                                {{ item.dateVal }}</div>
-                        </div>
-                        <div style="width: 33%;">
-                            <div style="font-weight: bold;font-size: 13px;">船名,航次,船旗</div>
-                            <div :class="{
-                                gray: taskData.to.vesselList.length == 1,
-                                red: taskData.to.vesselList.length > 1 && item.isRemoved,
-                                green: taskData.to.vesselList.length > 1 && !item.isRemoved
-                            }" v-for="(item, index) in taskData.to.vesselList" :key="index">
-                                {{ item.vessel }},{{ item.voyno }},{{ item.flag }}</div>
-                        </div>
-                    </div>
-                </div>
+  <div class="main">
+    <a-spin :spinning="spinning">
+      <div class="main-box">
+        <div class="box">
+          <div class="LeftHead">
+            <p>
+              <i
+                style="color: orange; margin-right: 10px; font-size: 16px"
+                class="icon-lunchuan iconfont"
+              ></i>
+              货物运输计划已变更 {{ taskData.carrier }}
+            </p>
+            <p>时间：{{ taskData.createTime }}</p>
+          </div>
+          <a-row>
+            <a-col :span="4">
+              <div class="text">提单号</div>
+              {{ taskData.billNo }}
+            </a-col>
+            <a-col :span="4">
+              <div class="text">此订舱号派生自原单号</div>
+              {{ taskData.origBillNo }}
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="4">
+              <div class="text">订舱号</div>
+              {{ taskData.bookingNo }}
+            </a-col>
+            <a-col :span="4">
+              <div class="text">集装箱号</div>
+              {{ taskData.contaNoList }}
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="20">
+              <div class="text">变更原因</div>
+              {{ taskData.changeReasonNotes }}
+            </a-col>
+          </a-row>
+        </div>
+        <div class="box">
+          <div class="LeftHead">
+            <div style="font-weight: bold">出运计划</div>
+          </div>
+          <div style="display: flex; margin-top: 15px">
+            <div style="width: 33%">
+              <div style="font-weight: bold; font-size: 13px">港口名,国家地区,码头</div>
+              <div
+                :class="{
+                  gray: taskData.from.portList.length == 1,
+                  red: taskData.from.portList.length > 1 && item.isRemoved,
+                  green: taskData.from.portList.length > 1 && !item.isRemoved,
+                }"
+                v-for="(item, index) in taskData.from.portList"
+                :key="index"
+              >
+                {{ item.portName }},{{ item.countryCode }},{{ item.terminalName }}</div
+              >
             </div>
-        </a-spin>
-        <taskButton :buttonList="['取消', '完成', '转移', '邮件', '检索']" @loadingStart="loadingStart" @loadingStop="loadingStop"
-            :id="taskPKId"></taskButton>
-    </div>
+            <div style="width: 33%">
+              <div style="font-weight: bold; font-size: 13px">预计离港日</div>
+              <div
+                :class="{
+                  gray: taskData.from.dateList.length == 1,
+                  red: taskData.from.dateList.length > 1 && item.isRemoved,
+                  green: taskData.from.dateList.length > 1 && !item.isRemoved,
+                }"
+                v-for="(item, index) in taskData.from.dateList"
+                :key="index"
+              >
+                {{ item.dateVal }}</div
+              >
+            </div>
+            <div style="width: 33%">
+              <div style="font-weight: bold; font-size: 13px">船名,航次,船旗</div>
+              <div
+                :class="{
+                  gray: taskData.from.vesselList.length == 1,
+                  red: taskData.from.vesselList.length > 1 && item.isRemoved,
+                  green: taskData.from.vesselList.length > 1 && !item.isRemoved,
+                }"
+                v-for="(item, index) in taskData.from.vesselList"
+                :key="index"
+              >
+                {{ item.vessel }},{{ item.voyno }},{{ item.flag }}</div
+              >
+            </div>
+          </div>
+        </div>
+        <div class="box">
+          <div class="LeftHead">
+            <div style="font-weight: bold">到达计划</div>
+          </div>
+          <div style="display: flex; margin-top: 15px">
+            <div style="width: 33%">
+              <div style="font-weight: bold; font-size: 13px">港口名,国家地区,码头</div>
+              <div
+                :class="{
+                  gray: taskData.to.portList.length == 1,
+                  red: taskData.to.portList.length > 1 && item.isRemoved,
+                  green: taskData.to.portList.length > 1 && !item.isRemoved,
+                }"
+                v-for="(item, index) in taskData.to.portList"
+                :key="index"
+              >
+                {{ item.portName }},{{ item.countryCode }},{{ item.terminalName }}</div
+              >
+            </div>
+            <div style="width: 33%">
+              <div style="font-weight: bold; font-size: 13px">预计到港日</div>
+              <div
+                :class="{
+                  gray: taskData.to.dateList.length == 1,
+                  red: taskData.to.dateList.length > 1 && item.isRemoved,
+                  green: taskData.to.dateList.length > 1 && !item.isRemoved,
+                }"
+                v-for="(item, index) in taskData.to.dateList"
+                :key="index"
+              >
+                {{ item.dateVal }}</div
+              >
+            </div>
+            <div style="width: 33%">
+              <div style="font-weight: bold; font-size: 13px">船名,航次,船旗</div>
+              <div
+                :class="{
+                  gray: taskData.to.vesselList.length == 1,
+                  red: taskData.to.vesselList.length > 1 && item.isRemoved,
+                  green: taskData.to.vesselList.length > 1 && !item.isRemoved,
+                }"
+                v-for="(item, index) in taskData.to.vesselList"
+                :key="index"
+              >
+                {{ item.vessel }},{{ item.voyno }},{{ item.flag }}</div
+              >
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-spin>
+    <taskButton
+      :buttonList="['取消', '完成', '转移', '邮件', '检索']"
+      @loadingStart="loadingStart"
+      @loadingStop="loadingStop"
+      :id="taskPKId"
+    ></taskButton>
+  </div>
 </template>
 <script lang="ts" setup>
-import { ref, onMounted, computed } from 'vue'
-import { TaskTransPlanHasChange } from '../api'
-import taskButton from '../components/taskButton.vue'
-import { useMessage } from '../../../hooks/web/useMessage'
-const { createMessage } = useMessage()
-import { useRoute } from 'vue-router'
-const selectedRowKeysTable = ref([])
-const route = useRoute()
-const spinning = ref(false)
-const taskData = ref({
+  import { ref, onMounted, computed } from 'vue'
+  import { TaskTransPlanHasChange } from '../api'
+  import taskButton from '../components/taskButton.vue'
+  import { useMessage } from '../../../hooks/web/useMessage'
+  const { createMessage } = useMessage()
+  import { useRoute } from 'vue-router'
+  const selectedRowKeysTable = ref([])
+  const route = useRoute()
+  const spinning = ref(false)
+  const taskData = ref({
     from: {
-        vesselList: [],
-        dateList: [],
-        portList: [],
+      vesselList: [],
+      dateList: [],
+      portList: [],
     },
     to: {
-        vesselList: [],
-        dateList: [],
-        portList: [],
+      vesselList: [],
+      dateList: [],
+      portList: [],
     },
-    contaNoList: []
-}) as any
-const taskPKId = ref(route.query.taskPKId)
-const tableLoad = ref(false)
-
+    contaNoList: [],
+  }) as any
+  const taskPKId = ref(route.query.taskPKId)
+  const tableLoad = ref(false)
 
-onMounted(() => {
+  onMounted(() => {
     getInfo()
-})
-
-
+  })
 
-function getInfo() {
+  function getInfo() {
     spinning.value = true
     const ApiData = {
-        taskPKId: taskPKId.value
+      taskPKId: taskPKId.value,
     }
-    TaskTransPlanHasChange(ApiData).then(res => {
-        if (res.succeeded) {
-            taskData.value = res.data
-        } else {
-            createMessage.error(res.message)
-        }
-        spinning.value = false
+    TaskTransPlanHasChange(ApiData).then((res) => {
+      if (res.succeeded) {
+        taskData.value = res.data
+      } else {
+        createMessage.error(res.message)
+      }
+      spinning.value = false
     })
-}
-function handleOpenUser() {
-
-}
-function handleOpen() {
-
-}
-function handleOpenCtn() {
-
-}
-function onSelectChange(selectedRowKeys) {
-    selectedRowKeys.value = selectedRowKeys;
-};
-function loadingStart() {
+  }
+  function handleOpenUser() {}
+  function handleOpen() {}
+  function handleOpenCtn() {}
+  function onSelectChange(selectedRowKeys) {
+    selectedRowKeys.value = selectedRowKeys
+  }
+  function loadingStart() {
     spinning.value = true
-}
-function loadingStop() {
+  }
+  function loadingStop() {
     spinning.value = false
-}
-function handleRefshPage() {
-
-}
-function handleRefsh() {
-
-}
-function handleSendNotice() {
-
-}
-
+  }
+  function handleRefshPage() {}
+  function handleRefsh() {}
+  function handleSendNotice() {}
 </script>
 <style lang="less" scoped>
-@import url('./taskStyle.less');
+  @import url('./taskStyle.less');
 
-.gray {
+  .gray {
     color: rgb(157 157 157);
-}
+  }
 
-.red {
+  .red {
     color: red;
     text-decoration: line-through;
-}
+  }
 
-.green {
+  .green {
     color: rgb(40, 202, 40);
-}
+  }
 
-.point {
+  .point {
     height: 10px;
     width: 10px;
     border-radius: 50%;
     margin: 0 auto;
     background: green;
-}
+  }
 
-.modaltitle {
+  .modaltitle {
     border-bottom: 1px solid #000;
     width: 5rem;
     padding: 0.2rem 0.5rem;
     margin-top: 1rem;
-}
+  }
 
-.icon-chuanfanguanli-chuanfanshenqing {
+  .icon-chuanfanguanli-chuanfanshenqing {
     color: '#02A7F0';
-}
-</style>
\ No newline at end of file
+  }
+</style>