diff --git a/src/components/CostEntry/components/applyModify.tsx b/src/components/CostEntry/components/applyModify.tsx
index 842f814a..a2fe9da3 100644
--- a/src/components/CostEntry/components/applyModify.tsx
+++ b/src/components/CostEntry/components/applyModify.tsx
@@ -74,7 +74,7 @@ export const formSchema: FormSchema[] = [
       return {
         api: () => {
           return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
               resolve(res)
             })
           })
diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue
index d875dc9d..ff2374f1 100644
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@@ -242,7 +242,7 @@
       type: 'dropdown',
       visible: true,
       source: async (query, process) => {
-        const results = await getDictOption('djy_cust_prop')
+        const results = await getDictOption('infoclient-ArrclientTag')
         const dict = results.map((item) => {
           return item.name + '-' + item.value 
         })
@@ -672,7 +672,7 @@
               }
             }
             // 根据客户类别带出相应的费用对象
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
               const item = res.filter((item) => {
                 return list.value[changes[0][0]]['customerTypeText'] && list.value[changes[0][0]]['customerTypeText'].includes(item.name)
               })
@@ -701,7 +701,7 @@
         }
         // 修改客户类别
         if (changes[0][1] === 'customerTypeText') {
-          getDictOption('djy_cust_prop').then((res) => {
+          getDictOption('infoclient-ArrclientTag').then((res) => {
             const item = res.filter((item) => {
               return changes[0][3].includes(item.name)
             })
diff --git a/src/components/Table/src/components/settings/ColumnSetting.vue b/src/components/Table/src/components/settings/ColumnSetting.vue
index ca2f03b0..f1bee1c6 100644
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -222,7 +222,6 @@
             ...item,
           })
         })
-        console.log(ret)
         return ret
       }
 
