From 0bb98a24529361e2821eb6e479a581bed56e2483 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: Tue, 13 Aug 2024 15:21:11 +0800
Subject: [PATCH] 08/13

---
 src/components/Form/src/BasicForm.vue         |   2 -
 .../Form/src/components/InputTextArea.vue     |   1 -
 .../Form/src/hooks/useFormEvents.ts           |   8 -
 src/components/Form/src/types/form.ts         |   1 -
 .../CurrentState/columns.tsx                  |   8 +-
 .../RentIn/TenantAuditStepModal.vue           | 114 ++-
 .../ContainerManagement/RentIn/columns.tsx    | 148 +++-
 .../StateChange/columns.tsx                   |   4 +-
 src/views/ContainerManagement/asd.json        | 163 ++--
 .../ContainerManagement/dsxxcl/columns.tsx    |   4 +-
 .../ContainerManagement/qbxdtbdrz/columns.tsx |   8 +-
 src/views/baseinfo/port/columns.tsx           |   3 +-
 src/views/operation/invoiceApply/api.js       |  24 -
 src/views/operation/invoiceApply/columns.tsx  | 309 +++++++-
 .../invoiceApply/detail/InvoiceDetails.vue    | 110 ++-
 .../operation/invoiceApply/detail/index.vue   | 342 +-------
 src/views/operation/invoiceApply/index.vue    | 349 ++++----
 .../operation/seaexport/detail/index.vue      | 338 ++++----
 .../seaexport/detail/modules/baseInfo.tsx     | 742 +++++++++---------
 .../seaexport/detail/modules/basicInfo.vue    |  19 +-
 .../seaexport/detail/modules/cargoInfo.vue    |   3 -
 .../seaexport/detail/modules/mailingInfo.vue  |   3 +-
 .../seaexport/detail/modules/otherInfo.vue    |  27 +-
 23 files changed, 1423 insertions(+), 1307 deletions(-)

diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index 225506b1..3111f7ec 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -181,7 +181,6 @@
         removeSchemaByField,
         resetFields,
         scrollToField,
-        linkageForm
       } = useFormEvents({
         emit,
         getProps,
@@ -281,7 +280,6 @@
         clearValidate,
         validateFields,
         validate,
-        linkageForm,
         submit: handleSubmit,
         scrollToField: scrollToField,
       }
diff --git a/src/components/Form/src/components/InputTextArea.vue b/src/components/Form/src/components/InputTextArea.vue
index 4e489748..399bb675 100644
--- a/src/components/Form/src/components/InputTextArea.vue
+++ b/src/components/Form/src/components/InputTextArea.vue
@@ -56,7 +56,6 @@
     setup(props, { emit }) {
       const attrs = useAttrs()
       const { t } = useI18n()
-      console.log(props)
       const [state] = useRuleFormItem(props, 'value', 'change')
       // 切割的字符数组
       const cutList = attrs.value.slice || []
diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts
index 0e1db052..2df78542 100644
--- a/src/components/Form/src/hooks/useFormEvents.ts
+++ b/src/components/Form/src/hooks/useFormEvents.ts
@@ -331,15 +331,7 @@ export function useFormEvents({
     }
   }
 
-    /**
-   * @description: Form submission
-   */
-    async function linkageForm(item) {
-      emit('linkageForm', item)
-    }
-
   return {
-    linkageForm,
     handleSubmit,
     clearValidate,
     validate,
diff --git a/src/components/Form/src/types/form.ts b/src/components/Form/src/types/form.ts
index e6e4eaa6..aae5d025 100644
--- a/src/components/Form/src/types/form.ts
+++ b/src/components/Form/src/types/form.ts
@@ -43,7 +43,6 @@ export interface FormActionType {
   validate: (nameList?: NamePath[]) => Promise<any>
   getFieldList: (nameList?: NamePath[]) => Promise<any>
   scrollToField: (name: NamePath, options?: ScrollOptions) => Promise<void>
-  linkageForm: () => Promise<void>
 }
 
 export type RegisterFn = (formInstance: FormActionType) => void
diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx
index 9f813d3d..a1df805c 100644
--- a/src/views/ContainerManagement/CurrentState/columns.tsx
+++ b/src/views/ContainerManagement/CurrentState/columns.tsx
@@ -123,8 +123,8 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '运输工具',
-    dataIndex: 'vehicleName',
+    title: '船名航次',
+    dataIndex: 'vesselVoyno',
     sorter: true,
     width: 200,
   },
@@ -636,8 +636,8 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'vehicleName',
-    label: '运输工具',
+    field: 'vesselVoyno',
+    label: '船名航次',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
index c5e8e2a1..83bd68f5 100644
--- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
@@ -28,7 +28,7 @@
               </a-button>
             </a-popconfirm>
             <a-button type="link" @click="handleSave(false)" class="pl0">
-              <span class="iconfont icon-baocun"></span>
+              <span class="iconfont icon-baocun" v-repeat></span>
               保存
             </a-button>
           </div>
@@ -50,6 +50,15 @@
             </hot-table>
           </div>
         </div>
+        <div class="SearchBox" v-if="TotTableType">
+          <BasicForm class="Form" @register="registerSearchBoxForm" />
+          <div class="ButtonBox">
+            <a-button size="default" @click="handleReset"> 重置 </a-button>
+            <a-button type="primary" size="default" class="mt-4" @click="handleSearch">
+              查询
+            </a-button>
+          </div>
+        </div>
         <div class="HotTable" v-if="TotTableType">
           <div>
             <a-button type="link" @click="ViewTableAdd" class="pl0">
@@ -105,6 +114,24 @@
     </a-tabs>
     <!--右下角按钮-->
     <template #footer>
+      <a-button
+        pre-icon="ant-design:check-circle-outlined"
+        type="primary"
+        :loading="loading"
+        :disabled="!rowId"
+        @click="Confirm()"
+      >
+        确认执行
+      </a-button>
+      <a-button
+        pre-icon="ant-design:check-circle-outlined"
+        type="primary"
+        :loading="loading"
+        :disabled="!rowId"
+        @click="Cancel()"
+      >
+        取消执行
+      </a-button>
       <a-button
         pre-icon="ant-design:close-outlined"
         type="warning"
@@ -135,7 +162,7 @@
         type="primary"
         :loading="loading"
         :disabled="!rowId"
-        @click="MakeFee(true)"
+        @click="MakeFee()"
       >
         生成费用
       </a-button>
@@ -150,7 +177,7 @@
   import { registerAllModules } from 'handsontable/registry'
   registerAllModules()
   import 'handsontable/dist/handsontable.full.css'
-  import { formSchema } from './columns'
+  import { formSchema, formSearchBoxSchema } from './columns'
   import {
     GetCtnSelectList,
     GetClientPortSelectList,
@@ -163,6 +190,8 @@
     ApiMakeFee,
     ApiDetailView,
     ApiAddCtn,
+    ApiConfirm,
+    ApiCancel,
   } from './api'
   import { GetClientListByCode } from '/@/api/common'
   import { useMessage } from '/@/hooks/web/useMessage'
@@ -172,6 +201,7 @@
   import DsFile from '/@/components/File/index.vue'
   // 应收表格组件
   import FeeTable from '/@/components/CostEntry/feeTable.vue'
+  import { json } from 'stream/consumers'
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
   const isUpdate = ref(true)
@@ -184,6 +214,7 @@
     showActionButtonGroup: false,
     submitFunc: submit,
   })
+
   const TotTableType = ref(false)
   async function submit() {
     const values = await validate()
@@ -213,7 +244,10 @@
         })
         submit()
         GetListDetail()
-        GetViewListDetail()
+        ViewlallCheck.value = false
+        ViewlsomeCheck.value = false
+        handleReset()
+        GetViewListDetail('[]')
       }
     } else {
       rowId.value = ''
@@ -221,9 +255,9 @@
     setModalProps({ loading: false })
   })
 
-  function GetViewListDetail() {
+  function GetViewListDetail(queryCondition) {
     ApiDetailView({
-      queryCondition: '[]',
+      queryCondition,
       pageCondition: { pageIndex: 1, pageSize: 999, sortConditions: [] },
     }).then((res) => {
       Viewlist.value.splice(0)
@@ -248,6 +282,16 @@
       notification.success({ message: res.message, duration: 3 })
     })
   }
+  function Confirm() {
+    ApiConfirm(rowId.value).then((res) => {
+      notification.success({ message: res.message, duration: 3 })
+    })
+  }
+  function Cancel() {
+    ApiCancel(rowId.value).then((res) => {
+      notification.success({ message: res.message, duration: 3 })
+    })
+  }
   async function handleSave(exit) {
     try {
       const values = await validate()
@@ -495,7 +539,7 @@
       source: async (query, process) => {
         const results = await optionsStore.getOptionsByCodeAsync('GetFeeCurrencySelectList')
         const dict = results.map((item: any) => {
-          return item.description
+          return item.codeName
         })
         process(dict)
       },
@@ -572,9 +616,9 @@
       data: 'mblno',
     },
     {
-      title: '运输工具',
+      title: '船名航次',
       width: 120,
-      data: 'vehicleName',
+      data: 'vesselVoyno',
     },
   ]
   const settings = {
@@ -675,6 +719,15 @@
     }
   }
   //--------------------------------------- tab1 View ---------------------------------------
+  const [
+    registerSearchBoxForm,
+    { resetFields: resetSearchBoxFields, validate: validateSearchBox },
+  ] = useForm({
+    labelWidth: 100,
+    schemas: formSearchBoxSchema,
+    showActionButtonGroup: false,
+    submitFunc: submit,
+  })
   const Viewlist = ref<any>([])
   // 全部勾选
   const ViewlallCheck = ref(false)
@@ -748,13 +801,35 @@
     // 定义所有单元格发生变化的回调处理
     async afterChange(changes, source) {},
   }
