fix: 111

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

@@ -143,13 +143,13 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
 
 export default connect(
   ({
-    accounttype,
+    institutions,
     schemaBase
   }: {
-    accounttype: InstitutionsModelState
+    institutions: InstitutionsModelState
     schemaBase: SchemaBaseModelState
   }) => ({
-    accountTypeList: accounttype.accountType.map(item => ({ label: item.name, value: item.ID })),
+    accountTypeList: institutions.accountType.map(item => ({ label: item.name, value: item.ID })),
     schema: schemaBase.base[BaseMenuEnum.STAFF]?.schema
   })
 )(StaffDrawer)

src/pages/Institutions/Staff/index.tsx

@@ -55,18 +55,18 @@ const CompanyList: React.FC<ListProps> = ({ dispatch, accountTypeList }) => {
       dataIndex: 'name',
       title: '名称'
     },
-    {
-      dataIndex: 'accountType',
-      title: '账号类型',
-      filters: true,
-      valueEnum: accountType.reduce((prev, curr) => {
-        const obj = { ...prev }
-        obj[curr.value] = {
-          text: curr.name
-        }
-        return obj
-      }, {})
-    },
+    // {
+    //   dataIndex: 'accountType',
+    //   title: '账号类型',
+    //   filters: true,
+    //   valueEnum: accountType.reduce((prev, curr) => {
+    //     const obj = { ...prev }
+    //     obj[curr.value] = {
+    //       text: curr.name
+    //     }
+    //     return obj
+    //   }, {})
+    // },
     // {
     //   dataIndex: 'institution',
     //   title: '所属企事业单位',
@@ -84,7 +84,7 @@ const CompanyList: React.FC<ListProps> = ({ dispatch, accountTypeList }) => {
     },
     {
       dataIndex: 'accountType',
-      title: '项目类型',
+      title: '账号类型',
       filters: true,
       filterMultiple: false,
       render: (_, record) => <div>{record.accountType.name}</div>,
@@ -165,7 +165,7 @@ const CompanyList: React.FC<ListProps> = ({ dispatch, accountTypeList }) => {
         type={state.currentModalType}
         defaultFormData={state.defaultFormData}
         visible={state.visible}
-        accountType={accountType}
+        accountType={accountTypeList}
         reloadTable={() => tRef.current?.reload()}
         setVisible={(visible: boolean) => setState({ ...state, visible })}
       />
@@ -183,13 +183,13 @@ const CompanyList: React.FC<ListProps> = ({ dispatch, accountTypeList }) => {
 
 export default connect(
   ({
-    accounttype,
+    institutions,
     schemaBase
   }: {
-    accounttype: InstitutionsModelState
+    institutions: InstitutionsModelState
     schemaBase: SchemaBaseModelState
   }) => ({
-    accountTypeList: accounttype.accountType.map(item => ({ label: item.name, value: item.ID })),
+    accountTypeList: institutions.accountType.map(item => ({ label: item.name, value: item.ID })),
     schema: schemaBase.base[BaseMenuEnum.STAFF]?.schema
   })
 )(CompanyList)