From 31e0b48caba002e0551571f876ea049ebf614a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Thu, 14 Nov 2024 09:07:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=20?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=90=8E=20=E7=BC=96=E8=BE=91=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infoclient/ClientAccountDateModal.vue     | 12 ++-
 .../TenantAuditStepModal.vue                  | 10 +++
 .../infoclient/ClientStakeholder/columns.tsx  |  2 +-
 .../infoclient/ClientStakeholder/index.vue    | 14 +++-
 .../FeeCustTemplate/TenantAuditStepModal.vue  | 15 +++-
 .../infoclient/FeeCustTemplate/columns.tsx    | 34 ++++----
 .../infoclient/FeeCustTemplate/feeField.vue   | 24 +++---
 .../infoclient/FeeCustTemplate/index.vue      | 12 ++-
 .../ReleaseType/TenantAuditStepModal.vue      | 10 +++
 .../infoclient/ReleaseType/columns.tsx        |  4 +-
 .../baseinfo/infoclient/ReleaseType/index.vue | 20 ++++-
 .../infoclient/TenantAuditStepModal.vue       | 81 ++++++++++++++++---
 .../customerParams/components/Modal.vue       | 10 +++
 .../infoclient/customerParams/index.vue       | 11 ++-
 .../infoclient/menu2/TenantAuditStepModal.vue | 10 +++
 src/views/baseinfo/infoclient/menu2/index.vue | 13 ++-
 .../infoclient/menu3/TenantAuditStepModal.vue | 10 +++
 src/views/baseinfo/infoclient/menu3/index.vue | 13 ++-
 .../infoclient/tabs3/TenantAuditStepModal.vue | 10 +++
 src/views/baseinfo/infoclient/tabs3/index.vue | 22 +++--
 .../CustomerReconciliation/columns.tsx        | 31 +++----
 .../CustomerReconciliation/index.vue          | 77 ++++++------------
 src/views/system/org/columns.tsx              |  2 +-
 23 files changed, 310 insertions(+), 137 deletions(-)

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/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..b443ed09 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,7 +608,7 @@ export const searchFormSchema: FormSchema[] = [
     component: 'ApiSelect',
     required: false,
     // labelSlot: 'yardId',
-    dynamicDisabled: false,
+
     colProps: { span: 4 },
     componentProps: ({ formModel }) => {
       return {
@@ -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,7 +1001,7 @@ export const formSchema: FormSchema[] = [
     component: 'ApiSelect',
     required: false,
     // labelSlot: 'yardId',
-    dynamicDisabled: false,
+
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {
       return {
@@ -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,7 +1212,7 @@ export const detailsFormSchema: FormSchema[] = [
     label: '客户类别',
     component: 'ApiSelect',
     required: false,
-    dynamicDisabled: false,
+
     defaultValue: null,
     colProps: { span: 6 },
     componentProps: ({ formModel }) => {
@@ -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..21efc563 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([
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/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/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/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: [