+  function handleReset() {
+    resetSearchBoxFields()
+    handleSearch()
+  }
+  async function handleSearch() {
+    const values = await validateSearchBox()
+    console.log(values)
+    let ApiData: any = []
+    Object.keys(values).forEach((item) => {
+      if (values[item]) {
+        console.log(values[item].split(','))
+
+        if (item == 'cntrno') {
+          ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 15 })
+        } else {
+          ApiData.push({ FieldName: item, FieldValue: values[item], ConditionalType: 1 })
+        }
+      }
+    })
+    GetViewListDetail(JSON.stringify(ApiData))
+  }
   function ViewTableAdd() {
-    let ApiData: any = { ids: [] }
-    list.value.forEach((e: any, i) => {
+    let ApiData: any = { id: rowId.value, ids: [] }
+    Viewlist.value.forEach((e: any, i) => {
       if (e.selected) {
-        list.value.splice(i, 1)
+        ApiData.ids.push(e.id)
       }
     })
+    console.log(ApiData.ids)
     if (ApiData.ids.length) {
       ApiAddCtn(ApiData).then(async (res) => {
         if (res.succeeded) {
@@ -762,14 +837,12 @@
           if (res.succeeded) {
             allCheck.value = false
             someCheck.value = false
-            setFieldsValue({
-              ...res.data,
-            })
             ViewlallCheck.value = false
             ViewlsomeCheck.value = false
             submit()
             GetListDetail()
-            GetViewListDetail()
+            handleReset()
+            GetViewListDetail('[]')
           }
           // getData(false)
           notification.success({ message: res.message, duration: 3 })
@@ -796,4 +869,13 @@
     position: absolute;
     left: 15px;
   }
+  .SearchBox {
+    display: flex;
+    .Form {
+      flex: 1;
+    }
+    .mt-4 {
+      margin-left: 10px;
+    }
+  }
 </style>
diff --git a/src/views/ContainerManagement/RentIn/columns.tsx b/src/views/ContainerManagement/RentIn/columns.tsx
index 0868725a..fffb35e5 100644
--- a/src/views/ContainerManagement/RentIn/columns.tsx
+++ b/src/views/ContainerManagement/RentIn/columns.tsx
@@ -22,6 +22,17 @@ const usedStateList = [
     value: 'new',
   },
 ]
+// 业务类型字典
+const businessTypeDict = ref([])
+getDictOption('CM_BusinessType').then((res) => {
+  businessTypeDict.value = res
+})
+// 租箱类型字典
+const rentTypeIdDict = ref([])
+getDictOption('CM_RentType').then((res) => {
+  rentTypeIdDict.value = res
+})
+
 export const columns: BasicColumn[] = [
   {
     title: '租箱业务号',
@@ -34,6 +45,15 @@ export const columns: BasicColumn[] = [
     dataIndex: 'businessType',
     sorter: true,
     width: 150,
+    customRender: ({ text }) => {
+      let RData = '-'
+      businessTypeDict.value.forEach((item: any) => {
+        if (text == item.value) {
+          RData = item.label
+        }
+      })
+      return RData
+    },
   },
   {
     title: '租箱业务',
@@ -43,9 +63,18 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '租箱类型',
-    dataIndex: 'rentType',
+    dataIndex: 'rentTypeId',
     sorter: true,
     width: 150,
+    customRender: ({ text }) => {
+      let RData = '-'
+      rentTypeIdDict.value.forEach((item: any) => {
+        if (text == item.value) {
+          RData = item.label
+        }
+      })
+      return RData
+    },
   },
   {
     title: '业务状态',
@@ -109,30 +138,54 @@ export const columns: BasicColumn[] = [
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'CtnName',
+    field: 'billno',
     label: '租箱业务号',
     component: 'Input',
     colProps: { span: 4 },
   },
   {
-    field: 'CtnName',
+    field: 'oldContainerOwner',
     label: '原箱主',
-    component: 'Input',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
     colProps: { span: 4 },
+    componentProps: ({ formModel }) => {
+      return {
+        allowClear: true,
+        showSearch: true,
+        api: GetClientListByCode,
+        params: { code: 'leasing' },
+        labelField: 'pinYinCode',
+        showName: 'shortName',
+        valueField: 'shortName',
+        resultField: 'data',
+        immediate: false,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
   },
 
   {
-    field: 'rentDirect',
+    field: 'rentDirectId',
     label: '租箱业务',
     component: 'ApiSelect',
     colProps: { span: 4 },
-    defaultValue: '',
-    componentProps: ({ formModel }) => {
+    componentProps: ({}) => {
       return {
         api: () => {
           return new Promise((resolve) => {
             getDictOption('CM_RentDirect').then((res) => {
-              resolve(res)
+              let data: any = []
+              res.forEach((item) => {
+                item.value = parseInt(item.value)
+                if (!item.label.indexOf('租入')) {
+                  data.push(item)
+                }
+              })
+              resolve(data)
             })
           })
         },
@@ -142,7 +195,6 @@ export const searchFormSchema: FormSchema[] = [
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
-        onChange: (v, obj) => {},
       }
     },
   },
@@ -182,7 +234,10 @@ export const formSchema: FormSchema[] = [
     label: '业务类型',
     component: 'ApiSelect',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: 101,
+    dynamicDisabled: ({}) => {
+      return true
+    },
     componentProps: ({}) => {
       return {
         api: () => {
@@ -210,16 +265,21 @@ export const formSchema: FormSchema[] = [
     label: '租箱业务',
     component: 'ApiSelect',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: 0,
     componentProps: ({ formModel, formActionType }) => {
       return {
         api: () => {
           return new Promise((resolve) => {
             getDictOption('CM_RentDirect').then((res) => {
+              let data: any = []
               res.forEach((item) => {
+                console.log(item)
                 item.value = parseInt(item.value)
+                if (!item.label.indexOf('租入')) {
+                  data.push(item)
+                }
               })
-              resolve(res)
+              resolve(data)
             })
           })
         },
@@ -245,7 +305,7 @@ export const formSchema: FormSchema[] = [
     label: '租箱类型',
     component: 'ApiSelect',
     colProps: { span: 6 },
-    defaultValue: '',
+    defaultValue: 1,
     componentProps: ({}) => {
       return {
         api: () => {
@@ -272,6 +332,9 @@ export const formSchema: FormSchema[] = [
     label: '业务状态',
     component: 'Input',
     colProps: { span: 6 },
+    dynamicDisabled: ({}) => {
+      return true
+    },
   },
   {
     field: 'oldContainerOwnerId',
@@ -319,8 +382,8 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 6 },
     defaultValue: '',
     componentProps: {
-      showTime: true,
       allowClear: true,
+      valueFormat: 'YYYY-MM-DD 00:00:00',
       style: 'width:100%',
     },
   },
@@ -366,3 +429,60 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 24 },
   },
 ]
+
+export const formSearchBoxSchema: FormSchema[] = [
+  {
+    field: 'oldContainerOwner',
+    label: '原箱主',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 6 },
+    componentProps: ({ formModel }) => {
+      return {
+        allowClear: true,
+        showSearch: true,
+        api: GetClientListByCode,
+        params: { code: 'leasing' },
+        labelField: 'pinYinCode',
+        showName: 'shortName',
+        valueField: 'shortName',
+        resultField: 'data',
+        immediate: false,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
+  },
+  {
+    field: 'ctnall',
+    label: '箱型',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 6 },
+    componentProps: () => {
+      return {
+        allowClear: true,
+        showSearch: true,
+        api: GetCtnSelectList,
+        params: { code: 'leasing' },
+        labelField: 'ctnName',
+        showName: 'ctnName',
+        valueField: 'ctnName',
+        resultField: 'data',
+        immediate: false,
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
+  },
+  {
+    field: 'cntrno',
+    label: '箱号',
+    component: 'Input',
+    colProps: { span: 10 },
+  },
+]
diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx
index bb8f27dd..97cf9271 100644
--- a/src/views/ContainerManagement/StateChange/columns.tsx
+++ b/src/views/ContainerManagement/StateChange/columns.tsx
@@ -452,8 +452,8 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'vehicleName',
-    label: '运输工具',
+    field: 'vesselVoyno',
+    label: '船名航次',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/ContainerManagement/asd.json b/src/views/ContainerManagement/asd.json
index c7c8c409..ea8b37f6 100644
--- a/src/views/ContainerManagement/asd.json
+++ b/src/views/ContainerManagement/asd.json
@@ -1,62 +1,103 @@
 {
-    "id": "",
-    "cntrno": "080801,080802",
-    "isOnlineId": "0",
-    "changeSourceId": "1",
-    "usedState": "used",
-    "ctnSourceId": "1",
-    "ctnBizState": "短租租出",
-    "ctnBizStateId": "6",
-    "billno": "WebTest001",
-    "ctnReleaseNo": "WebTest001",
-    "ctnStateId": "1",
-    "ctnBreakState": "WebTest001",
-    "isHeavy": true,
-    "port": "NINGBO",
-    "portid": "1816754346457698304",
-    "depot": "昭阳国际",
-    "vehicleName": "WebTest001",
-    "ctnall": "22G0",
-    "mblno": "WebTest001",
-    "customerName": "青岛东胜",
-    "customerId": "QDDS",
-    "etd": "2024-08-08T00:53:55.980Z",
-    "eta": "2024-08-08T00:54:08.455Z",
-    "changeTime": "2024-08-08T00:54:10.015Z",
-    "ctnWeight": 666,
-    "ctnValue_Base": 666
-  }
-  
-  
-  {
-    "id": "1821349203675320320",
-    "cntrno": "080801",
-    "ctnCode": null,
-    "ctnall": "22G0",
-    "usedState": "used",
-    "ctnOwner": null,
-    "ctnSourceId": 1,
-    "ctnSource": "短租租入",
-    "ctnBizStateId": 6,
-    "ctnBizState": "短租租出",
-    "billno": "WebTest001",
-    "ctnReleaseNo": null,
-    "ctnStateId": 1,
-    "ctnState": "可用",
-    "ctnBreakState": "WebTest001",
-    "isOnlineId": 0,
-    "isOnline": "待上线",
-    "isHeavy": true,
-    "portid": "1816754346457698304",
-    "port": null,
-    "depot": "昭阳国际",
-    "vehicleName": "WebTest001",
-    "mblno": "WebTest001",
-    "customerId": "",
-    "customerName": "青岛东胜",
-    "etd": "2024-08-08 00:53:55",
-    "eta": "2024-08-08 00:54:08",
-    "stateTime": "2024-08-08 00:54:10",
-    "ctnWeight": 0,
-    "ctnValue_Base": 0
-  },
\ No newline at end of file
+  "id": "1823192191728750592",
+  "businessType": 101,
+  "rentDirectId": 0,
+  "rentTypeId": 1,
+  "billState": null,
+  "oldContainerOwnerId": "1790269205392789504",
+  "oldContainerOwner": "青岛东胜",
+  "bsdate": "2024-08-13 00:00:00",
+  "accdate": "2024-11",
+  "isBusinessLocking": false,
+  "isFeeLocking": false,
+  "remark": "测试租入1",
+  "bodyList": [
+    {
+      "id": "1823193258684190720",
+      "pid": "1823192191728750592",
+      "cntrno": "RENTIN002",
+      "ctnCode": "22G0",
+      "ctnall": "20GP",
+      "oldContainerOwnerId": "1790269205392789504",
+      "oldContainerOwner": null,
+      "rentDirectId": 0,
+      "rentDirect": "租入",
+      "rentTypeId": 1,
+      "rentType": "长租",
+      "ctnReleaseNo": "releaseno001",
+      "bsdate": "2024-08-13 06:03:27",
+      "feeStartDate": "2024-08-13",
+      "currency": "USD",
+      "dailyRate": 0,
+      "pickupFee": 0,
+      "pickupDate": "2024-08-05",
+      "dropoffFee": 0,
+      "dropoffDate": "2024-08-06",
+      "pickupPortid": "1816307156580962304",
+      "pickupPortCode": "AUSYD",
+      "pickupPort": "SYDNEY, AUSTRALIA",
+      "dropoffPortid": "1795717773662490624",
+      "dropoffPortCode": "1212",
+      "dropoffPort": "Test001",
+      "mblno": "2214",
+      "vehicleName": "2214",
+      "rentDetailId": "",
+      "selected": false
+    },
+    {
+      "id": "1823192516082667520",
+      "pid": "1823192191728750592",
+      "cntrno": "RENTIN001",
+      "ctnCode": "22G0",
+      "ctnall": "20GP",
+      "oldContainerOwnerId": "1790269205392789504",
+      "oldContainerOwner": null,
+      "rentDirectId": 0,
+      "rentDirect": "租入",
+      "rentTypeId": 1,
+      "rentType": "长租",
+      "ctnReleaseNo": "releaseno001",
+      "bsdate": "2024-08-13",
+      "feeStartDate": "2024-08-01 00:00:00",
+      "currency": "美元",
+      "dailyRate": 2,
+      "pickupFee": 10,
+      "pickupDate": "2024-08-01 00:00:00",
+      "dropoffFee": 10,
+      "dropoffDate": "2024-08-02",
+      "pickupPortid": "1816306937097228288",
+      "pickupPortCode": "CNTAO",
+      "pickupPort": "QINGDAO,CHINA",
+      "dropoffPortid": "1816306937097228288",
+      "dropoffPortCode": "CNTAO",
+      "dropoffPort": "QINGDAO,CHINA",
+      "mblno": "MBLNO0001",
+      "vehicleName": "船名/航次RentIn1",
+      "rentDetailId": "",
+      "selected": false
+    },
+    {
+      "selected": false,
+      "pickupDate": "2024-08-13",
+      "dropoffDate": "2024-08-13",
+      "feeStartDate": "2024-08-13",
+      "bsdate": "2024-08-13",
+      "cntrno": "RENTIN002",
+      "ctnall": "20RF",
+      "ctnCode": "22R0",
+      "ctnReleaseNo": "releaseno001",
+      "currency": "日元",
+      "dailyRate": 2,
+      "pickupFee": 10,
+      "dropoffFee": 10,
+      "dropoffPort": "CALLAO",
+      "dropoffPortid": "1763399503139966976",
+      "dropoffPortCode": "2123",
+      "mblno": "MBLNO0001",
+      "vehicleName": "2214",
+      "pickupPort": "Test001",
+      "pickupPortid": "1795717773662490624",
+      "pickupPortCode": "1212"
+    }
+  ]
+}
diff --git a/src/views/ContainerManagement/dsxxcl/columns.tsx b/src/views/ContainerManagement/dsxxcl/columns.tsx
index fedfd82d..573223b5 100644
--- a/src/views/ContainerManagement/dsxxcl/columns.tsx
+++ b/src/views/ContainerManagement/dsxxcl/columns.tsx
@@ -108,8 +108,8 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '运输工具',
-    dataIndex: 'vehicleName',
+    title: '船名航次',
+    dataIndex: 'vesselVoyno',
     sorter: true,
     width: 200,
   },
diff --git a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
index caaa7c95..a42edb3c 100644
--- a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
+++ b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
@@ -91,8 +91,8 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '运输工具',
-    dataIndex: 'vehicleName',
+    title: '船名航次',
+    dataIndex: 'vesselVoyno',
     sorter: true,
     width: 200,
   },
@@ -407,8 +407,8 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'vehicleName',
-    label: '运输工具',
+    field: 'vesselVoyno',
+    label: '船名航次',
     component: 'Input',
     colProps: { span: 6 },
   },
diff --git a/src/views/baseinfo/port/columns.tsx b/src/views/baseinfo/port/columns.tsx
index 86e4b03b..3b534bc9 100644
--- a/src/views/baseinfo/port/columns.tsx
+++ b/src/views/baseinfo/port/columns.tsx
@@ -241,8 +241,7 @@ export const formSchema: FormSchema[] = [
     field: 'ediCode',
     label: 'EDI代码',
     component: 'Input',
-    required: true,
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
 
   {
diff --git a/src/views/operation/invoiceApply/api.js b/src/views/operation/invoiceApply/api.js
index 1da83b61..312128da 100644
--- a/src/views/operation/invoiceApply/api.js
+++ b/src/views/operation/invoiceApply/api.js
@@ -104,29 +104,5 @@ export function InvoiceApplicationDelete(parameter) {
   })
 }
 
-export function ApplyAudit(parameter) {
-  return request({
-    url: '/feeApi/InvoiceApplication/ApplyAudit',
-    method: 'post',
-    data: parameter,
-  })
-}
-
-
-export function Withdraw(parameter) {
-  return request({
-    url: '/feeApi/InvoiceApplication/Withdraw',
-    method: 'post',
-    data: parameter,
-  })
-}
-
-export function InvoiceApplicationBizSave(parameter) {
-  return request({
-    url: '/feeApi/InvoiceApplication/BizSave',
-    method: 'post',
-    data: parameter,
-  })
-}
 
 
diff --git a/src/views/operation/invoiceApply/columns.tsx b/src/views/operation/invoiceApply/columns.tsx
index f50de83f..2606491e 100644
--- a/src/views/operation/invoiceApply/columns.tsx
+++ b/src/views/operation/invoiceApply/columns.tsx
@@ -1,7 +1,7 @@
 import { ref } from 'vue'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { getOptions } from '/@/hooks/dict'
-
+import dayjs from 'dayjs'
 export const businessTypeList = [
   { value: 1, label: '海运出口' },
 ]
@@ -25,7 +25,13 @@ const FeeRangeList = [
   { value: 8, label: '已对账未结算' },
   { value: 9, label: '未收未付' },
 ]
-
+const CategoryData = [
+  { value: 0, label: '普通发票' },
+  { value: 1, label: '电子发票' },
+  { value: 2, label: '纸质发票' },
+]
+const bankList = ref([]) as any
+const customerList = ref([]) as any
 import {
   GetControllerClientList,GetCustomerServiceList
 } from '/@/views/operation/seaexport/api/BookingLedger'
@@ -268,6 +274,305 @@ export const columns: BasicColumn[] = [
   },
 ]
 
+export const detailForm: FormSchema[] = [
+  {
+    field: 'id',
+    label: 'id',
+    component: 'Input',
+    show: false,
+  },
+  {
+    field: 'applicationNO',
+    label: '申请单号',
+    component: 'Input',
+    dynamicDisabled: true,
+    colProps: { span: 4 },
+  },
+  {
+    field: 'statusText',
+    label: '状态',
+    component: 'Input',
+    dynamicDisabled: true,
+    colProps: { span: 4 },
+  },
+  {
+    field: 'createByName',
+    label: '申请人',
+    component: 'Input',
+    dynamicDisabled: true,
+    colProps: { span: 4 },
+  },
+  {
+    field: 'applyDate',
+    label: '申请开票日期',
+    component: 'DatePicker',
+    colProps: { span: 4 },
+    defaultValue: dayjs().format('YYYY-MM-DD'),
+    componentProps: {
+      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD',
+    },
+  },
+  {
+    field: 'invoiceNO',
+    label: '发票号',
+    component: 'Input',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'AcutalInvoiceNO',
+    label: '实际发票号',
+    dynamicDisabled: true,
+    component: 'Input',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'invoiceHeader',
+    label: '发票抬头',
+    component: 'Input',
+    colProps: { span: 12 },
+  },
+  {
+    field: 'taxID',
+    label: '纳税人识别号',
+    component: 'Input',
+    colProps: { span: 12 },
+  },
+  {
+    field: 'customerAddTel',
+    label: '地址电话',
+    component: 'Input',
+    colProps: { span: 12 },
+  },
+  {
+    field: 'customerBank',
+    label: '开户行及账号',
+    component: 'Input',
+    show: false,
+    colProps: { span: 12 },
+  },
+  {
+    field: 'customerBankId',
+    label: '开户行及账号',
+    colProps: { span: 12 },
+    component: 'Select',
+    componentProps: ({ formModel }) => {
+      return {
+        options: bankList.value,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+        onChange: (e, obj) => {
+          if (obj) {
+            bankList.value.forEach(item => {
+              if (item.id == e) {
+                formModel.customerBank = item
+              }
+            })
+          }
+          if (!obj && !e) {
+            formModel.customerBank = {}
+          }
+        },
+      }
+    },
+  },
+  {
+    field: 'currency',
+    label: '币别',
+    defaultValue: 'CNY',
+    component: 'ApiSelect',
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        api: GetFeeCurrencySelectList,
+        labelField: 'name',
+        valueField: 'codeName',
+        resultField: 'data',
+      }
+    },
+  },
+  {
+    field: 'category',
+    label: '申请类型',
+    component: 'Select',
+    colProps: { span: 4 },
+    componentProps: {
+      options: CategoryData,
+    },
+  },
+  {
+    field: 'invoiceCurrency',
+    label: '发票币别',
+    defaultValue: 'CNY',
+    component: 'ApiSelect',
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        api: GetFeeCurrencySelectList,
+        labelField: 'name',
+        valueField: 'codeName',
+        resultField: 'data',
+      }
+    },
+  },
+  {
+    field: 'customerName',
+    label: '委托单位',
+    component: 'Input',
+    show: false,
+    colProps: { span: 12 },
+  },
+  {
+    field: 'customer',
+    label: '委托单位',
+    component: 'Input',
+    show: false,
+    colProps: { span: 12 },
+  },
+  {
+    label: '委托单位',
+    field: 'customerId',
+    required: true,
+    component: 'ApiSelect',
+    dynamicDisabled: false,
+    colProps: { span: 4 },
+    componentProps: ({ formModel }) => {
+      return {
+        allowClear: true,
+        showSearch: true,
+        api: () => {
+          return new Promise((resolve) => {
+            const arr = getOptions('controller')
+            resolve(arr)
+          })
+        },
+        labelField: 'name',
+        valueField: 'id',
+        showName: 'shortName',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+        onChange: (e, obj) => {
+          if (obj) {
+            const queryStr = [{
+              FieldName: 'ClientId',
+              FieldValue: obj.id,
+              ConditionalType: '0'
+            }]
+            const data = {
+              pageCondition: {
+                "pageIndex": 1,
+                "pageSize": 20,
+                "sortConditions": []
+              },
+              queryCondition: JSON.stringify(queryStr)
+            }
+            GetClientBankList(data).then(res => {
+              res.data.forEach(item => {
+                item.name = item.bankName + '  ' + item.bankAgentName
+              })
+              bankList.value = res.data
+            })
+            formModel.customerName = obj.label
+            customerList.value.forEach(item => {
+              if (item.id == e) {
+                formModel.customer = item
+              }
+            })
+          }
+          if (!obj && !e) {
+            bankList.value = []
+            formModel.customer = {}
+            formModel.customerName = ''
+          }
+        },
+      }
+    },
+  },
+  {
+    label: '代开客户',
+    field: 'autualCustomerName',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        api: () => {
+          return new Promise((resolve) => {
+            GetControllerClientList().then((res) => {
+              resolve(res)
+            })
+          })
+        },
+        immediate: false,
+        labelField: 'shortName',
+        valueField: 'shortName',
+        resultField: 'data',
+        filterOption: (input: string, option: any) => {
+          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        },
+      }
+    },
+  },
+  {
+    field: 'applyAmount',
+    label: '申请金额',
+    component: 'InputNumber',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'invoiceAmount',
+    label: '开票金额',
+    component: 'InputNumber',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'taxRate',
+    label: '开票税率',
+    component: 'InputNumber',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'otherCurrencyAmount',
+    label: '外币金额',
+    component: 'InputNumber',
+    colProps: { span: 4 },
+  },
+  {
+    field: 'saleDeptId',
+    label: '所属分部',
+    component: 'ApiSelect',
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        api: GetOrgList,
+        resultField: 'data',
+      }
+    },
+  },
+  {
+    field: 'note',
+    label: '',
+    component: 'InputTextArea',
+    colProps: { span: 12 },
+    slot: 'note',
+  },
+  {
+    field: 'invoiceRemark',
+    label: '开票要求',
+    component: 'InputTextArea',
+    colProps: { span: 12 },
+    componentProps: () => {
+      return {
+        autoSize: { minRows: 4, maxRows: 7 }
+      }
+    },
+  },
+]
 
 export const detailColumns: BasicColumn[] = [
   {
diff --git a/src/views/operation/invoiceApply/detail/InvoiceDetails.vue b/src/views/operation/invoiceApply/detail/InvoiceDetails.vue
index 833d93da..e2c62014 100644
--- a/src/views/operation/invoiceApply/detail/InvoiceDetails.vue
+++ b/src/views/operation/invoiceApply/detail/InvoiceDetails.vue
@@ -1,56 +1,55 @@
 <template>
     <a-modal width="1400px" @cancel="open = false" :visible="open" title="添加发票申请明细" :footer="null">
-        <div style="padding-bottom: 20px;" >
-            <BasicTable class="ds-table" @row-click="handleClick" @register="registerTable" @row-dbClick="(e) => {
-                GoDetailed(true, e)
-            }
-                ">
-                <template #tableTitle>
-                    <a-button v-repeat type="link" @click="GoDetailed(false, null)">
-                        <span class="iconfont icon-new_document"></span>
-                        添加
-                    </a-button>
-                </template>
-                <template v-slot:bodyCell="{ column, record }">
-                    <template v-if="column.dataIndex == 'businessType'">
-                        <span v-if="record.businessType == 1">海运出口</span>
-                    </template>
-                </template>
-                <template #footer>
-                    <div class="total">
-                        <span style="margin-right: 10px;">合计:</span>
-                        <span class="total-item">
-                            <span class="text">RMB未开:</span>
-                            <span class="number">{{ rmbTotal }}</span>
-                        </span>
-                        <span class="total-item">
-                            <span class="text">USD未开:</span>
-                            <span class="number">{{ usdTotal }}</span>
-                        </span>
-                        <span class="total-item">
-                            <span class="text">其他未开:</span>
-                            <span class="number">{{ otherTotal }}</span>
-                        </span>
-                    </div>
-                </template>
-            </BasicTable>
-            <div>
-                <a-button type="link" @click="handleAddDetial">
-                    <span class="iconfont icon-jia"></span>
+        <BasicTable class="ds-table" @row-click="handleClick" @register="registerTable" @row-dbClick="(e) => {
+            GoDetailed(true, e)
+        }
+            ">
+            <template #tableTitle>
+
+            </template>
+            <template #toolbar>
+                <a-button v-repeat type="link" @click="GoDetailed(false, null)">
+                    <span class="iconfont icon-new_document"></span>
                     添加
                 </a-button>
-            </div>
-            <a-table :pagination="false" rowKey="recordId"
-                :row-selection="{ selectedRowKeys: selectedRowKeysDetial, onChange: onSelectChangeDetail }"
-                :loading="loading" :columns="columns" :data-source="dataSource" bordered>
-                <template v-slot:bodyCell="{ column, record }">
-                    <template v-if="column.dataIndex == 'applyAmount'">
-                        <a-input-number size="small" :controls="false" :max="record.restAmount"
-                            v-model:value="record.applyAmount" />
-                    </template>
+            </template>
+            <template v-slot:bodyCell="{ column, record }">
+                <template v-if="column.dataIndex == 'businessType'">
+                    <span v-if="record.businessType == 1">海运出口</span>
                 </template>
-            </a-table>
+            </template>
+            <template #footer>
+                <div class="total">
+                    <span style="margin-right: 10px;">合计:</span>
+                    <span class="total-item">
+                        <span class="text">RMB未开:</span>
+                        <span class="number">{{ rmbTotal }}</span>
+                    </span>
+                    <span class="total-item">
+                        <span class="text">USD未开:</span>
+                        <span class="number">{{ usdTotal }}</span>
+                    </span>
+                    <span class="total-item">
+                        <span class="text">其他未开:</span>
+                        <span class="number">{{ otherTotal }}</span>
+                    </span>
+                </div>
+            </template>
+        </BasicTable>
+        <div>
+            <a-button type="link" @click="handleAddDetial">
+                <span class="iconfont icon-jia"></span>
+                添加
+            </a-button>
         </div>
+        <a-table  rowKey="recordId" :row-selection="{ selectedRowKeys: selectedRowKeysDetial, onChange: onSelectChangeDetail }"
+            :loading="loading" :columns="columns" :data-source="dataSource" bordered>
+            <template v-slot:bodyCell="{ column, record }">
+                <template v-if="column.dataIndex == 'applyAmount'">
+                    <a-input-number size="small" :controls="false" :max="record.restAmount" v-model:value="record.applyAmount"/>
+                </template>
+            </template>
+        </a-table>
     </a-modal>
 </template>
 <script lang="ts" setup>
@@ -58,7 +57,7 @@ import { formatParams } from '/@/hooks/web/common'
 import { ref, defineExpose, unref } from 'vue'
 import { BasicTable, useTable, TableAction } from '/@/components/Table'
 import { detailColumns, detailSearchFormSchema, businessTypeList } from '../columns'
-import { GetBizList, InvoiceApplicationGetFees, InvoiceApplicationSave } from '../api.js'
+import { GetBizList, InvoiceApplicationGetFees,InvoiceApplicationSave } from '../api.js'
 const open = ref(false)
 
 const [registerTable, { getForm, setSelectedRowKeys, getSelectRows, setProps, getRawDataSource }] = useTable({
@@ -162,7 +161,7 @@ function handleClick(record, index) {
     InvoiceApplicationGetFees([data]).then(res => {
         if (res.succeeded) {
             dataSource.value = res.data.items
-            dataSource.value.forEach(item => {
+            dataSource.value.forEach(item=>{
                 item.applyAmount = item.restAmount ? item.restAmount : 0
             })
         }
@@ -200,20 +199,20 @@ function onSelectChange(selectedRowKeys) {
 const emits = defineEmits(['updateList'])
 function handleAddDetial() {
     const arr = [] as any
-    dataSource.value.forEach(item => {
-        selectedRowKeysDetial.value.forEach(ite => {
-            if (item.recordId == ite) {
+    dataSource.value.forEach(item=>{
+        selectedRowKeysDetial.value.forEach(ite=>{
+            if(item.recordId == ite){
                 arr.push(item)
             }
         })
     })
-    arr.forEach(item => {
+    arr.forEach(item=>{
         item.originalCurrency = item.currency
         item.originalAmount = item.applyAmount
         item.originalProcessedAmount = item.processedAmount ? item.processedAmount : 0
     })
     emits('updateList', arr)
-
+    
 }
 const selectedRowKeysDetial = ref([]) as any
 function onSelectChangeDetail(selectedRowKeys) {
@@ -244,8 +243,7 @@ defineExpose({ init })
     padding: 0px !important;
     background: white;
 }
-
-/deep/ .ant-table-container {
+/deep/ .ant-table-container{
     padding: 0px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/operation/invoiceApply/detail/index.vue b/src/views/operation/invoiceApply/detail/index.vue
index d97b183d..abf59c0b 100644
--- a/src/views/operation/invoiceApply/detail/index.vue
+++ b/src/views/operation/invoiceApply/detail/index.vue
@@ -37,9 +37,8 @@
                 </div>
             </a-modal>
             <a-modal @cancel="nameFlag = false" width="700px" :visible="nameFlag" title="提取发票备注" @ok="handleRender">
-                <a-select v-model:value="tempNameId" style="width: 80%">
-                    <a-select-option :value="item.id" v-for="(item, index) in tempList" :key="index">{{ item.name
-                        }}</a-select-option>
+                <a-select  v-model:value="tempNameId" style="width: 80%">
+                    <a-select-option :value="item.id" v-for="(item,index) in tempList" :key="index" >{{ item.name }}</a-select-option>
                 </a-select>
             </a-modal>
         </a-spin>
@@ -49,312 +48,11 @@
 import { ref, onMounted, unref } from 'vue'
 import { BasicForm, useForm } from '/@/components/Form/index'
 import { AutoComplete } from 'ant-design-vue'
+import { detailForm } from '../columns'
 import feeTable from './feeTable.vue';
-import { InvoiceApplicationSave, InvoiceApplicationGet, GetTemplateFields, SaveTemplate, GetTemplateList, RenderTemplate, GetClientBankList, GetOrgList } from '../api'
+import { InvoiceApplicationSave, InvoiceApplicationGet, GetTemplateFields, SaveTemplate, GetTemplateList,RenderTemplate } from '../api'
 import { useMessage } from '/@/hooks/web/useMessage'
 import { useRoute } from 'vue-router'
-import {
-    GetControllerClientList, GetCustomerServiceList
-} from '/@/views/operation/seaexport/api/BookingLedger'
-import { GetFeeCurrencySelectList, GetClientListByCode } from '/@/api/common'
-import dayjs from 'dayjs'
-const CategoryData = [
-    { value: 0, label: '普通发票' },
-    { value: 1, label: '电子发票' },
-    { value: 2, label: '纸质发票' },
-]
-const bankList = ref([]) as any
-const customerList = ref([]) as any
-const detailForm = [
-    {
-        field: 'id',
-        label: 'id',
-        component: 'Input',
-        show: false,
-    },
-    {
-        field: 'applicationNO',
-        label: '申请单号',
-        component: 'Input',
-        dynamicDisabled: true,
-        colProps: { span: 4 },
-    },
-    {
-        field: 'statusText',
-        label: '状态',
-        component: 'Input',
-        dynamicDisabled: true,
-        colProps: { span: 4 },
-    },
-    {
-        field: 'createByName',
-        label: '申请人',
-        component: 'Input',
-        dynamicDisabled: true,
-        colProps: { span: 4 },
-    },
-    {
-        field: 'applyDate',
-        label: '申请开票日期',
-        component: 'DatePicker',
-        colProps: { span: 4 },
-        defaultValue: dayjs().format('YYYY-MM-DD'),
-        componentProps: {
-            valueFormat: 'YYYY-MM-DD',
-            format: 'YYYY-MM-DD',
-        },
-    },
-    {
-        field: 'invoiceNO',
-        label: '发票号',
-        component: 'Input',
-        colProps: { span: 4 },
-    },
-    {
-        field: 'AcutalInvoiceNO',
-        label: '实际发票号',
-        dynamicDisabled: true,
-        component: 'Input',
-        colProps: { span: 4 },
-    },
-    {
-        field: 'invoiceHeader',
-        label: '发票抬头',
-        component: 'Input',
-        colProps: { span: 12 },
-    },
-    {
-        field: 'taxID',
-        label: '纳税人识别号',
-        component: 'Input',
-        colProps: { span: 12 },
-    },
-    {
-        field: 'customerAddTel',
-        label: '地址电话',
-        component: 'Input',
-        colProps: { span: 12 },
-    },
-    {
-        field: 'customerBank',
-        label: '开户行及账号',
-        component: 'Input',
-        show: false,
-        colProps: { span: 12 },
-    },
-    {
-        field: 'customerBankId',
-        label: '开户行及账号',
-        colProps: { span: 12 },
-        component: 'Select',
-        componentProps: ({ formModel }) => {
-            return {
-                options: bankList.value,
-                fieldNames: {
-                    label: 'name',
-                    value: 'id',
-                },
-                onChange: (e, obj) => {
-                    if (obj) {
-                        bankList.value.forEach(item => {
-                            if (item.id == e) {
-                                formModel.customerBank = item
-                            }
-                        })
-                    }
-                    if (!obj && !e) {
-                        formModel.customerBank = {}
-                    }
-                },
-            }
-        },
-    },
-    {
-        field: 'currency',
-        label: '币别',
-        defaultValue: 'CNY',
-        component: 'ApiSelect',
-        colProps: { span: 4 },
-        componentProps: () => {
-            return {
-                api: GetFeeCurrencySelectList,
-                labelField: 'name',
-                valueField: 'codeName',
-                resultField: 'data',
-            }
-        },
-    },
-    {
-        field: 'category',
-        label: '申请类型',
-        component: 'Select',
-        colProps: { span: 4 },
-        componentProps: {
-            options: CategoryData,
-        },
-    },
-    {
-        field: 'invoiceCurrency',
-        label: '发票币别',
-        defaultValue: 'CNY',
-        component: 'ApiSelect',
-        colProps: { span: 4 },
-        componentProps: () => {
-            return {
-                api: GetFeeCurrencySelectList,
-                labelField: 'name',
-                valueField: 'codeName',
-                resultField: 'data',
-            }
-        },
-    },
-    {
-        field: 'customer',
-        label: '委托单位',
-        component: 'Input',
-        show: false,
-        colProps: { span: 12 },
-    },
-    {
-        field: 'customerId',
-        label: '委托单位',
-        component: 'Input',
-        show: false,
-        colProps: { span: 12 },
-    },
-    {
-        label: '委托单位',
-        field: 'customerName',
-        required: true,
-        component: 'ApiSelect',
-        colProps: { span: 4 },
-        componentProps: ({ formModel }) => {
-            return {
-                api: GetClientListByCode,
-                params: { code: 'controller' },
-                labelField: 'pinYinCode',
-                valueField: 'shortName',
-                showName: 'shortName',
-                resultField: 'data',
-                immediate: false,
-                onChange: (e, obj) => {
-                    if (obj) {
-                        const queryStr = [{
-                            FieldName: 'ClientId',
-                            FieldValue: obj.id,
-                            ConditionalType: '0'
-                        }]
-                        const data = {
-                            pageCondition: {
-                                "pageIndex": 1,
-                                "pageSize": 20,
-                                "sortConditions": []
-                            },
-                            queryCondition: JSON.stringify(queryStr)
-                        }
-                        GetClientBankList(data).then(res => {
-                            res.data.forEach(item => {
-                                item.name = item.bankName + '  ' + item.bankAgentName
-                            })
-                            bankList.value = res.data
-                        })
-                        formModel.customerId = obj.id
-                        customerList.value.forEach(item => {
-                            if (item.id == e) {
-                                formModel.customer = item
-                            }
-                        })
-                    }
-                    if (!obj && !e) {
-                        bankList.value = []
-                        formModel.customer = {}
-                        formModel.customerId = ''
-                    }
-                },
-            }
-        },
-    },
-    {
-        label: '代开客户',
-        field: 'autualCustomerName',
-        component: 'ApiSelect',
-        required: false,
-        dynamicDisabled: false,
-        colProps: { span: 4 },
-        componentProps: () => {
-            return {
-                api: () => {
-                    return new Promise((resolve) => {
-                        GetControllerClientList().then((res) => {
-                            resolve(res)
-                        })
-                    })
-                },
-                immediate: false,
-                labelField: 'shortName',
-                valueField: 'shortName',
-                resultField: 'data',
-                filterOption: (input: string, option: any) => {
-                    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                },
-            }
-        },
-    },
-    {
-        field: 'applyAmount',
-        label: '申请金额',
-        component: 'InputNumber',
-        colProps: { span: 4 },
-    },
-    {
-        field: 'invoiceAmount',
-        label: '开票金额',
-        component: 'InputNumber',
-        colProps: { span: 4 },
-    },
-    {
-        field: 'taxRate',
-        label: '开票税率',
-        component: 'InputNumber',
-        colProps: { span: 4 },
-    },
-    {
-        field: 'otherCurrencyAmount',
-        label: '外币金额',
-        component: 'InputNumber',
-        colProps: { span: 4 },
-    },
-    {
-        field: 'saleDeptId',
-        label: '所属分部',
-        component: 'ApiSelect',
-        colProps: { span: 4 },
-        componentProps: () => {
-            return {
-                api: GetOrgList,
-                resultField: 'data',
-            }
-        },
-    },
-    {
-        field: 'note',
-        label: '',
-        component: 'InputTextArea',
-        colProps: { span: 12 },
-        slot: 'note',
-    },
-    {
-        field: 'invoiceRemark',
-        label: '开票要求',
-        component: 'InputTextArea',
-        colProps: { span: 12 },
-        componentProps: () => {
-            return {
-                autoSize: { minRows: 4, maxRows: 7 }
-            }
-        },
-    },
-]
 const route = useRoute()
 const { createMessage } = useMessage()
 const id = ref(route.query.id)
@@ -447,28 +145,8 @@ function getDetail() {
     InvoiceApplicationGet({ id: id.value }).then(res => {
         if (res.succeeded) {
             setFieldsValue(res.data)
-            const queryStr = [{
-                FieldName: 'ClientId',
-                FieldValue: res.data.customerId,
-                ConditionalType: '0'
-            }]
-            const data = {
-                pageCondition: {
-                    "pageIndex": 1,
-                    "pageSize": 20,
-                    "sortConditions": []
-                },
-                queryCondition: JSON.stringify(queryStr)
-            }
-            GetClientBankList(data).then(res => {
-                res.data.forEach(item => {
-                    item.name = item.bankName + '  ' + item.bankAgentName
-                })
-                bankList.value = res.data
-            })
         }
     })
-
 }
 function openTempName() {
     nameFlag.value = true
@@ -483,18 +161,18 @@ function updateListSave() {
 
 }
 const tempNameId = ref('')
-function handleRender() {
+function handleRender(){
     let temp = ''
-    tempList.value.forEach(item => {
-        if (item.id == tempNameId.value) {
+    tempList.value.forEach(item=>{
+        if(item.id==tempNameId.value){
             temp = item.content
         }
     })
-    const data = {
-        id: id.value,
+    const data  = {
+        id:id.value,
         template: temp
     }
-    RenderTemplate(data).then(res => {
+    RenderTemplate(data).then(res=>{
 
     })
 
diff --git a/src/views/operation/invoiceApply/index.vue b/src/views/operation/invoiceApply/index.vue
index 5efa24d5..9b83a987 100644
--- a/src/views/operation/invoiceApply/index.vue
+++ b/src/views/operation/invoiceApply/index.vue
@@ -1,10 +1,15 @@
 <template>
   <div>
     <div class="topTable">
-      <BasicTable class="ds-table" @register="registerTable" @row-dbClick="(e) => {
-          GoDetailed(true, e)
-        }
-        ">
+      <BasicTable
+        class="ds-table"
+        @register="registerTable"
+        @row-dbClick="
+          (e) => {
+            GoDetailed(true, e)
+          }
+        "
+      >
         <template #tableTitle>
           <div class="buttonGroup">
             <a-button v-repeat type="link">
@@ -15,11 +20,11 @@
               <span class="iconfont icon-locksuo IconColor"></span>
               导出EXCEL
             </a-button>
-            <a-button @click="handleApply" v-repeat type="link">
+            <a-button v-repeat type="link">
               <span class="iconfont icon-locksuo IconColor"></span>
               提交审核
             </a-button>
-            <a-button @click="handleWithdraw" v-repeat type="link">
+            <a-button v-repeat type="link">
               <span class="iconfont icon-locksuo IconColor"></span>
               撤销审核
             </a-button>
@@ -30,7 +35,12 @@
             <span class="iconfont icon-new_document"></span>
             添加
           </a-button>
-          <a-popconfirm title="确定删除当前选中数据？" ok-text="是" cancel-text="否" @confirm="FnDel">
+          <a-popconfirm
+            title="确定删除当前选中数据？"
+            ok-text="是"
+            cancel-text="否"
+            @confirm="FnDel"
+          >
             <a-button type="link">
               <span class="iconfont icon-shanchu21"></span>
               删除
@@ -43,15 +53,17 @@
         </template>
         <template v-slot:bodyCell="{ column, record }">
           <template v-if="column.key === 'action'">
-            <TableAction :actions="[
-              {
-                icon: 'clarity:note-edit-line',
-                tooltip: '编辑',
-                onClick: () => {
-                  GoDetailed(true, record)
+            <TableAction
+              :actions="[
+                {
+                  icon: 'clarity:note-edit-line',
+                  tooltip: '编辑',
+                  onClick: () => {
+                    GoDetailed(true, record)
+                  },
                 },
-              },
-            ]" />
+              ]"
+            />
           </template>
         </template>
       </BasicTable>
@@ -69,186 +81,149 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref } from 'vue'
-import { GetList, InvoiceApplicationDelete, Withdraw, ApplyAudit } from './api.js'
-import { BasicTable, useTable, TableAction } from '/@/components/Table'
-import { columns, searchFormSchema, billTypeData } from './columns'
-import { GetOpenPrintModuleList } from '/@/views/operation/seaexport/api/BookingLedger.js'
-import * as XLSX from 'xlsx'
-import DsPrint from '/@/components/Print/index.vue'
-import { useMessage } from '/@/hooks/web/useMessage'
-const { notification } = useMessage()
-const { createMessage } = useMessage()
-import { useGo } from '/@/hooks/web/usePage'
-const go = useGo()
-// 引入处理入参方法
-import { formatParams } from '/@/hooks/web/common'
-import { useAppStore } from '/@/store/modules/app'
-const appStore = useAppStore()
-//   表格
-const [registerTable, { reload, getPaginationRef, getSelectRows, getRawDataSource }] = useTable({
-  title: '',
-  api: async (p) => {
-    const res: API.DataResult = await GetList(p)
-    return new Promise((resolve) => {
-      resolve({ data: [...res.data], total: res.count })
-    })
-  },
-  // 请求前的参数格式化
-  beforeFetch: (p) => {
-    return formatParams(p)
-  },
-  columns,
-  formConfig: {
-    labelWidth: 120,
-    schemas: searchFormSchema,
-    useAdvancedSearch: true,
-  },
-  isTreeTable: false,
-  pagination: true,
-  striped: true,
-  useSearchForm: true,
-  showTableSetting: true,
-  bordered: true,
-  showIndexColumn: true,
-  indexColumnProps: {
-    width: 60,
-  },
-  canResize: true,
-  immediate: true,
-  actionColumn: {
-    width: 80,
-    title: '操作',
-    dataIndex: 'action',
-    fixed: 'right',
-  },
-})
-// 新增 编辑
-function GoDetailed(type, data) {
-  if (type) {
-    go(`/invoiceapplyDetail?id=${data.id}`)
-  } else {
-    go(`/invoiceapplyDetail`)
-  }
-}
-// 删除
-function FnDel() {
-  let ids = []
-  ids = getSelectRows().map((item) => {
-    return item.id
+  import { ref } from 'vue'
+  import { GetList,InvoiceApplicationDelete} from './api.js'
+  import { BasicTable, useTable, TableAction } from '/@/components/Table'
+  import { columns, searchFormSchema, billTypeData } from './columns'
+  import { GetOpenPrintModuleList } from '/@/views/operation/seaexport/api/BookingLedger.js'
+  import * as XLSX from 'xlsx'
+  import DsPrint from '/@/components/Print/index.vue'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { notification } = useMessage()
+  const { createMessage } = useMessage()
+  import { useGo } from '/@/hooks/web/usePage'
+  const go = useGo()
+  // 引入处理入参方法
+  import { formatParams } from '/@/hooks/web/common'
+  import { useAppStore } from '/@/store/modules/app'
+  const appStore = useAppStore()
+  //   表格
+  const [registerTable, { reload, getPaginationRef, getSelectRows, getRawDataSource }] = useTable({
+    title: '',
+    api: async (p) => {
+      const res: API.DataResult = await GetList(p)
+      return new Promise((resolve) => {
+        resolve({ data: [...res.data], total: res.count })
+      })
+    },
+    // 请求前的参数格式化
+    beforeFetch: (p) => {
+      return formatParams(p)
+    },
+    columns,
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+      useAdvancedSearch: true,
+    },
+    isTreeTable: false,
+    pagination: true,
+    striped: true,
+    useSearchForm: true,
+    showTableSetting: true,
+    bordered: true,
+    showIndexColumn: true,
+    indexColumnProps: {
+      width: 60,
+    },
+    canResize: true,
+    immediate: true,
+    actionColumn: {
+      width: 80,
+      title: '操作',
+      dataIndex: 'action',
+      fixed: 'right',
+    },
   })
-  if (ids.length == 0) {
-    createMessage.error('请选择要删除的数据')
-    return false
-  }
-  InvoiceApplicationDelete({ ids: ids }).then(res => {
-    if (res.succeeded) {
-      createMessage.success('删除成功')
-      reload()
+  // 新增 编辑
+  function GoDetailed(type, data) {
+    if (type) {
+      go(`/invoiceapplyDetail?id=${data.id}`)
+    } else {
+      go(`/invoiceapplyDetail`)
     }
-  })
-}
-function handleApply() {
-  let ids = []
-  ids = getSelectRows().map((item) => {
-    return item.id
-  })
-  if (ids.length == 0) {
-    createMessage.error('请选择数据')
-    return false
   }
-  ApplyAudit({ ids: ids }).then(res => {
-    if (res.succeeded) {
-      createMessage.success('操作成功')
-      reload()
-    }
-  })
-}
-
-function handleWithdraw() {
-  let ids = []
-  ids = getSelectRows().map((item) => {
-    return item.id
-  })
-  if (ids.length == 0) {
-    createMessage.error('请选择数据')
-    return false
+  // 删除
+  function FnDel() {
+    const ids = getSelectRows().map((item) => {
+      return item.id
+    })
+    InvoiceApplicationDelete({ids:ids}).then(res=>{
+      if(res.succeeded){
+        createMessage.success('删除成功')
+        reload()
+      }
+    })
   }
-  Withdraw({ ids: ids }).then(res => {
-    if (res.succeeded) {
-      createMessage.success('操作成功')
-      reload()
-    }
-  })
-}
 
-// 导出 EXCEL
-function ExportExcel() {
-  let Data: any = []
-  let DelData = ['id', 'bsno', 'ctnCode']
-  getRawDataSource().forEach((item, index) => {
-    let Obj = {}
-    Object.keys(item).forEach((item2) => {
-      if (!DelData.includes(item2)) {
-        columns.forEach((e) => {
-          if (e.dataIndex == item2) {
-            if (e.title == '收付类型') {
-              let data = ''
-              billTypeData.forEach((d) => {
-                if (d.code == item[item2]) {
-                  data = d.value
-                }
-              })
-              Obj[e.title] = data
-            } else {
-              Obj[e.title] = item[item2]
+
+  // 导出 EXCEL
+  function ExportExcel() {
+    let Data: any = []
+    let DelData = ['id', 'bsno', 'ctnCode']
+    getRawDataSource().forEach((item, index) => {
+      let Obj = {}
+      Object.keys(item).forEach((item2) => {
+        if (!DelData.includes(item2)) {
+          columns.forEach((e) => {
+            if (e.dataIndex == item2) {
+              if (e.title == '收付类型') {
+                let data = ''
+                billTypeData.forEach((d) => {
+                  if (d.code == item[item2]) {
+                    data = d.value
+                  }
+                })
+                Obj[e.title] = data
+              } else {
+                Obj[e.title] = item[item2]
+              }
             }
-          }
-        })
-      }
+          })
+        }
+      })
+      Data.push(Obj)
+      console.log(Data)
     })
-    Data.push(Obj)
-    console.log(Data)
-  })
-  // 创建工作簿
-  const workbook = XLSX.utils.book_new()
-  // 将数据转换为工作表
-  const worksheet = XLSX.utils.json_to_sheet(Data)
-  // 将工作表添加到工作簿
-  XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1')
-  // 生成Excel的配置
-  const wbout = XLSX.write(workbook, { bookType: 'xlsx', type: 'binary' })
-  // 创建二进制对象并创建url
-  const blob = new Blob([s2ab(wbout)], { type: 'application/octet-stream' })
-  const url = URL.createObjectURL(blob)
-  // 创建a标签模拟点击进行下载
-  const a = document.createElement('a')
-  a.href = url
-  a.download = '客户对账.xlsx'
-  document.body.appendChild(a)
-  a.click()
+    // 创建工作簿
+    const workbook = XLSX.utils.book_new()
+    // 将数据转换为工作表
+    const worksheet = XLSX.utils.json_to_sheet(Data)
+    // 将工作表添加到工作簿
+    XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1')
+    // 生成Excel的配置
+    const wbout = XLSX.write(workbook, { bookType: 'xlsx', type: 'binary' })
+    // 创建二进制对象并创建url
+    const blob = new Blob([s2ab(wbout)], { type: 'application/octet-stream' })
+    const url = URL.createObjectURL(blob)
+    // 创建a标签模拟点击进行下载
+    const a = document.createElement('a')
+    a.href = url
+    a.download = '客户对账.xlsx'
+    document.body.appendChild(a)
+    a.click()
 
-  // 清除对象URL
-  setTimeout(() => {
-    URL.revokeObjectURL(url)
-    document.body.removeChild(a)
-  }, 0)
-}
-// 将字符串转换为ArrayBuffer
-function s2ab(s) {
-  const buf = new ArrayBuffer(s.length)
-  const view = new Uint8Array(buf)
-  for (let i = 0; i !== s.length; ++i) view[i] = s.charCodeAt(i) & 0xff
-  return buf
-}
-const dsPrint = ref()
-// 打印费用
-async function printFee() {
-  dsPrint.value.init()
-}
+    // 清除对象URL
+    setTimeout(() => {
+      URL.revokeObjectURL(url)
+      document.body.removeChild(a)
+    }, 0)
+  }
+  // 将字符串转换为ArrayBuffer
+  function s2ab(s) {
+    const buf = new ArrayBuffer(s.length)
+    const view = new Uint8Array(buf)
+    for (let i = 0; i !== s.length; ++i) view[i] = s.charCodeAt(i) & 0xff
+    return buf
+  }
+  const dsPrint = ref()
+  // 打印费用
+  async function printFee() {
+    dsPrint.value.init()
+  }
 </script>
 <style lang="less" scoped>
-.topTable {
-  height: calc(100vh - 145px);
-}
+  .topTable {
+    height: calc(100vh - 145px);
+  }
 </style>
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index 74783072..3b9ac8d0 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -13,9 +13,9 @@
       @change="changeTab"
     >
       <a-tab-pane key="1" tab="主单信息" :forceRender="true" class="main-bill">
-        <a-spin :spinning="loading">
-          <div class="flex">
-            <div class="main-bill-box">
+        <div class="flex">
+          <div class="main-bill-box">
+            <a-spin :spinning="loading">
               <div class="flex" style="position: relative;">
                 <ActionBar
                   v-if="source == 'edit'"
@@ -73,9 +73,6 @@
                       </goodsTable>
                     </div>
                     <Divider type="horizontal" />
-                    <!-- 备注信息 -->
-                    <noteInfo ref="RefNoteInfo" :details="bookingDetails"></noteInfo>
-                    <Divider type="horizontal" />
                     <ediMore ref="RefediMore" :details="bookingDetails"></ediMore>
                   </a-tab-pane>
                   <a-tab-pane key="3-3" tab="费用信息" v-if="appStore.getfeeShow">
@@ -105,43 +102,43 @@
                   </a-button>
                 </ApproveBtns>
               </div>
-            </div>
-            <!-- 其他信息 -->
-            <transition name="slide" v-if="source == 'edit'">
-              <otherInfo
-                class="sea-other-info"
-                v-if="source == 'edit'"
-                ref="OtherInfo"
-                :details="bookingDetails"
-                @openFlag="otherOpenFlag"
-              >
-                <Divider type="horizontal" />
-                <!-- 联系人信息 -->
-                <ContactList v-if="source == 'edit' && id" :id="id"></ContactList>
-              </otherInfo>
-            </transition>
-            <transition name="slide" v-if="source == 'edit'">
-              <rightContent
-                class="right-content"
-                ref="RefrightContent"
-                :id="id"
-                :details="bookingDetails"
-                :PexcuteRules="excuteRules"
-                :PexcuteRulesType="excuteRulesType"
-                @fileNewUpadte="fileNewUpadte"
-                @changeAtd="changeAtd"
-                @changeDetail="changeDetailFun"
-                @handleComplete="handleComplete"
-                @rules="getRules"
-                @upDateRight="upDateRightFun"
-                @inGoodsSave="inGoodsSaveFun"
-                @handleRefsh="handleRefshRight"
-                @openFlag="setOpenFlag"
-              >
-              </rightContent>
-            </transition>
+            </a-spin>
           </div>
-        </a-spin>
+          <!-- 其他信息 -->
+          <transition name="slide" v-if="source == 'edit'">
+            <otherInfo
+              class="sea-other-info"
+              v-if="source == 'edit'"
+              ref="OtherInfo"
+              :details="bookingDetails"
+              @openFlag="otherOpenFlag"
+            >
+              <Divider type="horizontal" />
+              <!-- 联系人信息 -->
+              <ContactList v-if="source == 'edit' && id" :id="id"></ContactList>
+            </otherInfo>
+          </transition>
+          <transition name="slide" v-if="source == 'edit'">
+            <rightContent
+              class="right-content"
+              ref="RefrightContent"
+              :id="id"
+              :details="bookingDetails"
+              :PexcuteRules="excuteRules"
+              :PexcuteRulesType="excuteRulesType"
+              @fileNewUpadte="fileNewUpadte"
+              @changeAtd="changeAtd"
+              @changeDetail="changeDetailFun"
+              @handleComplete="handleComplete"
+              @rules="getRules"
+              @upDateRight="upDateRightFun"
+              @inGoodsSave="inGoodsSaveFun"
+              @handleRefsh="handleRefshRight"
+              @openFlag="setOpenFlag"
+            >
+            </rightContent>
+          </transition>
+        </div>
       </a-tab-pane>
       <a-tab-pane key="3" tab="提单信息">
         <LadingInfo :id="id" :details="bookingDetails"></LadingInfo>
@@ -196,6 +193,7 @@
     SetTaskStatus
   } from '../api/BookingLedger'
   const appStore = useAppStore()
+  // const go = useGo()
   const { notification, createMessage } = useMessage()
   import operationArea from './modules/operationArea.vue'
   import basicInfo from './modules/basicInfo.vue'
@@ -203,7 +201,6 @@
   import cargoInfo from './modules/cargoInfo.vue'
   import goodsTable from './modules/goodsTable.vue'
   import ediMore from './modules/ediMore.vue'
-  import noteInfo from './modules/noteInfo.vue'
   import rightContent from './modules/rightContent.vue'
   import { useGo } from '/@/hooks/web/usePage'
   // 提单信息
@@ -232,14 +229,16 @@
   const RefrightContent = ref()
   const excuteRules = ref([])
   const excuteRulesType = ref('')
+  const RefsedOrder = ref()
   const RefgoodsTable = ref()
   const OtherInfo = ref()
   const RefbasicInfo = ref()
   const RefmailingInfo = ref()
   const RefcargoInfo = ref()
   const RefediMore = ref(null)
-  const RefNoteInfo = ref(null)
   const mainOrderActiveKey = ref('1-1')
+  // const checkFrom = ref([])
+  const isAdd = ref(false)
   const inPageLoading = ref(false)
   const detailsLoadOver = ref(false)
   // const cargoRules = ref(rules.cargoRules)
@@ -291,6 +290,7 @@
   init()
   // 初始化
   function init() {
+    console.log('init')
     if (route.query.id && !id.value) {
       id.value = route.query.id
     }
@@ -299,11 +299,24 @@
     excuteRulesType.value = ''
     Showtabs.value = false
     if (id.value) {
+      isAdd.value = false
       getDetail()
       getRightAll()
     } else {
+      isAdd.value = true
       detailsLoadOver.value = false
+      // bookingDetails.value.carrierid = type.value
+      // bookingDetails.value.carrier = type.value
       isLockBooking.value = false
+      // setTimeout(() => {
+      //   if (Object.keys(that.$refs).includes('RefsedOrder')) {
+      //     RefsedOrder.value.init([])
+      //   }
+      //   if (Object.keys(that.$refs).includes('goodsTable')) {
+      //     RefgoodsTable.value.init()
+      //   }
+      //   detailsLoadOver.value = true
+      // }, 200)
     }
   }
   // 获取详情
@@ -319,6 +332,15 @@
       id: id.value,
     })
       .then(async (res) => {
+        //处理 后端 返回默认值的 0 || 0001-01-01 00:00:00
+
+        res.data = JSON.parse(
+          JSON.stringify(res.data)
+            .replaceAll('"0001-01-01 00:00:00"', '""')
+            .replaceAll(':"0"', ':""')
+            .replaceAll(':0,', ':"",'),
+        )
+
         if (route.query.isCopy) {
           res.data = {
             ...res.data,
@@ -333,115 +355,115 @@
         appStore.settopDown(false)
         inPageLoading.value = false
         // 解决 业务来源 联动问题
-        // if (res.data.sourceId) {
-        //   let sourceDetailIdArr: any = []
-        //   await GetClientSourceDetailSelectList({ id: res.data.sourceId }).then((res) => {
-        //     res.data.forEach((item) => {
-        //       sourceDetailIdArr.push({ label: item.detailName, value: item.id })
-        //     })
-        //   })
-        //   RefbasicInfo.value.updateSchema({
-        //     label: '来源明细',
-        //     field: 'sourceDetailId',
-        //     component: 'Select',
-        //     required: false,
-        //     dynamicDisabled: ({ values }) => {
-        //       return !values.sourceId || source.value != 'edit'
-        //     },
-        //     colProps: { span: 4 },
-        //     componentProps: {
-        //       allowClear: true,
-        //       options: sourceDetailIdArr,
-        //       showSearch: true,
-        //       filterOption: (input: string, option: any) => {
-        //         return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        //       },
-        //     },
-        //   })
-        // }
-        // if (res.data.saleId) {
-        //   const FnsaleId: any = await GetSaleList()
-        //   FnsaleId.data.forEach(async (item) => {
-        //     if (item.id == res.data.saleId) {
-        //       let saleDeptIdArr: any = []
-        //       let saleOrgIdArr: any = []
-        //       item.saleOrgList.forEach((item) => {
-        //         saleOrgIdArr.push({ label: item.orgName, value: item.orgId })
-        //       })
-        //       if (item.defaultOrgId) {
-        //         await GetDeptList({ orgId: item.defaultOrgId }).then((res) => {
-        //           console.log(res, '所属分部 查询 所属部门')
-        //           res.data.forEach((item) => {
-        //             saleDeptIdArr.push({ label: item.orgName, value: item.id })
-        //           })
-        //         })
-        //       }
-        //       RefbasicInfo.value.updateSchema([
-        //         {
-        //           label: '所属分部',
-        //           field: 'saleOrgId',
-        //           component: 'Select',
-        //           required: false,
-        //           dynamicDisabled: source.value == 'edit' ? false : true,
-        //           // defaultValue: '',
-        //           colProps: { span: 4 },
-        //           componentProps: {
-        //             allowClear: true,
-        //             options: saleOrgIdArr,
-        //             showSearch: true,
-        //             filterOption: (input: string, option: any) => {
-        //               return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        //             },
-        //             onChange: (e, obj) => {
-        //               // formModel.saleDeptId = ''
-        //               GetDeptList({ orgId: e }).then((res) => {
-        //                 console.log(res, '所属分部 查询 所属部门')
-        //                 let Arr: any = []
-        //                 res.data.forEach((item) => {
-        //                   Arr.push({ label: item.orgName, value: item.id })
-        //                 })
-        //                 updateSchema({
-        //                   label: '所属部门',
-        //                   field: 'saleDeptId',
-        //                   component: 'Select',
-        //                   required: false,
-        //                   dynamicDisabled: source.value == 'edit' ? false : true,
-        //                   // defaultValue: '',
-        //                   colProps: { span: 4 },
-        //                   componentProps: {
-        //                     allowClear: true,
-        //                     options: Arr,
-        //                     showSearch: true,
-        //                     filterOption: (input: string, option: any) => {
-        //                       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        //                     },
-        //                   },
-        //                 })
-        //               })
-        //             },
-        //           },
-        //         },
-        //         {
-        //           label: '所属部门',
-        //           field: 'saleDeptId',
-        //           component: 'Select',
-        //           required: false,
-        //           dynamicDisabled: source.value == 'edit' ? false : true,
-        //           // defaultValue: '',
-        //           colProps: { span: 4 },
-        //           componentProps: {
-        //             allowClear: true,
-        //             options: saleDeptIdArr,
-        //             showSearch: true,
-        //             filterOption: (input: string, option: any) => {
-        //               return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        //             },
-        //           },
-        //         },
-        //       ])
-        //     }
-        //   })
-        // }
+        if (res.data.sourceId) {
+          let sourceDetailIdArr: any = []
+          await GetClientSourceDetailSelectList({ id: res.data.sourceId }).then((res) => {
+            res.data.forEach((item) => {
+              sourceDetailIdArr.push({ label: item.detailName, value: item.id })
+            })
+          })
+          RefbasicInfo.value.updateSchema({
+            label: '来源明细',
+            field: 'sourceDetailId',
+            component: 'Select',
+            required: false,
+            dynamicDisabled: ({ values }) => {
+              return !values.sourceId || source.value != 'edit'
+            },
+            colProps: { span: 4 },
+            componentProps: {
+              allowClear: true,
+              options: sourceDetailIdArr,
+              showSearch: true,
+              filterOption: (input: string, option: any) => {
+                return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+              },
+            },
+          })
+        }
+        if (res.data.saleId) {
+          const FnsaleId: any = await GetSaleList()
+          FnsaleId.data.forEach(async (item) => {
+            if (item.id == res.data.saleId) {
+              let saleDeptIdArr: any = []
+              let saleOrgIdArr: any = []
+              item.saleOrgList.forEach((item) => {
+                saleOrgIdArr.push({ label: item.orgName, value: item.orgId })
+              })
+              if (item.defaultOrgId) {
+                await GetDeptList({ orgId: item.defaultOrgId }).then((res) => {
+                  console.log(res, '所属分部 查询 所属部门')
+                  res.data.forEach((item) => {
+                    saleDeptIdArr.push({ label: item.orgName, value: item.id })
+                  })
+                })
+              }
+              RefbasicInfo.value.updateSchema([
+                {
+                  label: '所属分部',
+                  field: 'saleOrgId',
+                  component: 'Select',
+                  required: false,
+                  dynamicDisabled: source.value == 'edit' ? false : true,
+                  // defaultValue: '',
+                  colProps: { span: 4 },
+                  componentProps: {
+                    allowClear: true,
+                    options: saleOrgIdArr,
+                    showSearch: true,
+                    filterOption: (input: string, option: any) => {
+                      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                    },
+                    onChange: (e, obj) => {
+                      // formModel.saleDeptId = ''
+                      GetDeptList({ orgId: e }).then((res) => {
+                        console.log(res, '所属分部 查询 所属部门')
+                        let Arr: any = []
+                        res.data.forEach((item) => {
+                          Arr.push({ label: item.orgName, value: item.id })
+                        })
+                        updateSchema({
+                          label: '所属部门',
+                          field: 'saleDeptId',
+                          component: 'Select',
+                          required: false,
+                          dynamicDisabled: source.value == 'edit' ? false : true,
+                          // defaultValue: '',
+                          colProps: { span: 4 },
+                          componentProps: {
+                            allowClear: true,
+                            options: Arr,
+                            showSearch: true,
+                            filterOption: (input: string, option: any) => {
+                              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                            },
+                          },
+                        })
+                      })
+                    },
+                  },
+                },
+                {
+                  label: '所属部门',
+                  field: 'saleDeptId',
+                  component: 'Select',
+                  required: false,
+                  dynamicDisabled: source.value == 'edit' ? false : true,
+                  // defaultValue: '',
+                  colProps: { span: 4 },
+                  componentProps: {
+                    allowClear: true,
+                    options: saleDeptIdArr,
+                    showSearch: true,
+                    filterOption: (input: string, option: any) => {
+                      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                    },
+                  },
+                },
+              ])
+            }
+          })
+        }
       })
       .catch(() => {
         appStore.settopDown(false)
@@ -464,8 +486,6 @@
     const otherForm = await OtherInfo.value.validate()
     // EDI补充表单
     const ediFrom = await RefediMore.value.validate()
-    // 备注信息表单
-    const noteForm = await RefNoteInfo.value.validate()
     // 箱型数据表格
     const ctnInfo = RefgoodsTable.value.list
     // 整理箱型表格数据，只传有值的字段
@@ -486,7 +506,6 @@
       ...goodsForm,
       ...otherForm,
       ...customerForm,
-      ...noteForm,
       ediInfo: ediFrom,
       ctnInfo
     }
@@ -501,12 +520,6 @@
           } else {
             createMessage.success('新增成功!')
             id.value = res.data
-            // 关闭当前页面
-            const { fullPath } = route //获取当前路径
-            tabStore.closeTabByKey(fullPath, router)
-            setTimeout(() => {
-              go(`/BookingDetail?id=${res.data}&source=edit`)
-            }, 50)
           }
           init()
         }
@@ -854,7 +867,6 @@
       result: remark ? 2 : 1,
       ids: [id.value],
       businessType: '1',
-      taskTypeName: route.query.status
     }
     if (remark) postData['remark'] = remark
     loading.value = true
diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index d4d8a58f..04acf17c 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -98,7 +98,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     required: false,
     dynamicDisabled: false,
     colProps: { span: 5 },
-    componentProps: ({ formModel, formActionType }) => {
+    componentProps: ({ formModel }) => {
       return {
         api: GetClientListByCode,
         params: { code: 'controller' },
@@ -109,9 +109,6 @@ export const basicInfoFormSchema: FormSchema[] = [
         immediate: false,
         onChange: (e, obj) => {
           if (e && obj) {
-            setTimeout(() => {
-              formActionType ? formActionType.linkageForm(obj) : null
-            }, 10)
             formModel.customerId = obj.id
           }
           if (!e && !obj) {
@@ -443,15 +440,13 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: (e, obj) => {
-          console.log(e, obj)
           if (e && obj) {
             formModel.shipperId = obj.id
             formModel.shipperContent = obj.content
           }
-          if (e === undefined && obj === undefined) {
+          if (!e && !obj) {
             formModel.shipperId = null
             formModel.shipperContent = null
-            formModel.shipper = ''
           }
         }
       }
@@ -483,16 +478,13 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: (e, obj) => {
-          console.log(e)
-          console.log(obj)
           if (e && obj) {
             formModel.consigneeId = obj.id
             formModel.consigneeContent = obj.content
           }
-          if (e === undefined && obj === undefined) {
+          if (!e && !obj) {
             formModel.consigneeId = null
-            formModel.consignee = null
-            formModel.consigneeContent = ''
+            formModel.consigneeContent = null
           }
         }
       }
@@ -528,10 +520,9 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
             formModel.notifyPartyId = obj.id
             formModel.notifyPartyContent = obj.content
           }
-          if (e === undefined && obj === undefined) {
+          if (!e && !obj) {
             formModel.notifyPartyId = null
             formModel.notifyPartyContent = null
-            formModel.notifyParty = ''
           }
         }
       }
@@ -541,6 +532,7 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
     label: '　',
     field: 'shipperContent',
     component: 'InputTextArea',
+    defaultValue: '',
     colProps: { span: 8 },
     componentProps: {
       slice: [30, 35, 40]
@@ -550,6 +542,7 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
     label: '　',
     field: 'consigneeContent',
     component: 'InputTextArea',
+    defaultValue: '',
     colProps: { span: 8 },
     componentProps: {
       slice: [30, 35, 40]
@@ -559,8 +552,7 @@ export const mailingInfoFormSchemaL: FormSchema[] = [
     label: '　',
     field: 'notifyPartyContent',
     component: 'InputTextArea',
-    required: false,
-    dynamicDisabled: false,
+    defaultValue: '',
     colProps: { span: 8 },
     componentProps: {
       slice: [30, 35, 40]
@@ -809,7 +801,7 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
     dynamicDisabled: false,
     // defaultValue: '',
     colProps: { span: 5 },
-    componentProps: ({ formModel, formActionType }) => {
+    componentProps: ({ formModel }) => {
       return {
         api: GetClientPortSelectList,
         resultField: 'data',
@@ -819,12 +811,10 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
         immediate: false,
         onChange: (e, obj) => {
           if (e && obj) {
-            formActionType ? formActionType.linkageForm(obj) : null
             formModel.dischargePortId = obj.id
             formModel.dischargePort = obj.portName
           }
           if (!e && !obj) {
-            formActionType ? formActionType.linkageForm(obj) : null
             formModel.dischargePortId = null
             formModel.dischargePort = null
           }
@@ -909,7 +899,6 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
         valueField: 'ediCode',
         immediate: false,
         onChange: (e, obj) => {
-          console.log(obj)
           if (e && obj) {
             formModel.transPortId = obj.id
             formModel.transPort = obj.portName
@@ -1042,297 +1031,6 @@ export const mailingInfoFormSchemaR: FormSchema[] = [
   // },
 ]
 
-// 备注信息表单
-export const noteFormSchema: FormSchema[] = [
-  {
-    field: 'agentContent',
-    label: 'AGENT',
-    component: 'InputTextArea',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 8 },
-    componentProps: {
-      autoSize: { minRows: 3, maxRows: 3 }
-    }
-  },
-  {
-    field: 'soRemark',
-    label: 'SO备注',
-    component: 'InputTextArea',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 8 },
-    componentProps: {
-      autoSize: { minRows: 3, maxRows: 3 }
-    }
-  },
-  {
-    field: 'closeDocRemark',
-    label: 'SI备注',
-    component: 'InputTextArea',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 8 },
-    componentProps: {
-      autoSize: { minRows: 3, maxRows: 3 }
-    }
-  },
-  {
-    field: 'issueType',
-    label: '签单方式',
-    component: 'ApiSelect',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 5 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: GetIssueTypeSelectList,
-        allowClear: true,
-        showSearch: true,
-        labelField: 'billType',
-        valueField: 'billType',
-        immediate: false,
-        resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-        onChange: (e, obj) => {
-          console.log(obj)
-          if (e && obj) {
-            formModel.issueTypeCode = obj.ediCode
-            formModel.noBill = obj.noBill
-            formModel.copyNoBill = obj.copyNoBill
-          }
-          if (!e && !obj) {
-            formModel.issueTypeCode = null
-            formModel.noBill = null
-            formModel.copyNoBill = null
-          }
-        }
-      }
-    },
-  },
-  {
-    field: 'issueTypeCode',
-    label: '签单方式code',
-    component: 'Input',
-    show: false
-  },
-  {
-    field: 'issueRemark',
-    label: '签单要求',
-    component: 'Input',
-    colProps: { span: 5 }
-  },
-  {
-    field: 'issueDate',
-    label: '签单日期',
-    component: 'DatePicker',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 5 },
-    componentProps: {
-      allowClear: true,
-      valueFormat: 'YYYY-MM-DD'
-    },
-  },
-  {
-    label: '签单地代码',
-    field: 'issuePlaceCode',
-    component: 'ApiSelect',
-    required: false,
-    dynamicDisabled: false,
-    colProps: { span: 5 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: GetClientPortSelectList,
-        resultField: 'data',
-        labelField: 'pinYinCode',
-        valueField: 'ediCode',
-        showName: 'ediCode',
-        immediate: false,
-        onChange: (e, obj) => {
-          if (e && obj) {
-            formModel.issuePlace = obj.portName
-            formModel.issuePlaceId = obj.id
-          }
-          if (!e && !obj) {
-            formModel.issuePlace = null
-            formModel.issuePlaceId = null
-          }
-        }
-      }
-    },
-  },
-  {
-    label: '签单地点',
-    field: 'issuePlace',
-    component: 'Input',
-    required: false,
-    colProps: { span: 5 }
-  },
-  {
-    label: '签单地Id',
-    field: 'issuePlaceId',
-    component: 'Input',
-    show: false
-  },
-  {
-    field: 'service',
-    label: '运输条款',
-    component: 'ApiSelect',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 5 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: GetServiceSelectList,
-        allowClear: true,
-        showSearch: true,
-        labelField: 'cnName',
-        valueField: 'cnName',
-        resultField: 'data',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-        immediate: false,
-        onChange: (e, obj) => {
-          if (e && obj) {
-            formModel.serviceCode = obj.ediCode
-          }
-          if (!e && !obj) {
-            formModel.serviceCode = null
-          }
-        }
-      }
-    },
-  },
-  {
-    field: 'serviceCode',
-    label: '运输条款代码',
-    component: 'Input',
-    show: false
-  },
-  {
-    field: 'mblFrt',
-    label: '付费方式',
-    component: 'ApiSelect',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 5 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: GetClientFrtSelectList,
-        allowClear: true,
-        showSearch: true,
-        labelField: 'cnName',
-        valueField: 'cnName',
-        resultField: 'data',
-        immediate: false,
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
-        onChange: (e, obj) => {
-          if (e && obj) {
-            formModel.mblFrtCode = obj.ediCode
-          }
-          if (!e && !obj) {
-            formModel.mblFrtCode = null
-          }
-        }
-      }
-    },
-  },
-  {
-    label: '付费方式代码',
-    field: 'mblFrtCode',
-    component: 'Input',
-    show: false,
-  },
-  {
-    label: '',
-    field: 'prepareAtCode',
-    component: 'Input',
-    show: false,
-  },
-  {
-    label: '',
-    field: 'prepareAtId',
-    component: 'Input',
-    show: false,
-  },
-  {
-    field: 'prepareAt',
-    label: '付费地点',
-    component: 'ApiSelect',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 5 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: GetClientPortSelectList,
-        resultField: 'data',
-        labelField: 'pinYinCode',
-        valueField: 'portName',
-        showName: 'portName',
-        immediate: false,
-        onChange: (e, obj) => {
-          if (e && obj) {
-            formModel.prepareAtId = obj.id
-            formModel.prepareAtCode = obj.ediCode
-          }
-          if (!e && !obj) {
-            formModel.prepareAtId = null
-            formModel.prepareAtCode = null
-          }
-        }
-      }
-    }
-  },
-  {
-    field: 'noBill',
-    label: '提单份数',
-    component: 'Select',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 5 },
-    componentProps: {
-      options: FnnoBill,
-      allowClear: true,
-      showSearch: true,
-      filterOption: (input: string, option: any) => {
-        return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      },
-    },
-  },
-  {
-    field: 'copyNoBill',
-    label: '副本份数',
-    component: 'Select',
-    required: false,
-    dynamicDisabled: false,
-    // defaultValue: '',
-    colProps: { span: 5 },
-    componentProps: {
-      options: FncopyNoBill,
-      allowClear: true,
-      showSearch: true,
-      filterOption: (input: string, option: any) => {
-        return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      }
-    }
-  }
-]
-
 // ediMore表单
 export const ediMoreFormSchema: FormSchema[] = [
   {
@@ -1608,72 +1306,72 @@ export const ediMoreFormSchema: FormSchema[] = [
 ]
 
 export const mastetMoreFormSchema: FormSchema[] = [
-  // {
-  //   label: '',
-  //   field: 'masterShipperContent',
-  //   component: 'Input',
-  //   // defaultValue: '',
-  //   show: false,
-  // },
-  // {
-  //   field: 'masterShipperId',
-  //   component: 'SelectTextArea',
-  //   colProps: { span: 12 },
-  //   componentProps: ({ formModel }) => {
-  //     return {
-  //       label: '发货人',
-  //       onChange: (e) => {
-  //         if (e) {
-  //           formModel.masterShipperContent = e.res
-  //         }
-  //       },
-  //     }
-  //   },
-  // },
-  // {
-  //   label: '',
-  //   field: 'masterConsigneeContent',
-  //   component: 'Input',
-  //   // defaultValue: '',
-  //   show: false,
-  // },
-  // {
-  //   field: 'masterConsigneeId',
-  //   component: 'SelectTextArea',
-  //   colProps: { span: 12 },
-  //   componentProps: ({ formModel }) => {
-  //     return {
-  //       label: '收货人',
-  //       onChange: (e) => {
-  //         if (e) {
-  //           formModel.masterConsigneeContent = e.res
-  //         }
-  //       }
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '',
-  //   field: 'masterNotifyPartyContent',
-  //   component: 'Input',
-  //   // defaultValue: '',
-  //   show: false,
-  // },
-  // {
-  //   field: 'masterNotifyPartyId',
-  //   component: 'SelectTextArea',
-  //   colProps: { span: 12 },
-  //   componentProps: ({ formModel }) => {
-  //     return {
-  //       label: '通知人',
-  //       onChange: (e) => {
-  //         if (e) {
-  //           formModel.masterNotifyPartyContent = e.res
-  //         }
-  //       },
-  //     }
-  //   },
-  // },
+  {
+    label: '',
+    field: 'masterShipperContent',
+    component: 'Input',
+    // defaultValue: '',
+    show: false,
+  },
+  {
+    field: 'masterShipperId',
+    component: 'SelectTextArea',
+    colProps: { span: 12 },
+    componentProps: ({ formModel }) => {
+      return {
+        label: '发货人',
+        onChange: (e) => {
+          if (e) {
+            formModel.masterShipperContent = e.res
+          }
+        },
+      }
+    },
+  },
+  {
+    label: '',
+    field: 'masterConsigneeContent',
+    component: 'Input',
+    // defaultValue: '',
+    show: false,
+  },
+  {
+    field: 'masterConsigneeId',
+    component: 'SelectTextArea',
+    colProps: { span: 12 },
+    componentProps: ({ formModel }) => {
+      return {
+        label: '收货人',
+        onChange: (e) => {
+          if (e) {
+            formModel.masterConsigneeContent = e.res
+          }
+        }
+      }
+    }
+  },
+  {
+    label: '',
+    field: 'masterNotifyPartyContent',
+    component: 'Input',
+    // defaultValue: '',
+    show: false,
+  },
+  {
+    field: 'masterNotifyPartyId',
+    component: 'SelectTextArea',
+    colProps: { span: 12 },
+    componentProps: ({ formModel }) => {
+      return {
+        label: '通知人',
+        onChange: (e) => {
+          if (e) {
+            formModel.masterNotifyPartyContent = e.res
+          }
+        },
+      }
+    },
+  },
 ]
 
 // cargoInfo表单
@@ -1984,7 +1682,6 @@ export const otherInfoFormSchema: FormSchema[] = [
     field: 'blType',
     label: '装运方式',
     component: 'Input',
-    defaultValue: '整箱',
     show: false
   },
   {
@@ -2165,21 +1862,21 @@ export const otherInfoFormSchema: FormSchema[] = [
     show: false
   },
   {
-    label: '名称',
+    label: '船司航线',
     field: 'lane',
     component: 'Input',
     show: false,
   },
   {
-    label: 'code',
+    label: '船司航线code',
     field: 'laneCode',
     component: 'Input',
     show: false,
   },
   {
-    label: '航线',
+    label: '船司航线',
     field: 'laneId',
-    component: 'ApiSelect',
+    component: 'Input',
     required: false,
     dynamicDisabled: false,
     colProps: { span: 12 },
@@ -2669,7 +2366,276 @@ export const otherInfoFormSchema: FormSchema[] = [
         }
       }
     },
-  }
+  },
+  // {
+  //   field: 'agentContent',
+  //   label: 'AGENT',
+  //   component: 'InputTextArea',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   // defaultValue: '',
+  //   colProps: { span: 8 },
+  //   componentProps: {
+  //     autoSize: { minRows: 3, maxRows: 3 }
+  //   }
+  // },
+  // {
+  //   field: 'closeDocRemark',
+  //   label: '截单备注',
+  //   component: 'InputTextArea',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   // defaultValue: '',
+  //   colProps: { span: 8 },
+  //   componentProps: {
+  //     autoSize: { minRows: 3, maxRows: 3 }
+  //   }
+  // },
+  // {
+  //   field: 'issueType',
+  //   label: '签单方式',
+  //   component: 'ApiSelect',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   // defaultValue: '',
+  //   colProps: { span: 4 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       api: GetIssueTypeSelectList,
+  //       allowClear: true,
+  //       showSearch: true,
+  //       labelField: 'billType',
+  //       valueField: 'billType',
+  //       immediate: false,
+  //       resultField: 'data',
+  //       filterOption: (input: string, option: any) => {
+  //         return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //       },
+  //       onChange: (e, obj) => {
+  //         console.log(obj)
+  //         if (e && obj) {
+  //           formModel.issueTypeCode = obj.ediCode
+  //           formModel.noBill = obj.noBill
+  //           formModel.copyNoBill = obj.copyNoBill
+  //         }
+  //         if (!e && !obj) {
+  //           formModel.issueTypeCode = null
+  //           formModel.noBill = null
+  //           formModel.copyNoBill = null
+  //         }
+  //       }
+  //     }
+  //   },
+  // },
+  // {
+  //   field: 'issueTypeCode',
+  //   label: '签单方式code',
+  //   component: 'Input',
+  //   show: false
+  // },
+  // {
+  //   field: 'issueDate',
+  //   label: '签单日期',
+  //   component: 'DatePicker',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   // defaultValue: '',
+  //   colProps: { span: 4 },
+  //   componentProps: {
+  //     allowClear: true,
+  //     valueFormat: 'YYYY-MM-DD'
+  //   },
+  // },
+  // {
+  //   label: '签单地代码',
+  //   field: 'issuePlaceCode',
+  //   component: 'ApiSelect',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   colProps: { span: 4 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       api: GetClientPortSelectList,
+  //       resultField: 'data',
+  //       labelField: 'pinYinCode',
+  //       valueField: 'ediCode',
+  //       showName: 'ediCode',
+  //       immediate: false,
+  //       onChange: (e, obj) => {
+  //         if (e && obj) {
+  //           formModel.issuePlace = obj.portName
+  //           formModel.issuePlaceId = obj.id
+  //         }
+  //         if (!e && !obj) {
+  //           formModel.issuePlace = null
+  //           formModel.issuePlaceId = null
+  //         }
+  //       }
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '签单地点',
+  //   field: 'issuePlace',
+  //   component: 'Input',
+  //   required: false,
+  //   colProps: { span: 4 }
+  // },
+  // {
+  //   label: '签单地Id',
+  //   field: 'issuePlaceId',
+  //   component: 'Input',
+  //   show: false
+  // },
+  // {
+  //   field: 'mblFrt',
+  //   label: '付费方式',
+  //   component: 'ApiSelect',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   // defaultValue: '',
+  //   colProps: { span: 4 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       api: GetClientFrtSelectList,
+  //       allowClear: true,
+  //       showSearch: true,
+  //       labelField: 'cnName',
+  //       valueField: 'cnName',
+  //       resultField: 'data',
+  //       immediate: false,
+  //       filterOption: (input: string, option: any) => {
+  //         return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //       },
+  //       onChange: (e, obj) => {
+  //         if (e && obj) {
+  //           formModel.mblFrtCode = obj.ediCode
+  //         }
+  //         if (!e && !obj) {
+  //           formModel.mblFrtCode = null
+  //         }
+  //       }
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '付费方式代码',
+  //   field: 'mblFrtCode',
+  //   component: 'Input',
+  //   show: false,
+  // },
+  // {
+  //   label: '',
+  //   field: 'prepareAtCode',
+  //   component: 'Input',
+  //   show: false,
+  // },
+  // {
+  //   label: '',
+  //   field: 'prepareAtId',
+  //   component: 'Input',
+  //   show: false,
+  // },
+  // {
+  //   field: 'prepareAt',
+  //   label: '付费地点',
+  //   component: 'ApiSelect',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   // defaultValue: '',
+  //   colProps: { span: 4 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       api: GetClientPortSelectList,
+  //       resultField: 'data',
+  //       labelField: 'pinYinCode',
+  //       valueField: 'portName',
+  //       showName: 'portName',
+  //       immediate: false,
+  //       onChange: (e, obj) => {
+  //         if (e && obj) {
+  //           formModel.prepareAtId = obj.id
+  //           formModel.prepareAtCode = obj.ediCode
+  //         }
+  //         if (!e && !obj) {
+  //           formModel.prepareAtId = null
+  //           formModel.prepareAtCode = null
+  //         }
+  //       }
+  //     }
+  //   }
+  // },
+  // {
+  //   field: 'service',
+  //   label: '运输条款',
+  //   component: 'ApiSelect',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   // defaultValue: '',
+  //   colProps: { span: 4 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       api: GetServiceSelectList,
+  //       allowClear: true,
+  //       showSearch: true,
+  //       labelField: 'cnName',
+  //       valueField: 'cnName',
+  //       resultField: 'data',
+  //       filterOption: (input: string, option: any) => {
+  //         return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //       },
+  //       immediate: false,
+  //       onChange: (e, obj) => {
+  //         if (e && obj) {
+  //           formModel.serviceCode = obj.ediCode
+  //         }
+  //         if (!e && !obj) {
+  //           formModel.serviceCode = null
+  //         }
+  //       }
+  //     }
+  //   },
+  // },
+  // {
+  //   field: 'serviceCode',
+  //   label: '运输条款代码',
+  //   component: 'Input',
+  //   show: false
+  // },
+  // {
+  //   field: 'noBill',
+  //   label: '正本份数',
+  //   component: 'Select',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   // defaultValue: '',
+  //   colProps: { span: 4 },
+  //   componentProps: {
+  //     options: FnnoBill,
+  //     allowClear: true,
+  //     showSearch: true,
+  //     filterOption: (input: string, option: any) => {
+  //       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //     },
+  //   },
+  // },
+  // {
+  //   field: 'copyNoBill',
+  //   label: '副本份数',
+  //   component: 'Select',
+  //   required: false,
+  //   dynamicDisabled: false,
+  //   // defaultValue: '',
+  //   colProps: { span: 4 },
+  //   componentProps: {
+  //     options: FncopyNoBill,
+  //     allowClear: true,
+  //     showSearch: true,
+  //     filterOption: (input: string, option: any) => {
+  //       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+  //     }
+  //   }
+  // }
 ]
 
 // 客户类别下拉框数据
@@ -2749,10 +2715,8 @@ export const personFormSchema: FormSchema[] = [
           GetOrderContactListByClientId({ id: v }).then(res => {
             personList.value = res.data.map(item => {
               return {
-                label: item.name,
-                value: item.id,
-                email: item.email,
-                mobile: item.mobile
+                label: item.shortName,
+                value: item.id
               }
             })
           })
@@ -2782,12 +2746,8 @@ export const personFormSchema: FormSchema[] = [
         onChange: (v, obj) => {
           if (obj) {
             formModel.name = obj.label
-            formModel.email = obj.email
-            formModel.mobile = obj.mobile
           } else {
             formModel.name = null
-            formModel.email = null
-            formModel.mobile = null
           }
         }
       }
diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue
index e9102b4e..7c82afae 100644
--- a/src/views/operation/seaexport/detail/modules/basicInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue
@@ -63,7 +63,7 @@
         </a-button>
       </a-dropdown>
     </div>
-    <BasicForm @register="registerForm" @linkageForm="linkageForm">
+    <BasicForm @register="registerForm">
       <!-- 编号复制 -->
       <template #bookingNo="item">
         <span v-show="item.values.bookingNo" class="iconfont icon-fuzhi11" @click="copyTxt(item, 'bookingNo')"></span>
@@ -74,6 +74,14 @@
       <template #hblno="item">
         <span v-show="item.values.hblno" class="iconfont icon-fuzhi11" @click="copyTxt(item, 'hblno')"></span>
       </template>
+      <!-- 结算方式 -->
+      <template #stlName="{ model }">
+        <span class="read-only">{{ model.stlName ? model.stlName : '自动生成' }}</span>
+      </template>
+      <!-- 结算日期 -->
+      <template #stlDate="{ model }">
+        <span class="read-only">{{ model.stlDate ? model.stlDate.split(' ')[0] : '自动生成' }}</span>
+      </template>
     </BasicForm>
   </div>
 </template>
@@ -158,15 +166,6 @@
   const editCustomerNo = () => {
     customerNoRef.value.focus()
   }
-  // 1.根据账期设置自动带出结算日期。
-  // 2.自动带出市场来源及来源明细。
-  // 3.自动带出揽货人、操作、单证
-  // 4.保存时根据服务内容自动带出费用。
-  // 5.自动带出所属分部和所属部门
-  // 6.自动带出服务项目。
-  const linkageForm = async (item) => {
-    console.log(item)
-  }
   watch(
     () => props.details,
     (v) => {
diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
index bb75a953..e80350c2 100644
--- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue
@@ -575,9 +575,6 @@
 </script>
 <style lang="less">
 .ds-goods-info {
-  h4 {
-    margin-bottom: 0!important;
-  }
   .ant-col-15 {
     max-width: 60%;
     flex: 0 0 60%;
diff --git a/src/views/operation/seaexport/detail/modules/mailingInfo.vue b/src/views/operation/seaexport/detail/modules/mailingInfo.vue
index 6a6a0f19..c100ef5b 100644
--- a/src/views/operation/seaexport/detail/modules/mailingInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/mailingInfo.vue
@@ -153,6 +153,7 @@
     {
       getFieldsValue: getFieldsValueL,
       updateSchema: updateSchemaL,
+      resetFieldsL,
       setFieldsValue: setFieldsValueL,
       validate: validateL,
     },
@@ -167,6 +168,7 @@
     {
       getFieldsValue: getFieldsValueR,
       updateSchema: updateSchemaR,
+      resetFieldsR,
       setFieldsValue: setFieldsValueR,
       validate: validateR,
     },
@@ -258,7 +260,6 @@
   watch(
     () => props.details,
     (nval) => {
-      console.log(nval)
       setFieldsValueL({
         ...nval
       })
diff --git a/src/views/operation/seaexport/detail/modules/otherInfo.vue b/src/views/operation/seaexport/detail/modules/otherInfo.vue
index 18990016..7b8b7349 100644
--- a/src/views/operation/seaexport/detail/modules/otherInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/otherInfo.vue
@@ -12,8 +12,8 @@
       </h4>
       <Divider type="horizontal" />
       <div>
-        <div class="iconfont"><span style="color: #7A8798;"><span class="iconfont icon-chakan mr5"></span>会计期间：</span>{{ details.accountDate || '自动生成' }}</div>
-        <div class="iconfont"><span style="color: #7A8798;"><span class="iconfont icon-calendar mr5"></span>结算日期：</span>{{ details.stlDate || '自动生成' }}<span v-if="details.stlName">({{ details.stlName }})</span></div>
+        <div class="iconfont"><span style="color: #7A8798;"><span class="iconfont icon-chakan mr5"></span>会计期间：</span>{{ details.accountDate }}</div>
+        <div class="iconfont"><span style="color: #7A8798;"><span class="iconfont icon-calendar mr5"></span>结算日期：</span>{{ details.stlDate }}<span v-if="details.stlName">({{ details.stlName }})</span></div>
       </div>
       <div class="lock-box">
         <a-dropdown>
@@ -22,8 +22,8 @@
               <a-menu-item v-for="item in FnblType" :key="item.value" @click="toggleType(item.value)">{{ item.label }}</a-menu-item>
             </a-menu>
           </template>
-          <a-button type="link">
-            <span class="iconfont" :class="{ 'icon-xiangzi': typeId == '整箱', 'icon-shichuang-duoge': typeId == '拼箱主票', 'icon-liebiao1': typeId == '拼箱分票', 'icon-a-1': typeId == '拼箱单票', 'icon-hebing': typeId == '合票主票', 'icon-cengji': typeId == '合票分票' }"></span>
+          <a-button type="link" :class="{ 'S': typeId == 'S', 'R': typeId == 'R', 'D': typeId == 'D', 'O': typeId == 'O' }">
+            <span class="iconfont" :class="{ 'icon-xiangzi': typeId == 'S', 'icon-xuehua1': typeId == 'R', 'icon-jinggao2': typeId == 'D', 'icon-Icon-': typeId == 'O' }"></span>
             {{ typeName }}
             <span class="iconfont icon-30jiantouxiangxiafill"></span>
           </a-button>
@@ -122,11 +122,6 @@
     () => props.details,
     (v) => {
       setFieldsValue(v)
-      if (v.blType) {
-        typeId.value = v.blType
-      } else {
-        typeId.value = '整箱'
-      }
     }
   )
   defineExpose({
@@ -162,19 +157,9 @@
     .mr5 {
       margin-right: 5px;
     }
-    .icon-30jiantouxiangxiafill {
-      margin-left: 3px;
-    }
     .ant-divider-vertical {
       color: #CED5D9!important;
-      margin: 0 15px 0 0!important;
-    }
-    .ant-dropdown-trigger {
-      position: relative;
-      top: -0.5px;
-      span {
-        color: #257AFA!important;
-      }
+      margin: 0 15px!important;
     }
     .lock-box {
       width: 100%;
@@ -183,7 +168,7 @@
       border-radius: 2px;
       margin: 8px 0;
       .iconfont {
-        line-height: 22px;
+        line-height: 25px;
       }
     }
     position: relative;