fix: 111

src/pages/Institutions/Company/Detail/components/Organization.tsx

@@ -166,6 +166,7 @@ const Organization: React.FC<OrganizationProps> = ({ dataID, structureType }) =>
           columns={columns}
           dataSource={state.organizationList}
           defaultExpandAllRows={true}
+          indentSize={30}
           search={false}
           pagination={false}
           toolbar={{

src/pages/Institutions/Company/Detail/components/Staff.tsx

@@ -132,7 +132,7 @@ const Staff: React.FC<ListProps> = ({ dataID, dispatch, accountTypeList }) => {
         type={state.currentModalType}
         defaultFormData={state.defaultFormData}
         accountTypeList={accountTypeList}
-        reloadTable={() => tRef.current?.reload()}
+        reload={() => tRef.current?.reload()}
       />
     </div>
   )

src/pages/Institutions/Company/List/components/CompanyDrawer.tsx

@@ -67,7 +67,7 @@ const CompanyDrawer: React.FC<CompanyModalProps> = ({
   }
 
   const onMount = () => {
-    console.log(defaultFormData)
+    // console.log(defaultFormData)
 
     form.setValues({ ...defaultFormData })
     // delay().then(() => {

src/pages/Institutions/Company/List/index.tsx

@@ -13,6 +13,7 @@ import { BaseMenuEnum } from '@/pages/Schema/Base'
 import { PageContainer } from '@ant-design/pro-layout'
 import CompanyDrawer from './components/CompanyDrawer'
 import { ModalType } from '@/utils/enum'
+import { generateColumns } from '@/utils/util'
 
 type ListProps = ConnectProps & {
   pTypeList: { label: string; value: string }[]
@@ -134,23 +135,6 @@ const CompanyList: React.FC<ListProps> = ({ base, dispatch, pTypeList }) => {
     }
   ]
 
-  function generateColumns(c, s) {
-    if (!s) return c
-    // 新的列
-    const nC = [...c]
-    if (s) {
-      const properties = JSON.parse(s).properties
-      const keys = Object.keys(properties)
-      keys.forEach(item => {
-        const isExist = c.some(column => column.dataIndex === item)
-        // 该列在columns中未定义
-        if (!isExist) {
-          nC.splice(-2, 0, { dataIndex: item, title: properties[item].title })
-        }
-      })
-    }
-    return nC
-  }
   return (
     <PageContainer title={false}>
       <ProTable<API.InstitutionListItem>

src/pages/Institutions/Staff/components/StaffDrawer.tsx

@@ -43,6 +43,8 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
   organizationList,
   reload
 }) => {
+  console.log(organizationList)
+
   const form = useForm()
   useEffect(() => {
     if (visible) {

src/pages/Institutions/Staff/index.tsx

@@ -183,7 +183,7 @@ const CompanyList: React.FC<ListProps> = ({ dispatch, accountTypeList }) => {
         visible={state.visible}
         accountTypeList={accountTypeList}
         // accountType={accountTypeList}
-        reloadTable={() => tRef.current?.reload()}
+        reload={() => tRef.current?.reload()}
         setVisible={(visible: boolean) => setState({ ...state, visible })}
       />
       <StaffDetailModal

src/services/api/institution.ts

@@ -66,7 +66,7 @@ export async function getAccountTypeList() {
 export async function queryOrganizationalStructureList(
   params: API.OrganizationalStructureListParams
 ) {
-  console.log(params)
+  // console.log(params)
 
   return request('/OrganizationalStructure/list', {
     method: 'POST',

src/utils/util.ts

@@ -1 +1,19 @@
 export const delay = (ms?: number | undefined) => new Promise(res => setTimeout(res, ms))
+
+export function generateColumns(c, s) {
+  if (!s) return c
+  // 新的列
+  const nC = [...c]
+  if (s) {
+    const properties = JSON.parse(s).properties
+    const keys = Object.keys(properties)
+    keys.forEach(item => {
+      const isExist = c.some(column => column.dataIndex === item)
+      // 该列在columns中未定义
+      if (!isExist) {
+        nC.splice(-2, 0, { dataIndex: item, title: properties[item].title })
+      }
+    })
+  }
+  return nC
+}