feats

config/routes.js

@@ -175,12 +175,12 @@ export default [
                     hideInMenu: true,
                     component: './Medical/Test/Batch',
                   },
-                  {
-                    path: '/medical/hospital',
-                    name: '诊室管理',
-                    menuCode: 'medical.hospital',
-                    component: './Medical/Hospital',
-                  },
+                  // {
+                  //   path: '/medical/hospital',
+                  //   name: '诊室管理',
+                  //   menuCode: 'medical.hospital',
+                  //   component: './Medical/Hospital',
+                  // },
                 ],
               },
               {

src/components/Specialty/index.jsx

@@ -3,6 +3,8 @@ import { Select, Spin } from 'antd';
 import request from '@/utils/request';
 
 export default (props) => {
+  const { schoolId } = props
+
   const [loading, setLoading] = useState(false);
   const [list, setList] = useState([]);
   const [value, setValue] = useState();
@@ -29,10 +31,10 @@ export default (props) => {
   }, [props.value, value]);
 
   useEffect(() => {
-    if (props.schoolid) {
+    if (schoolId) {
       setLoading(true);
 
-      request('/specialty', { params: { schoolId: props.schoolid, pageSize: 100 } })
+      request('/specialty', { params: { school: schoolId, pageSize: 100 } })
         .then((res) => {
           const records = res.records || [];
           setList(records);
@@ -47,7 +49,7 @@ export default (props) => {
     }
 
     // eslint-disable-next-line
-  }, [props.schoolid]);
+  }, [schoolId]);
 
   return (
     <Spin spinning={loading}>

src/pages/Medical/Hospital/index.jsx

@@ -51,8 +51,6 @@ export default () => {
       .catch((e) => {
         notification.error({ message: e.message });
       });
-
-
   };
 
   const renderFormItem = (item, config, form) => {

src/pages/Medical/Test/List/index.jsx

@@ -10,9 +10,7 @@ import Specialty from '@/components/Specialty';
 
 const VisitList = () => {
 
-  const [school, setSchool] = useState({});
-  const [abc, setA] = useState();
-  
+  const [school, setSchool] = useState({});  
   const ref = useRef();
 
   const handleMedicalClick = useCallback((id) => {
@@ -32,18 +30,6 @@ const VisitList = () => {
     </Button>,
   ];
 
-  
-  const renderFormItem = (item, config, form) => {
-    const handleSchoolChange = (schoolId, schoolInfo) => {
-      form.setFieldsValue({ schoolId });
-      form.submit();
-      console.log(schoolInfo, 'schoolInfo');
-      setSchool({ ...schoolInfo });
-    };
-
-    return <School onChange={handleSchoolChange} allowClear />;
-  };
-
   const columns = [
     {
       title: '编号',
@@ -60,13 +46,24 @@ const VisitList = () => {
       renderFormItem: (item, config, form) => (
         <School
           autoDefault={false}
-          onChange={(schoolId) => {form.resetFields(['specialtyId']);form.setFieldsValue({ schoolId });}}
+          value={school?.schoolId}
+          onChange={(schoolId, v) => {
+            setSchool(v)
+            form.setFieldsValue({ schoolId, specialtyId: null })
+          }}
           allowClear
         ></School>
       ),
     },
-   
-
+    {
+      title: '专业',
+      dataIndex: 'specialtyId',
+      align: 'center',
+      render: (_, row) => row.specialtyName||'-',
+      renderFormItem: (item, config, form) => {
+        return <Specialty schoolId={school?.schoolId} disabled={!school?.schoolId}></Specialty>;
+      },
+    },
     {
       title: '学号',
       dataIndex: 'studentNo',
@@ -90,16 +87,6 @@ const VisitList = () => {
         2: { text: '女' },
       },
     },
-    {
-      title: '专业',
-      dataIndex: 'specialtyId',
-      align: 'center',
-      render: (_, row) => row.specialtyName||'-',
-      renderFormItem: (item, config, form) => {
-        const schoolId = form.getFieldValue('schoolId');
-        return <Specialty schoolid={schoolId} disabled={!schoolId}></Specialty>;
-      },
-    },
     {
       title: '创建时间',
       dataIndex: 'createDate',

src/pages/Medical/Visit/Edit/index.jsx

@@ -115,7 +115,7 @@ const VisitEdit = (props) => {
             <Form.Item label="专业" required>
               <Specialty
                 value={specialtyId}
-                schoolid={schoolId || school}
+                schoolId={schoolId || school}
                 onChange={(x) => setSpecialtyId(x)}
                 style={{ minWidth: '150px' }}
                 placeholder="请选择专业"

src/pages/Medical/Visit/List/index.jsx

@@ -82,12 +82,26 @@ const VisitList = () => {
       renderFormItem: (item, config, form) => (
         <School
           autoDefault={false}
-          onChange={(schoolId) => {form.resetFields(['specialtyId']);form.setFieldsValue({ schoolId });}}
+          value={school?.schoolId}
+          onChange={(schoolId, v) => {
+            setSchool(v)
+            form.setFieldsValue({ schoolId, specialtyId: null })
+          }}
           allowClear
         ></School>
       ),
     },
 
+    {
+      title: '专业',
+      dataIndex: 'specialtyId',
+      align: 'center',
+      render: (_, row) => row.specialtyName||'-',
+      renderFormItem: (item, config, form) => {    
+        return <Specialty schoolId={school?.schoolId} disabled={!school?.schoolId}></Specialty>;
+      },
+    },
+
     {
       title: '学号',
       dataIndex: 'studentNo',
@@ -110,19 +124,6 @@ const VisitList = () => {
         2: { text: '女' },
       },
     },
-
-    {
-      title: '专业',
-      dataIndex: 'specialtyId',
-      align: 'center',
-      render: (_, row) => row.specialtyName||'-',
-      renderFormItem: (item, config, form) => {
-     
-        const schoolId = form.getFieldValue('schoolId');
-    
-        return <Specialty schoolid={schoolId} disabled={!schoolId}></Specialty>;
-      },
-    },
     {
       title: '医生',
       dataIndex: 'doctorName',

src/pages/Student/Student/List/index.jsx

@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useState } from 'react';
 import { history } from 'umi';
 import { Space } from 'antd';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -8,6 +8,9 @@ import { queryTable } from '@/utils/request';
 import Specialty from '@/components/Specialty';
 
 const StudentList = () => {
+
+  const [school, setSchool] = useState({});
+
   const handleStudentClick = useCallback((id) => {
     if (id) {
       history.push(`/student/student/edit?id=${id}`);
@@ -41,7 +44,11 @@ const StudentList = () => {
       renderFormItem: (item, config, form) => (
         <School
           autoDefault={false}
-          onChange={(schoolId) => {form.resetFields(['specialtyId']);form.setFieldsValue({ schoolId });}}
+          value={school?.schoolId}
+          onChange={(schoolId, v) => {
+            setSchool(v)
+            form.setFieldsValue({ schoolId, specialtyId: null })
+          }}
           allowClear
         ></School>
       ),
@@ -52,8 +59,7 @@ const StudentList = () => {
       align: 'center',
       render: (_, row) => row.specialtyName||'-',
       renderFormItem: (item, config, form) => {
-        const schoolId = form.getFieldValue('schoolId');
-        return <Specialty schoolid={schoolId} disabled={!schoolId}></Specialty>;
+        return <Specialty schoolId={school?.schoolId} disabled={!school?.schoolId}></Specialty>;
       },
     },
     {