diff --git a/src/hooks/web/warterMark.ts b/src/hooks/web/warterMark.ts
new file mode 100644
index 00000000..16b03dc0
--- /dev/null
+++ b/src/hooks/web/warterMark.ts
@@ -0,0 +1,64 @@
+/*
+ * @Desc: 水印hooks
+ * @Author: lijj
+ * @Date: 2024-11-14 09:57:21
+ */
+const domSymbol = Symbol('watermark-dom')
+
+export function useWatermark(
+  op = 0.15,
+  appendEl: HTMLElement | null = document.body
+) {
+  let func: any = () => {}
+  const id = domSymbol.toString()
+  const clear = () => {
+    const domId = document.getElementById(id)
+    if (domId) {
+      const el = appendEl
+      el && el.removeChild(domId)
+    }
+    window.removeEventListener('resize', func)
+  }
+  const createWatermark = (str: string) => {
+    clear()
+
+    const can = document.createElement('canvas')
+    can.width = 300
+    can.height = 240
+
+    const cans = can.getContext('2d')
+    if (cans) {
+      cans.rotate((-25 * Math.PI) / 120)
+      cans.font = '15px Vedana'
+      cans.fillStyle = `rgba(0, 0, 0, ${op})`
+      cans.textAlign = 'left'
+      cans.textBaseline = 'middle'
+      cans.fillText(str, can.width / 20, can.height)
+    }
+
+    const div = document.createElement('div')
+    div.id = id
+    div.style.pointerEvents = 'none'
+    div.style.top = '0px'
+    div.style.left = '0px'
+    div.style.position = 'absolute'
+    div.style.zIndex = '100000000'
+    div.style.width = document.documentElement.clientWidth + 'px'
+    div.style.height = document.documentElement.clientHeight - 80 + 'px'
+    div.style.background =
+      'url(' + can.toDataURL('image/png') + ') left top repeat'
+    const el = appendEl
+    el && el.appendChild(div)
+    return id
+  }
+
+  function setWatermark(str: string) {
+    createWatermark(str)
+    func = () => {
+      createWatermark(str)
+    }
+    window.addEventListener('resize', func)
+  }
+
+  return { setWatermark, clear }
+}
\ No newline at end of file
diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
index 5b7ca5fd..623c3b5c 100644
--- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
@@ -616,7 +616,7 @@
       source: async (query, process) => {
         const res = ContainerOwnerDict.value.length
           ? ContainerOwnerDict.value
-          : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+          : (await GetSupplierListByCode({ code: 'leasing' }))?.data
         if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
         const dict = res.map((res) => {
           return res.pinYinCode
@@ -753,7 +753,7 @@
         if (changes[0][1] === 'oldContainerOwner') {
           const res = ContainerOwnerDict.value.length
             ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
           if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
           const item = res.filter((item) => {
             return item.pinYinCode === changes[0][3]
@@ -765,7 +765,7 @@
         if (changes[0][1] === 'CtnFlowStateId') {
           const res = CtnFlowStateDict.value.length
             ? CtnFlowStateDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
           if (!CtnFlowStateDict.value.length) CtnFlowStateDict.value = res
           const item = res.filter((item) => {
             return item.pinYinCode === changes[0][3]
diff --git a/src/views/ContainerManagement/BuyCtn/columns.tsx b/src/views/ContainerManagement/BuyCtn/columns.tsx
index e94c98a3..52f97c40 100644
--- a/src/views/ContainerManagement/BuyCtn/columns.tsx
+++ b/src/views/ContainerManagement/BuyCtn/columns.tsx
@@ -137,7 +137,7 @@ export const searchFormSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -232,7 +232,7 @@ export const formSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -335,7 +335,7 @@ export const formSearchBoxSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx
index 86a36085..c15a07b0 100644
--- a/src/views/ContainerManagement/CurrentState/columns.tsx
+++ b/src/views/ContainerManagement/CurrentState/columns.tsx
@@ -229,7 +229,7 @@ export const searchFormSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -563,7 +563,7 @@ export const formSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
index 8fc76f09..52b04a2a 100644
--- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
@@ -516,7 +516,7 @@
     //   source: async (query, process) => {
     //     const res = ContainerOwnerDict.value.length
     //       ? ContainerOwnerDict.value
-    //       : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+    //       : (await GetSupplierListByCode({ code: 'leasing' }))?.data
     //     if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
     //     const dict = res.map((res) => {
     //       return res.pinYinCode
@@ -626,7 +626,7 @@
         if (changes[0][1] === 'oldContainerOwner') {
           const res = ContainerOwnerDict.value.length
             ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
           if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
           const item = res.filter((item) => {
             return item.pinYinCode === changes[0][3]
diff --git a/src/views/ContainerManagement/CustFeeDui/columns.tsx b/src/views/ContainerManagement/CustFeeDui/columns.tsx
index 33a5ebdd..fbe1b445 100644
--- a/src/views/ContainerManagement/CustFeeDui/columns.tsx
+++ b/src/views/ContainerManagement/CustFeeDui/columns.tsx
@@ -136,7 +136,7 @@ export const searchFormSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -251,7 +251,7 @@ export const formSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'id',
diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
index cf8da45f..bd1ade80 100644
--- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
@@ -679,7 +679,7 @@
     //   source: async (query, process) => {
     //     const res = ContainerOwnerDict.value.length
     //       ? ContainerOwnerDict.value
-    //       : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+    //       : (await GetSupplierListByCode({ code: 'leasing' }))?.data
     //     if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
     //     const dict = res.map((res) => {
     //       return res.pinYinCode
@@ -870,7 +870,7 @@
         if (changes[0][1] === 'oldContainerOwner') {
           const res = ContainerOwnerDict.value.length
             ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
           if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
           const item = res.filter((item) => {
             return item.pinYinCode === changes[0][3]
@@ -991,7 +991,7 @@
     //   source: async (query, process) => {
     //     const res = ContainerOwnerDict.value.length
     //       ? ContainerOwnerDict.value
-    //       : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+    //       : (await GetSupplierListByCode({ code: 'leasing' }))?.data
     //     if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
     //     const dict = res.map((res) => {
     //       return res.pinYinCode
@@ -1172,7 +1172,7 @@
         if (changes[0][1] === 'oldContainerOwner') {
           const res = ContainerOwnerDict.value.length
             ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
           if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
           const item = res.filter((item) => {
             return item.pinYinCode === changes[0][3]
diff --git a/src/views/ContainerManagement/RentIn/columns.tsx b/src/views/ContainerManagement/RentIn/columns.tsx
index 0f81a88f..664f1799 100644
--- a/src/views/ContainerManagement/RentIn/columns.tsx
+++ b/src/views/ContainerManagement/RentIn/columns.tsx
@@ -198,7 +198,7 @@ export const searchFormSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -446,7 +446,7 @@ export const formSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -541,7 +541,7 @@ export const formSearchBoxSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'id',
@@ -565,7 +565,7 @@ export const formSearchBoxSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetCtnSelectList,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'ctnName',
         showName: 'ctnName',
         valueField: 'ctnName',
diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
index c1c577f0..2bf7471d 100644
--- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
@@ -623,7 +623,7 @@
       source: async (query, process) => {
         const res = ContainerOwnerDict.value.length
           ? ContainerOwnerDict.value
-          : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+          : (await GetSupplierListByCode({ code: 'leasing' }))?.data
         if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
         const dict = res.map((res) => {
           return res.pinYinCode
@@ -853,7 +853,7 @@
         if (changes[0][1] === 'oldContainerOwner') {
           const res = ContainerOwnerDict.value.length
             ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
           if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
           const item = res.filter((item) => {
             return item.pinYinCode === changes[0][3]
diff --git a/src/views/ContainerManagement/RentOneWay/columns.tsx b/src/views/ContainerManagement/RentOneWay/columns.tsx
index 85ab7a13..7ed98f07 100644
--- a/src/views/ContainerManagement/RentOneWay/columns.tsx
+++ b/src/views/ContainerManagement/RentOneWay/columns.tsx
@@ -170,7 +170,7 @@ export const searchFormSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -406,7 +406,7 @@ export const formSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -501,13 +501,13 @@ export const formSearchBoxSchema: FormSchema[] = [
   //   required: false,
   //   dynamicDisabled: false,
   //   colProps: { span: 6 },
-  //   // api: GetSupplierListByCode({ code: 'isLeasing' }),
+  //   // api: GetSupplierListByCode({ code: 'leasing' }),
   //   componentProps: ({ formModel }) => {
   //     return {
   //       allowClear: true,
   //       showSearch: true,
-  //       api: GetSupplierListByCode({ code: 'isLeasing' }),
-  //     params: { code: 'isLeasing' },
+  //       api: GetSupplierListByCode({ code: 'leasing' }),
+  //     params: { code: 'leasing' },
   //       labelField: 'pinYinCode',
   //       showName: 'shortName',
   //       valueField: 'shortName',
@@ -591,7 +591,7 @@ export const formSearchBoxSchema: FormSchema[] = [
   //       allowClear: true,
   //       showSearch: true,
   //       api: GetSupplierListByCode,
-  //     params: { code: 'isLeasing' },
+  //     params: { code: 'leasing' },
   //       labelField: 'pinYinCode',
   //       showName: 'shortName',
   //       valueField: 'shortName',
diff --git a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
index bc66b65a..46dae44e 100644
--- a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
@@ -569,7 +569,7 @@
       source: async (query, process) => {
         const res = ContainerOwnerDict.value.length
           ? ContainerOwnerDict.value
-          : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+          : (await GetSupplierListByCode({ code: 'leasing' }))?.data
         if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
         const dict = res.map((res) => {
           return res.pinYinCode
@@ -796,7 +796,7 @@
         if (changes[0][1] === 'oldContainerOwner') {
           const res = ContainerOwnerDict.value.length
             ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
           if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
           const item = res.filter((item) => {
             return item.pinYinCode === changes[0][3]
diff --git a/src/views/ContainerManagement/RentOneWayIn/columns.tsx b/src/views/ContainerManagement/RentOneWayIn/columns.tsx
index 4df4bf75..3c414d33 100644
--- a/src/views/ContainerManagement/RentOneWayIn/columns.tsx
+++ b/src/views/ContainerManagement/RentOneWayIn/columns.tsx
@@ -174,7 +174,7 @@ export const searchFormSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -410,7 +410,7 @@ export const formSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -504,7 +504,7 @@ export const formSearchBoxSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
index 48458903..96826703 100644
--- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
@@ -695,7 +695,7 @@
     //   source: async (query, process) => {
     //     const res = ContainerOwnerDict.value.length
     //       ? ContainerOwnerDict.value
-    //       : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+    //       : (await GetSupplierListByCode({ code: 'leasing' }))?.data
     //     if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
     //     const dict = res.map((res) => {
     //       return res.pinYinCode
@@ -897,7 +897,7 @@
         if (changes[0][1] === 'ctnOwner') {
           const res = ContainerOwnerDict.value.length
             ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
           if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
           const item = res.filter((item) => {
             return item.pinYinCode === changes[0][3]
@@ -1032,7 +1032,7 @@
     //   source: async (query, process) => {
     //     const res = ContainerOwnerDict.value.length
     //       ? ContainerOwnerDict.value
-    //       : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+    //       : (await GetSupplierListByCode({ code: 'leasing' }))?.data
     //     if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
     //     const dict = res.map((res) => {
     //       return res.pinYinCode
@@ -1234,7 +1234,7 @@
         if (changes[0][1] === 'ctnOwner') {
           const res = ContainerOwnerDict.value.length
             ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
           if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
           const item = res.filter((item) => {
             return item.pinYinCode === changes[0][3]
diff --git a/src/views/ContainerManagement/RentOut/columns.tsx b/src/views/ContainerManagement/RentOut/columns.tsx
index 5c98d135..0733fd9c 100644
--- a/src/views/ContainerManagement/RentOut/columns.tsx
+++ b/src/views/ContainerManagement/RentOut/columns.tsx
@@ -207,7 +207,7 @@ export const searchFormSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -454,7 +454,7 @@ export const formSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
@@ -543,13 +543,13 @@ export const formSearchBoxSchema: FormSchema[] = [
     required: false,
     dynamicDisabled: false,
     colProps: { span: 6 },
-    // api: GetSupplierListByCode({ code: 'isLeasing' }),
+    // api: GetSupplierListByCode({ code: 'leasing' }),
     componentProps: ({ formModel }) => {
       return {
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
diff --git a/src/views/ContainerManagement/SellCtn/columns.tsx b/src/views/ContainerManagement/SellCtn/columns.tsx
index 20b7baaf..fedc5761 100644
--- a/src/views/ContainerManagement/SellCtn/columns.tsx
+++ b/src/views/ContainerManagement/SellCtn/columns.tsx
@@ -198,7 +198,7 @@ export const formSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx
index 53866730..af0e6682 100644
--- a/src/views/ContainerManagement/StateChange/columns.tsx
+++ b/src/views/ContainerManagement/StateChange/columns.tsx
@@ -337,7 +337,7 @@ export const formSchema: FormSchema[] = [
         allowClear: true,
         showSearch: true,
         api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
diff --git a/src/views/baseinfo/accountMaintenance/columns.tsx b/src/views/baseinfo/accountMaintenance/columns.tsx
index 6f41ef35..9349c0f5 100644
--- a/src/views/baseinfo/accountMaintenance/columns.tsx
+++ b/src/views/baseinfo/accountMaintenance/columns.tsx
@@ -11,7 +11,7 @@ const accountTypeDict = ref([])
 getDictOption('account_type').then((data) => {
   accountTypeDict.value = data
 })
-getDictOption('djy_cust_prop').then((data) => {
+getDictOption('infoclient-ArrclientTag').then((data) => {
   customTypeDict.value = data
 })
 // 客户名称下拉框数据
diff --git a/src/views/baseinfo/accountMaintenance/index.vue b/src/views/baseinfo/accountMaintenance/index.vue
index c29b0446..a2b37fbb 100644
--- a/src/views/baseinfo/accountMaintenance/index.vue
+++ b/src/views/baseinfo/accountMaintenance/index.vue
@@ -58,7 +58,7 @@
       const res: API.DataResult = await ApiList(p)
       // 处理下拉框数据
       const adicts = await getDictOption('account_type')
-      const ddicts = await getDictOption('djy_cust_prop')
+      const ddicts = await getDictOption('infoclient-ArrclientTag')
       res?.data.forEach((row) => {
         adicts.forEach((item) => {
           if (item.value == row.accountType) {
diff --git a/src/views/baseinfo/infoclient/ClientAccountDateModal.vue b/src/views/baseinfo/infoclient/ClientAccountDateModal.vue
index b2010f54..396410ed 100644
--- a/src/views/baseinfo/infoclient/ClientAccountDateModal.vue
+++ b/src/views/baseinfo/infoclient/ClientAccountDateModal.vue
@@ -17,6 +17,7 @@
         ghost
         style="margin-right: 0.8rem"
         @click="closeModal"
+        :disabled="props.disabled"
         >取消</a-button
       >
       <a-button
@@ -25,6 +26,7 @@
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
+        :disabled="props.disabled"
         >仅保存</a-button
       >
       <a-button
@@ -32,6 +34,7 @@
         type="primary"
         :loading="loading"
         @click="handleSave(true)"
+        :disabled="props.disabled"
         >保存并关闭</a-button
       >
     </template>
@@ -46,11 +49,17 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
+  const props = defineProps({
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  })
   const isUpdate = ref(true)
   const loading = ref(false)
   const rowId = ref('')
   const { notification } = useMessage()
-  const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+  const [registerForm, { resetFields, setProps, setFieldsValue, validate }] = useForm({
     labelWidth: 100,
     schemas: CADformSchema,
     showActionButtonGroup: false,
@@ -73,6 +82,7 @@
     } else {
       setFieldsValue({ clientId: data.record.id })
     }
+    setProps({ disabled: props.disabled })
     setModalProps({ loading: false })
   })
 
diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue
index 59eb8bd6..0b4e2b6f 100644
--- a/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/TenantAuditStepModal.vue
@@ -17,6 +17,7 @@
         ghost
         style="margin-right: 0.8rem"
         @click="closeModal"
+        :disabled="props.disabled"
         >取消</a-button
       >
       <a-button
@@ -25,6 +26,7 @@
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
+        :disabled="props.disabled"
         >仅保存</a-button
       >
       <a-button
@@ -32,6 +34,7 @@
         type="primary"
         :loading="loading"
         @click="handleSave(true)"
+        :disabled="props.disabled"
         >保存并关闭</a-button
       >
     </template>
@@ -47,6 +50,12 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
+  const props = defineProps({
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  })
   const isUpdate = ref(true)
   const loading = ref(false)
   const rowId = ref('')
@@ -55,6 +64,7 @@
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
+    disabled: props.disabled,
   })
 
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx b/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx
index 3f0ebfee..04d74056 100644
--- a/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/columns.tsx
@@ -80,7 +80,7 @@ export const formSchema: FormSchema[] = [
     field: 'userName',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     colProps: { span: 24 },
     componentProps: ({ formModel }) => {
       return {
diff --git a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
index aee0e266..4696139a 100644
--- a/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
+++ b/src/views/baseinfo/infoclient/ClientStakeholder/index.vue
@@ -3,11 +3,11 @@
     <BasicTable class="ds-table-detail" @register="registerTable">
       <template #tableTitle>
         <span class="title">干系人列表</span>
-        <a-button type="link" @click="handleCreate">
+        <a-button type="link" @click="handleCreate" :disabled="props.disabled">
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
-        <a-button type="link" @click="handleDel">
+        <a-button type="link" @click="handleDel" :disabled="props.disabled">
           <span class="iconfont icon-shanchu2"></span>
           删除
         </a-button>
@@ -26,7 +26,11 @@
         </template>
       </template>
     </BasicTable>
-    <TenantAuditStepModal @register="registerModal" @success="handleSuccess" />
+    <TenantAuditStepModal
+      @register="registerModal"
+      @success="handleSuccess"
+      :disabled="props.disabled"
+    />
     <a-modal
       :visible="visible"
       title="审批备注"
@@ -50,6 +54,10 @@
   import TenantAuditStepModal from './TenantAuditStepModal.vue'
   const props = defineProps({
     clientId: { type: String },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   })
   const visible = ref(false)
   const remark = ref('')
diff --git a/src/views/baseinfo/infoclient/Data/ClientTag.json b/src/views/baseinfo/infoclient/Data/ClientTag.json
deleted file mode 100644
index 98248c36..00000000
--- a/src/views/baseinfo/infoclient/Data/ClientTag.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-  { "label": "船公司", "value": "isCarrier" },
-  { "label": "订舱口", "value": "isBooking" },
-  { "label": "场站", "value": "isYard" },
-  { "label": "车队", "value": "isTruck" },
-  { "label": "委托单位", "value": "isController" },
-  { "label": "报关行", "value": "isCustom" },
-  { "label": "代理(国外)", "value": "isAgent" },
-  { "label": "代理(国内)", "value": "isAgentCn" },
-  { "label": "快递公司", "value": "isExpress" },
-  { "label": "航空公司", "value": "isAirLines" },
-  { "label": "国外发货人", "value": "isShipper" },
-  { "label": "通知人", "value": "isNotifyParty" },
-  { "label": "仓库", "value": "isWareHouse" },
-  { "label": "码头", "value": "isWharf" },
-  { "label": "保险公司", "value": "isInsurer" },
-  { "label": "租箱公司", "value": "isLeasing" },
-  { "label": "贸易代理", "value": "isTradingAgency" },
-  { "label": "其他", "value": "isOther" },
-  { "label": "船代", "value": "isShipAgency" },
-  { "label": "经营单位", "value": "isEnterprise" },
-  { "label": "国内发货人", "value": "isShipperCn" }
-]
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue
index 578a667b..9f9b0ea2 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/TenantAuditStepModal.vue
@@ -10,7 +10,12 @@
     <!-- 费用模版表单 -->
     <BasicForm @register="registerForm" />
     <!-- 费用字段表格 -->
-    <FeeField ref="feeField" @success="handleSuccess" v-show="!isBulk"></FeeField>
+    <FeeField
+      ref="feeField"
+      @success="handleSuccess"
+      :disabled="props.disabled"
+      v-show="!isBulk"
+    ></FeeField>
     <!--右下角按钮-->
     <template #footer>
       <a-button
@@ -20,6 +25,7 @@
         ghost
         style="margin-right: 0.8rem"
         @click="closeModal"
+        :disabled="props.disabled"
       >
         取消
       </a-button>
@@ -29,6 +35,7 @@
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
+        :disabled="props.disabled"
       >
         仅保存
       </a-button>
@@ -37,6 +44,7 @@
         type="primary"
         :loading="loading"
         @click="handleSave(true)"
+        :disabled="props.disabled"
       >
         保存并关闭
       </a-button>
@@ -61,6 +69,10 @@
   const props = defineProps({
     customerName: { type: String },
     customerId: { type: String },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   })
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
@@ -88,6 +100,7 @@
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
+    disabled: props.disabled,
   })
   const unitArr = ref<any>([])
   const BulkInfoArr = ref<any>([])
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
index 035c2ab6..54c8c844 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
@@ -440,7 +440,7 @@ export const searchFormSchema: FormSchema[] = [
   //   label: '客户名称',
   //   component: 'ApiSelect',
   //   required: false,
-  //   dynamicDisabled: false,
+  //
   //   colProps: { span: 4 },
   //   componentProps: ({ formModel }) => {
   //     return {
@@ -514,7 +514,7 @@ export const searchFormSchema: FormSchema[] = [
     label: '起运港',
     field: 'polCode',
     component: 'ApiSelect',
-    dynamicDisabled: false,
+
     colProps: { span: 4 },
     componentProps: () => {
       return {
@@ -535,7 +535,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'podCode',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     colProps: { span: 4 },
     componentProps: () => {
       return {
@@ -556,7 +556,7 @@ export const searchFormSchema: FormSchema[] = [
     label: '航线',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
       return {
@@ -575,7 +575,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'sourceId',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
       return {
@@ -608,12 +608,12 @@ export const searchFormSchema: FormSchema[] = [
     component: 'ApiSelect',
     required: false,
     // labelSlot: 'yardId',
-    dynamicDisabled: false,
+
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'id',
@@ -629,7 +629,7 @@ export const searchFormSchema: FormSchema[] = [
     label: '付费方式',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     colProps: { span: 4 },
     componentProps: () => {
       return {
@@ -841,7 +841,7 @@ export const formSchema: FormSchema[] = [
     label: '起运港',
     field: 'polCode',
     component: 'ApiSelect',
-    dynamicDisabled: false,
+
     colProps: { span: 6 },
     componentProps: () => {
       return {
@@ -862,7 +862,7 @@ export const formSchema: FormSchema[] = [
     field: 'podCode',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     colProps: { span: 6 },
     componentProps: () => {
       return {
@@ -883,7 +883,7 @@ export const formSchema: FormSchema[] = [
     label: '航线',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
@@ -902,7 +902,7 @@ export const formSchema: FormSchema[] = [
     field: 'sourceId',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     colProps: { span: 6 },
     componentProps: ({ formActionType, formModel }) => {
       return {
@@ -1001,12 +1001,12 @@ export const formSchema: FormSchema[] = [
     component: 'ApiSelect',
     required: false,
     // labelSlot: 'yardId',
-    dynamicDisabled: false,
+
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'id',
@@ -1022,7 +1022,7 @@ export const formSchema: FormSchema[] = [
     label: '付费方式',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     defaultValue: null,
     colProps: { span: 6 },
     componentProps: ({ formModel, formActionType }) => {
@@ -1151,7 +1151,7 @@ export const detailsFormSchema: FormSchema[] = [
     label: '费用名称',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     defaultValue: null,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {
@@ -1212,14 +1212,14 @@ export const detailsFormSchema: FormSchema[] = [
     label: '客户类别',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     defaultValue: null,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
         api: () => {
           return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
               resolve(res)
             })
           })
@@ -1258,7 +1258,7 @@ export const detailsFormSchema: FormSchema[] = [
     label: '单位标准',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     defaultValue: null,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {
@@ -1306,7 +1306,7 @@ export const detailsFormSchema: FormSchema[] = [
     label: '币别',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     defaultValue: null,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
index 42bae383..37f27a68 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
@@ -3,15 +3,15 @@
     <div class="flex">
       <span class="title">费用明细</span>
       <div>
-        <a-button type="link" @click="OpenSetCondition">
+        <a-button type="link" @click="OpenSetCondition" :disabled="props.disabled">
           <span class="iconfont icon-jichupeizhi"></span>
           设置方案条件
         </a-button>
-        <a-button type="link" @click="addRow">
+        <a-button type="link" @click="addRow" :disabled="props.disabled">
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
-        <a-button type="link" @click="copyRow">
+        <a-button type="link" @click="copyRow" :disabled="props.disabled">
           <span class="iconfont icon-fuzhi"></span>
           复制
         </a-button>
@@ -25,7 +25,7 @@
           cancel-text="否"
           @confirm="deleteRow"
         >
-          <a-button type="link">
+          <a-button type="link" :disabled="props.disabled">
             <span class="iconfont icon-shanchu21"></span>
             删除
           </a-button>
@@ -61,14 +61,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import {
-    ref,
-    onMounted,
-    watch,
-    nextTick,
-    defineComponent,
-    watchEffect
-  } from 'vue'
+  import { ref, onMounted, watch, nextTick, defineComponent, watchEffect } from 'vue'
   // 下拉框数据接口
   import { GetFeeCodeSelectList, GetFeeCurrencySelectList } from '/@/api/common'
   import { getColumns, DeleteDetails, ApiBulkEditDetails } from './api'
@@ -90,7 +83,12 @@
   })
   registerAllModules()
   const { createMessage, notification } = useMessage()
-  const props = defineProps({})
+  const props = defineProps({
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  })
 
   // ---------------------设置方案条件--------------------
   let Arr = ref([
@@ -218,7 +216,7 @@
   }
   const SetData = async (data) => {
     list.value.splice(0)
-    const customerTypeList: any = await getDictOption('djy_cust_prop')
+    const customerTypeList: any = await getDictOption('infoclient-ArrclientTag')
     const unitList: any = await feeUnitDict2()
     const unitList2: any = await getDictOption('fee_unit')
     console.log(unitList, unitList2)
@@ -324,7 +322,7 @@
       data: 'customerTypeText',
       type: 'dropdown',
       source: async (query, process) => {
-        const results = await getDictOption('djy_cust_prop')
+        const results = await getDictOption('infoclient-ArrclientTag')
         console.log(results)
         const dict = results.map((item) => {
           return item.value + '-' + item.name
@@ -542,7 +540,7 @@
 
         // 修改客户类别
         if (changes[0][1] === 'customerTypeText') {
-          getDictOption('djy_cust_prop').then((res) => {
+          getDictOption('infoclient-ArrclientTag').then((res) => {
             const item = res.filter((item) => {
               return changes[0][3].includes(item.name)
             })
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue b/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
index f6d102f7..058adae2 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/index.vue
@@ -7,11 +7,11 @@
           <a-switch @change="ChangeView" v-model:checked="ShowView" :loading="ShowViewLoading" />
           <span class="ShowViewText">按费用显示</span>
         </div>
-        <a-button type="link" @click="handleCreate">
+        <a-button type="link" @click="handleCreate" :disabled="props.disabled">
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
-        <a-button type="link" @click="BulkEdit">
+        <a-button type="link" @click="BulkEdit" :disabled="props.disabled">
           <span class="iconfont icon-dengjizongshu"></span>
           批量编辑
         </a-button>
@@ -21,7 +21,7 @@
           cancel-text="否"
           @confirm="handleDelete"
         >
-          <a-button type="link">
+          <a-button type="link" :disabled="props.disabled">
             <span class="iconfont icon-shanchu21"></span>
             删除
           </a-button>
@@ -34,6 +34,7 @@
               {
                 icon: 'ant-design:copy-outlined',
                 tooltip: '复制',
+                disabled: props.disabled,
                 onClick: () => {
                   copyBooking(record)
                 },
@@ -53,6 +54,7 @@
       @success="handleSuccess"
       :customerName="props.customerName"
       :customerId="props.clientId"
+      :disabled="props.disabled"
     />
   </div>
 </template>
@@ -69,6 +71,10 @@
   const props = defineProps({
     clientId: { type: String },
     customerName: { type: String },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   })
   const [registerModal, { openModal }] = useModal()
   const ShowView = ref(false)
diff --git a/src/views/baseinfo/infoclient/ReleaseType/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/ReleaseType/TenantAuditStepModal.vue
index a3778621..0a959e4b 100644
--- a/src/views/baseinfo/infoclient/ReleaseType/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/ReleaseType/TenantAuditStepModal.vue
@@ -17,6 +17,7 @@
         ghost
         style="margin-right: 0.8rem"
         @click="closeModal"
+        :disabled="props.disabled"
         >取消</a-button
       >
       <a-button
@@ -25,6 +26,7 @@
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
+        :disabled="props.disabled"
         >仅保存</a-button
       >
       <a-button
@@ -32,6 +34,7 @@
         type="primary"
         :loading="loading"
         @click="handleSave(true)"
+        :disabled="props.disabled"
         >保存并关闭</a-button
       >
     </template>
@@ -46,6 +49,12 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
+  const props = defineProps({
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  })
   const isUpdate = ref(true)
   const loading = ref(false)
   const rowId = ref('')
@@ -54,6 +63,7 @@
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
+    disabled: props.disabled,
   })
 
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
diff --git a/src/views/baseinfo/infoclient/ReleaseType/columns.tsx b/src/views/baseinfo/infoclient/ReleaseType/columns.tsx
index a437d5a0..80506d10 100644
--- a/src/views/baseinfo/infoclient/ReleaseType/columns.tsx
+++ b/src/views/baseinfo/infoclient/ReleaseType/columns.tsx
@@ -94,7 +94,7 @@ export const formSchema: FormSchema[] = [
     labelSlot: 'carrierId',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     colProps: { span: 20 },
     componentProps: ({ formModel }) => {
       return {
@@ -134,7 +134,7 @@ export const formSchema: FormSchema[] = [
     field: 'loadingPort',
     component: 'ApiSelect',
     required: true,
-    dynamicDisabled: false,
+
     colProps: { span: 20 },
     componentProps: () => {
       return {
diff --git a/src/views/baseinfo/infoclient/ReleaseType/index.vue b/src/views/baseinfo/infoclient/ReleaseType/index.vue
index a47a9325..e248659b 100644
--- a/src/views/baseinfo/infoclient/ReleaseType/index.vue
+++ b/src/views/baseinfo/infoclient/ReleaseType/index.vue
@@ -3,7 +3,11 @@
     <BasicTable class="ds-table-detail" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
         <span class="title">放舱方式设置</span>
-        <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:ctn:add')">
+        <a-button
+          type="link"
+          @click="handleCreate"
+          :disabled="checkPermissions('op:ctn:add') || props.disabled"
+        >
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
@@ -13,7 +17,7 @@
           cancel-text="否"
           @confirm="handleDel"
         >
-          <a-button type="link" :disabled="checkPermissions('op:ctn:del')">
+          <a-button type="link" :disabled="checkPermissions('op:ctn:del') || props.disabled">
             <span class="iconfont icon-shanchu21"></span>
             删除
           </a-button>
@@ -35,7 +39,11 @@
         </template>
       </template>
     </BasicTable>
-    <TenantAuditStepModal @register="registerModal" @success="handleSuccess" />
+    <TenantAuditStepModal
+      @register="registerModal"
+      @success="handleSuccess"
+      :disabled="props.disabled"
+    />
   </div>
 </template>
 <script lang="ts" setup>
@@ -60,6 +68,10 @@
     customerName: {
       type: String,
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   })
   const [registerTable, { reload, getForm, getSelectRows }] = useTable({
     title: '',
@@ -134,7 +146,7 @@
 </script>
 <style lang="less" scoped>
   .ds-table-detail {
-    margin-top: -16px;
+    // margin-top: -16px;
     .title {
       font-size: 12px;
       font-weight: 700;
diff --git a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
index b2c48555..b2d1cd9a 100644
--- a/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/TenantAuditStepModal.vue
@@ -80,7 +80,12 @@
         <Divider type="vertical" />
         <span class="gradeClass">
           <span>客户等级：</span>
-          <a-select class="gradeSelect" :bordered="false" v-model:value="grade">
+          <a-select
+            class="gradeSelect"
+            :bordered="false"
+            v-model:value="grade"
+            :disabled="Fndisabled()"
+          >
             <a-select-option value="A">A</a-select-option>
             <a-select-option value="B">B</a-select-option>
             <a-select-option value="C">C</a-select-option>
@@ -95,6 +100,7 @@
             :bordered="false"
             v-model:value="CustomerOrSupplier"
             @change="ChangeCustomerOrSupplier"
+            :disabled="Fndisabled()"
           >
             <a-select-option value="isCustomer">
               <span class="iconfont icon-yonghu1"></span>
@@ -154,6 +160,7 @@
                     v-model:checked="model.shortName"
                     placeholder="请输入"
                     style="flex: 1; margin-right: 5px"
+                    :disabled="Rpermissions()"
                   />
                   <div class="JiaoYan">
                     <span class="text" v-if="!IsAvailableDisabled">请完成客户校验</span>
@@ -185,6 +192,7 @@
                   :value="model.description"
                   v-model:checked="model.description"
                   placeholder="请输入"
+                  :disabled="Rpermissions()"
                 />
               </template>
             </BasicForm>
@@ -236,20 +244,30 @@
               </div>
             </div>
             <div>
-              <Tabs3 :client-id="clientId" :saleId="saleId" :sourceId="sourceId" />
+              <Tabs3
+                :client-id="clientId"
+                :saleId="saleId"
+                :sourceId="sourceId"
+                :disabled="Fndisabled()"
+              />
             </div>
           </a-tab-pane>
           <!-- 自动费用模板 -->
           <a-tab-pane key="3" tab="自动费用模板">
-            <FeeCustTemplate :client-id="clientId" :customer-name="customerName" class="RUnit" />
+            <FeeCustTemplate
+              :client-id="clientId"
+              :customer-name="customerName"
+              :disabled="Fndisabled()"
+              class="RUnit"
+            />
           </a-tab-pane>
           <!-- 联系人信息 -->
           <a-tab-pane key="4" tab="联系人信息">
-            <Menus2 :client-id="clientId" class="RUnit" />
+            <Menus2 :client-id="clientId" :disabled="Fndisabled()" class="RUnit" />
           </a-tab-pane>
           <!-- 收发货人信息维护 -->
           <a-tab-pane key="5" tab="收发货人信息维护">
-            <Menus3 :client-id="clientId" class="RUnit" />
+            <Menus3 :client-id="clientId" :disabled="Fndisabled()" class="RUnit" />
           </a-tab-pane>
           <!-- 合同管理 -->
           <!-- <a-tab-pane key="7" tab="固定费用">
@@ -257,15 +275,27 @@
           </a-tab-pane> -->
           <!-- 客户参数表格 -->
           <a-tab-pane key="8" tab="客户参数">
-            <CustomerParams :client-id="clientId" :customer-name="customerName"></CustomerParams>
-            <ReleaseType :client-id="clientId" :customer-name="customerName"></ReleaseType>
+            <CustomerParams
+              :client-id="clientId"
+              :customer-name="customerName"
+              :disabled="Fndisabled()"
+            ></CustomerParams>
+            <ReleaseType
+              :client-id="clientId"
+              :customer-name="customerName"
+              :disabled="Fndisabled()"
+            ></ReleaseType>
           </a-tab-pane>
           <a-tab-pane key="9" tab="干系人">
-            <ClientStakeholder :client-id="clientId" />
+            <ClientStakeholder :client-id="clientId" :disabled="Fndisabled()" />
           </a-tab-pane>
         </a-tabs>
       </div>
-      <ClientAccountDateModal @register="CADModal" @success="handleSuccess" />
+      <ClientAccountDateModal
+        @register="CADModal"
+        @success="handleSuccess"
+        :disabled="Fndisabled()"
+      />
     </div>
     <ApproveBtns
       agreeText="审核通过"
@@ -346,6 +376,7 @@
   // 字典
   import { getDictOption } from '/@/utils/dictUtil'
   import { useAppStore } from '/@/store/modules/app'
+  import { checkPermissions } from '/@/hooks/Permissions/index'
   const appStore = useAppStore()
   // import Menus5 from './menu5/index.vue'
   // import { tr } from 'node_modules/element-plus/es/locale'
@@ -596,6 +627,7 @@
       validateFields,
       updateSchema,
       appendSchemaByField,
+      setProps,
     },
   ] = useForm({
     labelWidth: 100,
@@ -681,6 +713,7 @@
       setFieldsValue: setFieldsValue1,
       validate: validate1,
       updateSchema: updateSchema1,
+      setProps: setProps1,
     },
   ] = useForm({
     labelWidth: 140,
@@ -758,8 +791,29 @@
       isUpdate: true,
     })
   }
+  function Rpermissions() {
+    let RData = false
+    if (auditStatusText.value == '审核通过') {
+      if (!checkPermissions('op:infoclient:approvalEdit')) {
+        RData = false
+      } else {
+        RData = true
+      }
+    }
+    return RData
+  }
   function Fndisabled() {
-    return rowId.value ? false : true
+    let RData = true
+    if (auditStatusText.value == '审核通过') {
+      if (!checkPermissions('op:infoclient:approvalEdit')) {
+        RData = false
+      } else {
+        RData = true
+      }
+    } else {
+      RData = rowId.value ? false : true
+    }
+    return RData
   }
   function delboxLine() {
     let ApiData: any = {
@@ -848,6 +902,11 @@
         activeKey.value = '1'
         reload()
       }
+      if (auditStatusText.value == '审核通过') {
+        setProps({ disabled: checkPermissions('op:infoclient:approvalEdit') })
+        setProps1({ disabled: checkPermissions('op:infoclient:approvalEdit') })
+      }
+
       ApiGetUsage({ ids: [unref(rowId)] }).then((res) => {
         if (res.data[0].isUsed) {
           updateSchema({
@@ -857,7 +916,7 @@
         } else {
           updateSchema({
             field: 'shortName',
-            dynamicDisabled: false,
+            dynamicDisabled: false || Rpermissions(),
           })
         }
       })
diff --git a/src/views/baseinfo/infoclient/customerParams/components/Modal.vue b/src/views/baseinfo/infoclient/customerParams/components/Modal.vue
index 8f338338..cea78a5c 100644
--- a/src/views/baseinfo/infoclient/customerParams/components/Modal.vue
+++ b/src/views/baseinfo/infoclient/customerParams/components/Modal.vue
@@ -19,6 +19,7 @@
         ghost
         style="margin-right: 0.8rem"
         @click="closeModal"
+        :disabled="props.disabled"
       >
         取消
       </a-button>
@@ -28,6 +29,7 @@
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
+        :disabled="props.disabled"
       >
         仅保存
       </a-button>
@@ -36,6 +38,7 @@
         type="primary"
         :loading="loading"
         @click="handleSave(true)"
+        :disabled="props.disabled"
       >
         保存并关闭
       </a-button>
@@ -55,6 +58,12 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
+  const props = defineProps({
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  })
   const isUpdate = ref(true)
   // 按钮loading
   const loading = ref(false)
@@ -64,6 +73,7 @@
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
+    disabled: props.disabled,
   })
 
   const [registerModal, { setModalProps, closeModal, updateFormField }] = useModalInner(
diff --git a/src/views/baseinfo/infoclient/customerParams/index.vue b/src/views/baseinfo/infoclient/customerParams/index.vue
index 13ddb93b..54b9245b 100644
--- a/src/views/baseinfo/infoclient/customerParams/index.vue
+++ b/src/views/baseinfo/infoclient/customerParams/index.vue
@@ -3,7 +3,7 @@
     <BasicTable class="ds-table-detail" @register="registerTable" @row-dbClick="handleEdit">
       <template #tableTitle>
         <span class="title">客户参数列表</span>
-        <a-button type="link" @click="handleCreate">
+        <a-button type="link" @click="handleCreate" :disabled="props.disabled">
           <span class="iconfont icon-new_document"></span>
           新建
         </a-button>
@@ -21,6 +21,7 @@
                 icon: 'ant-design:delete-outlined',
                 tooltip: '删除',
                 color: 'error',
+                disabled: props.disabled,
                 popConfirm: {
                   title: '是否要删除此条数据？',
                   okText: '是',
@@ -33,7 +34,7 @@
         </template>
       </template>
     </BasicTable>
-    <Modal @register="registerModal" @success="handleSuccess" />
+    <Modal @register="registerModal" @success="handleSuccess" :disabled="props.disabled" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -56,10 +57,14 @@
     customerName: {
       type: String,
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   })
   const [registerTable, { reload, getForm, getPaginationRef }] = useTable({
     title: '',
-    maxHeight: 250,
+    maxHeight: 200,
     api: async (p) => {
       const res: API.DataResult = await GetClientParamList(p)
       return new Promise((resolve) => {
diff --git a/src/views/baseinfo/infoclient/menu2/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/menu2/TenantAuditStepModal.vue
index 179431de..3a87269e 100644
--- a/src/views/baseinfo/infoclient/menu2/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/menu2/TenantAuditStepModal.vue
@@ -17,6 +17,7 @@
         ghost
         style="margin-right: 0.8rem"
         @click="closeModal"
+        :disabled="props.disabled"
         >取消</a-button
       >
       <a-button
@@ -25,6 +26,7 @@
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
+        :disabled="props.disabled"
         >仅保存</a-button
       >
       <a-button
@@ -32,6 +34,7 @@
         type="primary"
         :loading="loading"
         @click="handleSave(true)"
+        :disabled="props.disabled"
         >保存并关闭</a-button
       >
     </template>
@@ -46,6 +49,12 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
+  const props = defineProps({
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  })
   const isUpdate = ref(true)
   const loading = ref(false)
   const rowId = ref('')
@@ -54,6 +63,7 @@
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
+    disabled: props.disabled,
   })
 
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
diff --git a/src/views/baseinfo/infoclient/menu2/index.vue b/src/views/baseinfo/infoclient/menu2/index.vue
index e9ac27d9..cfade2d5 100644
--- a/src/views/baseinfo/infoclient/menu2/index.vue
+++ b/src/views/baseinfo/infoclient/menu2/index.vue
@@ -3,7 +3,7 @@
     <BasicTable class="ds-table-detail" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
         <span class="title">客户联系人列表</span>
-        <a-button type="link" @click="handleCreate">
+        <a-button type="link" @click="handleCreate" :disabled="props.disabled">
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
@@ -21,6 +21,7 @@
                 icon: 'ant-design:delete-outlined',
                 tooltip: '删除',
                 color: 'error',
+                disabled: props.disabled,
                 popConfirm: {
                   title: '是否要删除此条数据？',
                   okText: '是',
@@ -33,7 +34,11 @@
         </template>
       </template>
     </BasicTable>
-    <TenantAuditStepModal @register="registerModal" @success="handleSuccess" />
+    <TenantAuditStepModal
+      @register="registerModal"
+      @success="handleSuccess"
+      :disabled="props.disabled"
+    />
   </div>
 </template>
 <script lang="ts" setup>
@@ -47,6 +52,10 @@
   const { notification } = useMessage()
   const props = defineProps({
     clientId: { type: String },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   })
   const [registerModal, { openModal }] = useModal()
   const [registerTable, { reload, getDataSource, getPaginationRef }] = useTable({
diff --git a/src/views/baseinfo/infoclient/menu3/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/menu3/TenantAuditStepModal.vue
index 20f227cf..95a23df5 100644
--- a/src/views/baseinfo/infoclient/menu3/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/menu3/TenantAuditStepModal.vue
@@ -17,6 +17,7 @@
         ghost
         style="margin-right: 0.8rem"
         @click="closeModal"
+        :disabled="props.disabled"
         >取消</a-button
       >
       <a-button
@@ -25,6 +26,7 @@
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
+        :disabled="props.disabled"
         >仅保存</a-button
       >
       <a-button
@@ -32,6 +34,7 @@
         type="primary"
         :loading="loading"
         @click="handleSave(true)"
+        :disabled="props.disabled"
         >保存并关闭</a-button
       >
     </template>
@@ -46,6 +49,12 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
+  const props = defineProps({
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  })
   const isUpdate = ref(true)
   const loading = ref(false)
   const rowId = ref('')
@@ -54,6 +63,7 @@
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
+    disabled: props.disabled,
   })
 
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
diff --git a/src/views/baseinfo/infoclient/menu3/index.vue b/src/views/baseinfo/infoclient/menu3/index.vue
index fe4ca0c9..8a90fe19 100644
--- a/src/views/baseinfo/infoclient/menu3/index.vue
+++ b/src/views/baseinfo/infoclient/menu3/index.vue
@@ -3,7 +3,7 @@
     <BasicTable class="ds-table-detail" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
         <span class="title">客户收发货人列表</span>
-        <a-button type="link" @click="handleCreate">
+        <a-button type="link" @click="handleCreate" :disabled="props.disabled">
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
@@ -21,6 +21,7 @@
                 icon: 'ant-design:delete-outlined',
                 tooltip: '删除',
                 color: 'error',
+                disabled: props.disabled,
                 popConfirm: {
                   title: '是否要删除此条数据？',
                   okText: '是',
@@ -33,7 +34,11 @@
         </template>
       </template>
     </BasicTable>
-    <TenantAuditStepModal @register="registerModal" @success="handleSuccess" />
+    <TenantAuditStepModal
+      @register="registerModal"
+      @success="handleSuccess"
+      :disabled="props.disabled"
+    />
   </div>
 </template>
 <script lang="ts" setup>
@@ -47,6 +52,10 @@
   const { notification } = useMessage()
   const props = defineProps({
     clientId: { type: String },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   })
   const [registerModal, { openModal }] = useModal()
   const [registerTable, { reload, getForm, getPaginationRef }] = useTable({
diff --git a/src/views/baseinfo/infoclient/tabs3/TenantAuditStepModal.vue b/src/views/baseinfo/infoclient/tabs3/TenantAuditStepModal.vue
index d8e5eb80..b294f837 100644
--- a/src/views/baseinfo/infoclient/tabs3/TenantAuditStepModal.vue
+++ b/src/views/baseinfo/infoclient/tabs3/TenantAuditStepModal.vue
@@ -17,6 +17,7 @@
         ghost
         style="margin-right: 0.8rem"
         @click="closeModal"
+        :disabled="props.disabled"
         >取消</a-button
       >
       <a-button
@@ -25,6 +26,7 @@
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
+        :disabled="props.disabled"
         >仅保存</a-button
       >
       <a-button
@@ -32,6 +34,7 @@
         type="primary"
         :loading="loading"
         @click="handleSave(true)"
+        :disabled="props.disabled"
         >保存并关闭</a-button
       >
     </template>
@@ -46,6 +49,12 @@
   import { useMessage } from '/@/hooks/web/useMessage'
   // 声明Emits
   const emit = defineEmits(['success', 'register'])
+  const props = defineProps({
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  })
   const isUpdate = ref(true)
   const loading = ref(false)
   const rowId = ref('')
@@ -54,6 +63,7 @@
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
+    disabled: props.disabled,
   })
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
     resetFields()
diff --git a/src/views/baseinfo/infoclient/tabs3/index.vue b/src/views/baseinfo/infoclient/tabs3/index.vue
index bdc8790f..fe4168ad 100644
--- a/src/views/baseinfo/infoclient/tabs3/index.vue
+++ b/src/views/baseinfo/infoclient/tabs3/index.vue
@@ -3,7 +3,7 @@
     <BasicTable class="ds-table-detail" @register="registerTable" :maxHeight="350">
       <template #tableTitle>
         <span class="title">账期信息</span>
-        <a-button type="link" @click="handleCreate" :disabled="Fndisabled()">
+        <a-button type="link" @click="handleCreate" :disabled="props.disabled">
           <span class="iconfont icon-new_document"></span>
           添加
         </a-button>
@@ -13,12 +13,12 @@
           cancel-text="否"
           @confirm="handleDel"
         >
-          <a-button type="link" :disabled="Fndisabled()">
+          <a-button type="link" :disabled="props.disabled">
             <span class="iconfont icon-shanchu21"></span>
             删除
           </a-button>
         </a-popconfirm>
-        <a-button type="link" @click="FnAppendix" :disabled="Fndisabled()">
+        <a-button type="link" @click="FnAppendix" :disabled="props.disabled">
           <span class="iconfont icon-fujian1"></span>
           合同附件
         </a-button>
@@ -38,7 +38,11 @@
         </template>
       </template>
     </BasicTable>
-    <TenantAuditStepModal @register="registerModal" @success="handleSuccess" />
+    <TenantAuditStepModal
+      @register="registerModal"
+      @success="handleSuccess"
+      :disabled="props.disabled"
+    />
     <a-modal v-model:visible="visible" title="合同附件" @ok="handleOk">
       <div style="width: 400px">
         <DsFile ref="dsFile" fileType="infoclient" :id="props.clientId" />
@@ -60,6 +64,10 @@
     clientId: { type: String },
     saleId: { type: String },
     sourceId: { type: String },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
   })
   const [registerModal, { openModal }] = useModal()
   const visible = ref(false)
@@ -160,9 +168,9 @@
       }
     })
   }
-  function Fndisabled() {
-    return props.clientId ? false : true
-  }
+  // function Fndisabled() {
+  //   return props.clientId ? false : true
+  // }
   function handleAudit(record: Recordable) {
     openModal(true, {
       record,
diff --git a/src/views/fee/FeeCustTemplate/columns.tsx b/src/views/fee/FeeCustTemplate/columns.tsx
index 37ac502f..a304e238 100644
--- a/src/views/fee/FeeCustTemplate/columns.tsx
+++ b/src/views/fee/FeeCustTemplate/columns.tsx
@@ -638,7 +638,7 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'id',
@@ -920,7 +920,7 @@ export const viewSearchFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'id',
@@ -1321,7 +1321,7 @@ export const formSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'id',
@@ -1507,7 +1507,7 @@ export const detailsFormSchema: FormSchema[] = [
       return {
         api: () => {
           return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
               resolve(res)
             })
           })
diff --git a/src/views/fee/FeeCustTemplate/feeField.vue b/src/views/fee/FeeCustTemplate/feeField.vue
index 90251059..031bfac4 100644
--- a/src/views/fee/FeeCustTemplate/feeField.vue
+++ b/src/views/fee/FeeCustTemplate/feeField.vue
@@ -218,7 +218,7 @@
   }
   const SetData = async (data) => {
     list.value.splice(0)
-    const customerTypeList: any = await getDictOption('djy_cust_prop')
+    const customerTypeList: any = await getDictOption('infoclient-ArrclientTag')
     const unitList: any = await feeUnitDict2()
     const unitList2: any = await getDictOption('fee_unit')
     console.log(unitList, unitList2)
@@ -329,7 +329,7 @@
       data: 'customerTypeText',
       type: 'dropdown',
       source: async (query, process) => {
-        const results = await getDictOption('djy_cust_prop')
+        const results = await getDictOption('infoclient-ArrclientTag')
         const dict = results.map((item) => {
           return item.value + '-' + item.name
         })
@@ -546,7 +546,7 @@
 
         // 修改客户类别
         if (changes[0][1] === 'customerTypeText') {
-          getDictOption('djy_cust_prop').then((res) => {
+          getDictOption('infoclient-ArrclientTag').then((res) => {
             const item = res.filter((item) => {
               return changes[0][3].includes(item.name)
             })
diff --git a/src/views/fee/code/columns.tsx b/src/views/fee/code/columns.tsx
index 7fbbc8a2..92100e68 100644
--- a/src/views/fee/code/columns.tsx
+++ b/src/views/fee/code/columns.tsx
@@ -251,7 +251,7 @@ export const formSchema: FormSchema[] = [
       return {
         api: () => {
           return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
               resolve(res)
             })
           })
@@ -285,7 +285,7 @@ export const formSchema: FormSchema[] = [
       return {
         api: () => {
           return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
               resolve(res)
             })
           })
diff --git a/src/views/fee/template/components/feeField.vue b/src/views/fee/template/components/feeField.vue
index 207c84e2..89224dcb 100644
--- a/src/views/fee/template/components/feeField.vue
+++ b/src/views/fee/template/components/feeField.vue
@@ -156,7 +156,7 @@
       data: 'customerTypeText',
       type: 'dropdown',
       source: async (query, process) => {
-        const results = await getDictOption('djy_cust_prop')
+        const results = await getDictOption('infoclient-ArrclientTag')
         console.log(results)
         const dict = results.map((item) => {
           return item.value + '-' + item.name
@@ -462,7 +462,7 @@
         }
         // 修改客户类别
         if (changes[0][1] === 'customerTypeText') {
-          getDictOption('djy_cust_prop').then((res) => {
+          getDictOption('infoclient-ArrclientTag').then((res) => {
             const item = res.filter((item) => {
               return changes[0][3].includes(item.name)
             })
diff --git a/src/views/operation/CustomerReconciliation/columns.tsx b/src/views/operation/CustomerReconciliation/columns.tsx
index 5ce7a866..a45ce7c7 100644
--- a/src/views/operation/CustomerReconciliation/columns.tsx
+++ b/src/views/operation/CustomerReconciliation/columns.tsx
@@ -127,13 +127,14 @@ export const searchFormSchema: FormSchema[] = [
 
 //列表
 export const columns: BasicColumn[] = [
-  { title: '对账编号', dataIndex: 'billNo', align: 'left' },
-  { title: '对账客户', dataIndex: 'customerName', align: 'left' },
-  { title: '对账单名称', dataIndex: 'billName', align: 'left' },
+  { title: '对账编号', dataIndex: 'billNo', align: 'left', width: 150 },
+  { title: '对账客户', dataIndex: 'customerName', align: 'left', width: 150 },
+  { title: '对账单名称', dataIndex: 'billName', align: 'left', width: 150 },
   {
     title: '收付类型',
     dataIndex: 'billType',
     align: 'left',
+    width: 100,
     // customRender: ({ text }) => {
     //   let RData = '-'
     //   billTypeData.forEach((e) => {
@@ -148,11 +149,13 @@ export const columns: BasicColumn[] = [
     title: '账单状态',
     dataIndex: 'isLocking',
     align: 'left',
+    width: 100,
   },
   {
     title: '是否不含税',
     dataIndex: 'isNoTax',
     align: 'left',
+    width: 100,
     // customRender: ({ text }) => {
     //   let RData = '-'
     //   if (text == 'true') {
@@ -163,15 +166,15 @@ export const columns: BasicColumn[] = [
     //   return RData
     // },
   },
-  { title: '应收RMB', dataIndex: 'rmbdr', align: 'left' },
-  { title: '未收RMB', dataIndex: 'balrmbdr', align: 'left' },
-  { title: '应收USD', dataIndex: 'usddr', align: 'left' },
-  { title: '未收USD', dataIndex: 'balusddr', align: 'left' },
-  { title: '应付RMB', dataIndex: 'rmbcr', align: 'left' },
-  { title: '未付RMB', dataIndex: 'balrmbcr', align: 'left' },
-  { title: '应付USD', dataIndex: 'usdcr', align: 'left' },
-  { title: '未付USD', dataIndex: 'balusdcr', align: 'left' },
-  { title: '对账时间', dataIndex: 'createTime', align: 'left' },
-  { title: '对账人', dataIndex: 'createByName', align: 'left' },
-  { title: '备注', dataIndex: 'note', align: 'left' },
+  { title: '应收RMB', dataIndex: 'rmbdr', align: 'left', width: 100 },
+  { title: '未收RMB', dataIndex: 'balrmbdr', align: 'left', width: 100 },
+  { title: '应收USD', dataIndex: 'usddr', align: 'left', width: 100 },
+  { title: '未收USD', dataIndex: 'balusddr', align: 'left', width: 100 },
+  { title: '应付RMB', dataIndex: 'rmbcr', align: 'left', width: 100 },
+  { title: '未付RMB', dataIndex: 'balrmbcr', align: 'left', width: 100 },
+  { title: '应付USD', dataIndex: 'usdcr', align: 'left', width: 100 },
+  { title: '未付USD', dataIndex: 'balusdcr', align: 'left', width: 100 },
+  { title: '对账时间', dataIndex: 'createTime', align: 'left', width: 150 },
+  { title: '对账人', dataIndex: 'createByName', align: 'left', width: 100 },
+  { title: '备注', dataIndex: 'note', align: 'left', width: 150 },
 ]
diff --git a/src/views/operation/CustomerReconciliation/detail/detailColumns.tsx b/src/views/operation/CustomerReconciliation/detail/detailColumns.tsx
index a2df6b47..1a32b61f 100644
--- a/src/views/operation/CustomerReconciliation/detail/detailColumns.tsx
+++ b/src/views/operation/CustomerReconciliation/detail/detailColumns.tsx
@@ -351,7 +351,7 @@ export const columnsR: BasicColumn[] = [
   // { title: '对账Id', dataIndex: 'checkId', align: 'left' },
   // { title: '业务Id', dataIndex: 'businessId', align: 'left' },
   // { title: '费用记录Id', dataIndex: 'feeRecordId', align: 'left' },
-  { title: '对账金额', dataIndex: 'checkBillAmount', align: 'left' },
+  // { title: '对账金额', dataIndex: 'checkBillAmount', align: 'left' },
   // { title: '费用Id', dataIndex: 'feeId', align: 'left' },
   { title: '费用名称', dataIndex: 'feeName', align: 'left' },
   { title: '费用对象', dataIndex: 'customerName', align: 'left' },
@@ -371,6 +371,8 @@ export const columnsR: BasicColumn[] = [
   { title: '排序', dataIndex: 'orderNo', align: 'left' },
   { title: '不含税金额', dataIndex: 'noTaxAmount', align: 'left' },
   { title: '未结算金额', dataIndex: 'balAmount', align: 'left' },
+  // { title: '对帐编号', dataIndex: 'debitNo', align: 'left' },
+  // { title: '是否对帐', dataIndex: 'isDebit', align: 'left' },
 ]
 //附件列表
 export const columnsFile: BasicColumn[] = [
diff --git a/src/views/operation/CustomerReconciliation/detail/index.vue b/src/views/operation/CustomerReconciliation/detail/index.vue
index a6d3588e..44d295be 100644
--- a/src/views/operation/CustomerReconciliation/detail/index.vue
+++ b/src/views/operation/CustomerReconciliation/detail/index.vue
@@ -516,6 +516,7 @@
       BatchDelCheckBillDetail(Apidata).then((res) => {
         if (res.succeeded) {
           notification.success({ message: '删除成功', duration: 3 })
+          setTableDataR([])
           init()
         }
       })
@@ -613,7 +614,7 @@
   }
   const RefInfo = ref()
   // 添加对账明细
-  async function AddDetailL(e) {
+  async function AddDetailL(e, RData) {
     if (!id.value) {
       setFieldsValue({
         ...getFieldsValue(),
@@ -623,9 +624,18 @@
       await Save()
     }
     e.id = id.value
-    AddCheckBillDetail(e).then((res) => {
+    AddCheckBillDetail(e).then(async (res) => {
       if (res.succeeded) {
         notification.success({ message: '添加成功', duration: 3 })
+        let RApiData: any = {
+          ids: [],
+          customerId: e.customerId,
+          customerName: e.customerName,
+        }
+        RData.forEach((item) => {
+          RApiData.ids.push(item.id)
+        })
+        await AddDetailR(RApiData)
         init()
         RefInfo.value.handleSubmit()
         RefInfo.value.closeModal()
@@ -634,6 +644,8 @@
   }
   // 添加对账费用明细
   async function AddDetailR(e) {
+    console.log(e)
+
     if (!id.value) {
       setFieldsValue({
         ...getFieldsValue(),
@@ -645,10 +657,11 @@
     console.log(
       getSelectRowsL(),
       getSelectRowsL().length,
-      getSelectRowsL()[getSelectRowsL().length - 1].checkId,
+      // getSelectRowsL()[getSelectRowsL().length - 1].checkId,
     )
 
-    e.id = getSelectRowsL()[getSelectRowsL().length - 1].checkId
+    // e.id = getSelectRowsL()[getSelectRowsL().length - 1].checkId
+    e.id = id.value
     AddCheckBillFeeRecords(e).then((res) => {
       if (res.succeeded) {
         notification.success({ message: '添加成功', duration: 3 })
diff --git a/src/views/operation/CustomerReconciliation/detail/info/index.vue b/src/views/operation/CustomerReconciliation/detail/info/index.vue
index 6a09f752..ae24622f 100644
--- a/src/views/operation/CustomerReconciliation/detail/info/index.vue
+++ b/src/views/operation/CustomerReconciliation/detail/info/index.vue
@@ -88,6 +88,8 @@
     GetBusinessQueryList,
     GetFeeRecordQueryList,
   } from '/@/views/operation/CustomerReconciliation/api.js'
+  import { useMessage } from '/@/hooks/web/useMessage'
+  const { notification } = useMessage()
   const spinningR = ref(false)
   const spinningL = ref(false)
   const emit = defineEmits(['AddDetailL', 'AddDetailR'])
@@ -109,6 +111,11 @@
     const res: API.DataResult = await GetBusinessQueryList(beforeFetch(getFieldsValue()))
     if (res.succeeded) {
       dataSourceL.value = res.data
+      clearSelectedRowKeysL()
+      if (res.data.length) {
+        setSelectedRowKeysL([res.data[0].id])
+        selectionChange({ rows: [{ id: res.data[0].id }] })
+      }
       setTableData([...res.data])
       setTableDataRT([])
       // setTableDataRB([])
@@ -119,12 +126,20 @@
   // 左侧表格
   const [
     registerTableL,
-    { getPaginationRef, setTableData, getSelectRows: getSelectRowsL, getDataSource },
+    {
+      getPaginationRef,
+      setTableData,
+      getSelectRows: getSelectRowsL,
+      getSelectRowKeys: getSelectRowKeysL,
+      setSelectedRowKeys: setSelectedRowKeysL,
+      clearSelectedRowKeys: clearSelectedRowKeysL,
+    },
   ] = useTable({
     maxHeight: 360,
     title: '',
     dataSource: dataSourceL.value,
-    rowSelection: { type: 'checkbox' },
+    rowSelection: { type: 'radio' },
+    rowKey: 'id',
     columns: columnsL,
     pagination: true,
     striped: true,
@@ -137,7 +152,7 @@
   function selectionChange(e) {
     if (e.rows.length) {
       spinningR.value = true
-      let ApiData = {
+      let ApiData: any = {
         queryCondition: `[{"FieldName":"businessId","FieldValue":"${
           e.rows[e.rows.length - 1].id
         }","ConditionalType":1}]`,
@@ -145,6 +160,17 @@
           sortConditions: [],
         },
       }
+      RQueryArr.forEach((item) => {
+        if (getFieldsValue()[item]) {
+          ApiData.queryCondition = JSON.parse(ApiData.queryCondition)
+          ApiData.queryCondition.push({
+            FieldName: item,
+            FieldValue: getFieldsValue()[item],
+            ConditionalType: 1,
+          })
+          ApiData.queryCondition = JSON.stringify(ApiData.queryCondition)
+        }
+      })
       GetFeeRecordQueryList(ApiData).then((res) => {
         let Arr: any = [
           { currency: 'RMB', cr: 0, dr: 0 },
@@ -249,6 +275,11 @@
       const res: API.DataResult = await GetBusinessQueryList(beforeFetch(getFieldsValue()))
       if (res.succeeded) {
         dataSourceL.value = res.data
+        clearSelectedRowKeysL()
+        if (res.data.length) {
+          setSelectedRowKeysL([res.data[0].id])
+          selectionChange({ rows: [{ id: res.data[0].id }] })
+        }
         setTableData([...res.data])
         setTableDataRT([])
         // setTableDataRB([])
@@ -258,20 +289,22 @@
     }, 100)
   })
   // 右上侧表格
-  const [registerTableRT, { setTableData: setTableDataRT, getSelectRows: getSelectRowsR }] =
-    useTable({
-      maxHeight: 360,
-      title: '',
-      rowSelection: { type: 'checkbox' },
-      columns: columnsRT,
-      pagination: true,
-      striped: true,
-      showTableSetting: false,
-      bordered: true,
-      showIndexColumn: true,
+  const [
+    registerTableRT,
+    { setTableData: setTableDataRT, getSelectRows: getSelectRowsR, getDataSource },
+  ] = useTable({
+    maxHeight: 360,
+    title: '',
+    rowSelection: { type: 'checkbox' },
+    columns: columnsRT,
+    pagination: true,
+    striped: true,
+    showTableSetting: false,
+    bordered: true,
+    showIndexColumn: true,
 
-      immediate: false,
-    })
+    immediate: false,
+  })
   // // 右下侧表格
   // const [registerTableRB, { setTableData: setTableDataRB }] = useTable({
   //   title: '',
@@ -298,12 +331,16 @@
       customerId: '',
       customerName: '',
     }
-    getSelectRowsL().forEach((item) => {
-      Apidata.ids.push(item.id)
+    getSelectRowKeysL().forEach((item) => {
+      Apidata.ids.push(item)
+      dataSourceL.value.forEach((e) => {
+        if (e.id == item) {
+          Apidata.customerId = e.customerId
+          Apidata.customerName = e.customerName
+        }
+      })
     })
-    Apidata.customerId = getSelectRowsL()[0].customerId
-    Apidata.customerName = getSelectRowsL()[0].customerName
-    emit('AddDetailL', Apidata)
+    emit('AddDetailL', Apidata, getDataSource())
   }
   // 增加账单费用明细
   function addDetailR() {
@@ -313,11 +350,16 @@
       customerName: '',
     }
     getSelectRowsR().forEach((item) => {
-      console.log(item)
       Apidata.ids.push(item.id)
     })
-    Apidata.customerId = getSelectRowsL()[0].customerId
-    Apidata.customerName = getSelectRowsL()[0].customerName
+    getSelectRowKeysL().forEach((item) => {
+      dataSourceL.value.forEach((e) => {
+        if (e.id == item) {
+          Apidata.customerId = e.customerId
+          Apidata.customerName = e.customerName
+        }
+      })
+    })
     emit('AddDetailR', Apidata)
   }
   defineExpose({
diff --git a/src/views/operation/CustomerReconciliation/detail/info/infoColumns.tsx b/src/views/operation/CustomerReconciliation/detail/info/infoColumns.tsx
index 3677a77f..f4599774 100644
--- a/src/views/operation/CustomerReconciliation/detail/info/infoColumns.tsx
+++ b/src/views/operation/CustomerReconciliation/detail/info/infoColumns.tsx
@@ -26,6 +26,7 @@ export const RQueryArr = [
   'isDebit',
   'feeName',
   'currency',
+  'feeType',
   // 'createTime',
   // // 'billType',
   // 'isDebit',
@@ -122,7 +123,7 @@ export const schemas: FormSchema[] = [
   },
 
   {
-    field: 'billType',
+    field: 'feeType',
     component: 'Select',
     componentProps: {
       options: billTypeData,
@@ -130,6 +131,15 @@ export const schemas: FormSchema[] = [
     label: '收付类型',
     colProps: { span: 4 },
   },
+  // {
+  //   field: 'billType',
+  //   component: 'Select',
+  //   componentProps: {
+  //     options: billTypeData,
+  //   },
+  //   label: '收付类型',
+  //   colProps: { span: 4 },
+  // },
   {
     field: 'isDebit',
     component: 'Select',
diff --git a/src/views/operation/CustomerReconciliation/index.vue b/src/views/operation/CustomerReconciliation/index.vue
index 76616333..8039aca3 100644
--- a/src/views/operation/CustomerReconciliation/index.vue
+++ b/src/views/operation/CustomerReconciliation/index.vue
@@ -93,19 +93,6 @@
             <span>{{ record.billNo }}</span>
           </div>
         </template>
-        <template v-if="column.key === 'action'">
-          <TableAction
-            :actions="[
-              {
-                icon: 'clarity:note-edit-line',
-                tooltip: '编辑',
-                onClick: () => {
-                  GoDetailed(true, record)
-                },
-              },
-            ]"
-          />
-        </template>
         <template v-if="column.dataIndex == 'isLocking'">
           <span v-if="record.isLocking">
             <i class="iconfont icon-locksuo"></i>
@@ -126,6 +113,29 @@
           <a-tag color="success" v-else>否</a-tag>
         </template>
       </template>
+      <template v-slot:tableAction="{ record }">
+        <a-tooltip placement="top" :mouseEnterDelay="0.5">
+          <template #title>
+            <span>编辑</span>
+          </template>
+          <a-button type="link" @click="GoDetailed(true, record)">
+            <span class="iconfont icon-icon_519"></span>
+          </a-button>
+        </a-tooltip>
+      </template>
+      <!-- <template v-if="column.key === 'action'">
+          <TableAction
+            :actions="[
+              {
+                icon: 'clarity:note-edit-line',
+                tooltip: '编辑',
+                onClick: () => {
+                  GoDetailed(true, record)
+                },
+              },
+            ]"
+          />
+        </template> -->
     </BasicTable>
     <!-- 合计 -->
     <div class="static-box">
@@ -183,46 +193,10 @@
       beforeFetch: (p) => {
         return formatParams(p)
       },
-      // beforeFetch: () => {
-      //   var currentPageInfo: any = getPaginationRef()
-      //   var data = getForm().getFieldsValue()
-      //   const postParam: API.PageRequest = {
-      //     queryCondition: '',
-      //     pageCondition: {
-      //       pageIndex: currentPageInfo.current,
-      //       pageSize: currentPageInfo.pageSize,
-      //       sortConditions: [],
-      //     },
-      //   }
-      //   postParam.pageCondition.sortConditions.push({
-      //     sortField: 'createTime',
-      //     listSortDirection: 1,
-      //   })
-      //   let condition: API.ConditionItem[] = []
-      //   if (!!data.billNo) {
-      //     condition.push({
-      //       FieldName: 'billNo',
-      //       FieldValue: data.billNo,
-      //       ConditionalType: 1,
-      //     })
-      //   }
-      //   if (!!data.customerName) {
-      //     condition.push({
-      //       FieldName: 'customerName',
-      //       FieldValue: data.customerName,
-      //       ConditionalType: 1,
-      //     })
-      //   }
-      //   postParam.queryCondition = JSON.stringify(condition)
-      //   return postParam
-      // },
       columns,
       formConfig: {
         labelWidth: 120,
-        // 表格表单需要的过滤字段集合
         schemas: searchFormSchema,
-        // 是否显示高级查询(默认否)
-        useAdvancedSearch: true,
       },
       isTreeTable: false,
       pagination: true,
@@ -236,12 +210,11 @@
       },
       canResize: true,
       resizeHeightOffset: 90,
+      autoHeight: tbHeight,
       immediate: true,
       tableComponent: 'vxe',
-      autoHeight: tbHeight,
-      id: '1',
       actionColumn: {
-        width: 80,
+        width: 60,
         title: '操作',
         dataIndex: 'action',
         fixed: 'right',
diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx
index a36d6bc8..923880e4 100644
--- a/src/views/operation/seaexport/columns.tsx
+++ b/src/views/operation/seaexport/columns.tsx
@@ -302,7 +302,7 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: () => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isContract' },
+        params: { code: 'contract' },
         labelField: 'pinYinCode',
         valueField: 'id',
         showName: 'shortName',
@@ -327,7 +327,7 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: () => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
         labelField: 'pinYinCode',
         valueField: 'forwarderId',
         showName: 'description',
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index 8cbddda9..8c234b4c 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -4,7 +4,7 @@
  * @Date: 2024-04-29 11:54:04
 -->
 <template>
-  <div class="sea-export-detail" :class="{ 'ds-view-box': source != 'edit' }">
+  <div ref="seaExportDetail" class="sea-export-detail" :class="{ 'ds-view-box': source != 'edit' }">
     <a-tabs
       size="small"
       class="main-tab mt10"
@@ -227,7 +227,9 @@
   
   import { useMultipleTabStore } from '/@/store/modules/multipleTab'
   import { Divider } from 'ant-design-vue'
-  
+  import { useWatermark } from '/@/hooks/web/warterMark'
+  // 水印容器
+  const seaExportDetail = ref(null)
   const go = useGo()
   // 页面loading
   const loading = ref(false)
@@ -483,11 +485,8 @@
         bookingDetails.value = res.data
         // 如果是审批页面切状态是已审单弹出选择现舱非现舱
         inPageLoading.value = false
-        // 如果存在表单修改规则，重新更新表单
-        // if (res.data.formSetList && res.data.formSetList.length) {
-        //   const formSetContent = JSON.parse(res.data.formSetList[0].content)
-          // RefbasicInfo.value.updateSchema()
-        // }
+        const { setWatermark, clear } = useWatermark(0.2, seaExportDetail.value)
+        // setWatermark('待订舱')
       })
       .catch(() => {
         loading.value = false
diff --git a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
index 75d4d09b..ffff6f35 100644
--- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
+++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
@@ -276,7 +276,7 @@ export const formSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isTruck' },
+        params: { code: 'truck' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
@@ -488,7 +488,7 @@ export const formSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isYard' },
+        params: { code: 'yard' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
@@ -703,7 +703,7 @@ export const formSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isYard' },
+        params: { code: 'yard' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
diff --git a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx
index 8ba4739a..ed025ef5 100644
--- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx
+++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx
@@ -437,7 +437,7 @@ export const formSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isYard' },
+        params: { code: 'yard' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',
diff --git a/src/views/operation/seaexport/detail/modules/PersonModal.vue b/src/views/operation/seaexport/detail/modules/PersonModal.vue
index 90a06956..c7ad4e7f 100644
--- a/src/views/operation/seaexport/detail/modules/PersonModal.vue
+++ b/src/views/operation/seaexport/detail/modules/PersonModal.vue
@@ -80,7 +80,7 @@
       }
     } else {
       // 新建设置默认值
-      const arr = await getDictOption('djy_cust_prop')
+      const arr = await getDictOption('infoclient-ArrclientTag')
       if (data.companyType) {
         const res = arr.filter(item => {
           return item.label == data.companyType
diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index a7c2d329..8b073ab2 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -214,7 +214,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel, formActionType }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isContract' },
+        params: { code: 'contract' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'shortName',
@@ -327,7 +327,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
@@ -2748,7 +2748,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isTruck' },
+        params: { code: 'truck' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
@@ -2782,7 +2782,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isAgent' },
+        params: { code: 'agent' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
@@ -2811,7 +2811,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isYard' },
+        params: { code: 'yard' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
@@ -2846,7 +2846,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isShipagency' },
+        params: { code: 'shipagency' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
@@ -2881,7 +2881,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isCustom' },
+        params: { code: 'custom' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
@@ -2994,7 +2994,7 @@ export const otherInfoFormSchema: FormSchema[] = [
 // 客户类别下拉框数据
 const customTypeDict = ref([])
 const personList = ref([])
-getDictOption('djy_cust_prop').then((data) => {
+getDictOption('infoclient-ArrclientTag').then((data) => {
   customTypeDict.value = data
 })
 // 关系人表单
diff --git a/src/views/operation/seaexport/detail/modules/preOrder.tsx b/src/views/operation/seaexport/detail/modules/preOrder.tsx
index 84b043e2..9ec5c912 100644
--- a/src/views/operation/seaexport/detail/modules/preOrder.tsx
+++ b/src/views/operation/seaexport/detail/modules/preOrder.tsx
@@ -614,7 +614,7 @@ export const yardSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isYard' },
+        params: { code: 'yard' },
         labelField: 'pinYinCode',
         placeholder: '场站',
         showName: 'shortName',
diff --git a/src/views/system/org/columns.tsx b/src/views/system/org/columns.tsx
index 3ccdb32d..d2f61a68 100644
--- a/src/views/system/org/columns.tsx
+++ b/src/views/system/org/columns.tsx
@@ -443,7 +443,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'IsSettlementOrg',
     component: 'Switch',
-    label: '是否结算机构',
+    label: '是否分公司',
     required: false,
     componentProps: {
       options: [
diff --git a/src/views/taskmanage/taskList/BLConfirmation/columns.tsx b/src/views/taskmanage/taskList/BLConfirmation/columns.tsx
index 1de1369f..60b9c608 100644
--- a/src/views/taskmanage/taskList/BLConfirmation/columns.tsx
+++ b/src/views/taskmanage/taskList/BLConfirmation/columns.tsx
@@ -374,7 +374,7 @@ export const formSchema1: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'isAgent' },
+        params: { code: 'agent' },
         labelField: 'pinYinCode',
         showName: 'shortName',
         valueField: 'shortName',