lanjianrong 3 vuotta sitten
vanhempi
commit
a2a003b810

+ 4 - 1
src/pages/Institutions/Company/Detail/components/Staff.tsx

@@ -168,7 +168,10 @@ const Staff: React.FC<ListProps> = ({ schema, dataID, dispatch, accountTypeList
                   visible: true,
                   currentModalType: ModalType.ADD,
                   institutionDisable: true,
-                  defaultFormData: { institutionID: dataID, institutionDisable: true }
+                  defaultFormData: {
+                    institutionID: dataID,
+                    institutionDisable: true
+                  }
                 })
               }}>
               添加人员

+ 14 - 7
src/pages/Institutions/Staff/components/StaffDetail.tsx

@@ -100,13 +100,13 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
   }
 
   const onMount = async () => {
-    const { dataID, institutionID, institutionDisable = false } = defaultFormData
-    !institutionID &&
-      form.setSchemaByPath('organizationalStructureID', {
-        type: 'string',
-        widget: 'treeSelect',
-        hidden: true
-      })
+    const {
+      dataID,
+      institutionID,
+      institutionDisable = false,
+      hiddenOrganization = false
+    } = defaultFormData
+
     if (institutionID && type !== ModalType.PREVIEW) {
       const { code = -1, data: list = [] } = await queryOrganizationalStructureList({
         dataID: institutionID,
@@ -116,6 +116,7 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
         form.setSchemaByPath('organizationalStructureID', {
           type: 'string',
           widget: 'treeSelect',
+          required: true,
           props: {
             treeDefaultExpandAll: true,
             treeData: list
@@ -157,6 +158,12 @@ const StaffDrawer: React.FC<StaffModalProps> = ({
           disabled: true
         })
       }
+      form.setSchemaByPath('organizationalStructureID', {
+        hidden: hiddenOrganization
+      })
+      form.setSchemaByPath('password', {
+        hidden: hiddenOrganization
+      })
     })
   }
 

+ 6 - 3
src/pages/Institutions/Staff/index.tsx

@@ -70,7 +70,8 @@ const CompanyList: React.FC<ListProps> = ({ schema, dispatch, accountTypeList })
               defaultFormData: {
                 dataID: record.ID,
                 institutionID: record.institution.ID,
-                institutionDisable: true
+                institutionDisable: true,
+                hiddenOrganization: true
               }
             })
           }}>
@@ -150,7 +151,8 @@ const CompanyList: React.FC<ListProps> = ({ schema, dispatch, accountTypeList })
                 defaultFormData: {
                   dataID: record.ID,
                   institutionID: record.institutionID,
-                  institutionDisable: true
+                  institutionDisable: true,
+                  hiddenOrganization: true
                 }
               })
             }}>
@@ -205,7 +207,8 @@ const CompanyList: React.FC<ListProps> = ({ schema, dispatch, accountTypeList })
                   currentModalType: ModalType.ADD,
                   defaultFormData: {
                     ...state.defaultFormData,
-                    institutionDisable: false
+                    institutionDisable: false,
+                    hiddenOrganization: true
                   }
                 })
               }>