fix

src/components/Specialty/index.jsx

@@ -20,9 +20,9 @@ export default (props) => {
 
   useEffect(() => {
     if (props.value !== value) {
-      console.log('---------');
+      console.log(props.value,value,'---------');
       if (!value) {
-        setValue();
+        setValue(value);
       } else {
         setValue(props.value);
       }

src/pages/Medical/Test/Edit/index.js

@@ -185,7 +185,6 @@ const TestEdit = (props) => {
             name="attchment"
             label="体检报告"
             placeholder="请选择体检报告"
-            extra="支持pdf文件"
             // valuePropName="fileList"
             rules={[{ required: true, message: '请上传体检报告' }]}
           >
@@ -210,126 +209,12 @@ const TestEdit = (props) => {
             >
               <Button icon={<UploadOutlined />}>点击上传</Button>
             </Upload>
-            {/* <UploadImage /> */}
+    
           </Form.Item>
 
-          {/* <ProFormTextArea
-            label="诊断报告"
-            placeholder="输入诊断报告"
-            name="attchment"
-            fieldProps={{ readOnly: !!id, rows: 10 }}
-            rules={[{ required: true, message: '请填写诊断报告' }]}
-            style={{ width: '100%' }}
-          /> */}
         </ProForm>
       </Container>
-      {/* <Container>
-        <ProForm form={form} onFinish={handleSubmit}>
-          <ProFormText
-            label="姓名"
-            placeholder="输入姓名"
-            name="title"
-            rules={[{ required: true, message: '请填写姓名' }]}
-          />
-
-          <ProFormSelect
-            options={[
-              {
-                value: 1,
-                label: '男',
-              },
-              {
-                value: 2,
-                label: '女',
-              },
-            ]}
-            name="sex"
-            label="性别"
-            fieldProps={{ bordered: !id, open: id ? false : undefined }}
-            rules={[{ required: true, message: '请选择性别' }]}
-          />
-
-          <ProFormSelect
-            label="学校"
-            placeholder="请选择学校"
-            name="schoolId"
-            showSearch
-            request={async ({ keyWords }) => {
-              // if (keyWords) {
-              return request('/school', {
-                method: 'get',
-                params: { name: keyWords, pageNum: 1, pageSize: 1000 },
-              })
-                .then((res) => {
-                  return res?.records?.map((x) => {
-                    return { label: x.name, value: x.schoolId };
-                  });
-                })
-                .catch((e) => {
-                  notification.error({ message: e.message });
-                  return Promise.reject(e.message);
-                });
-              // }
-            }}
-          />
-
-
-          <ProFormDependency name={['schoolId']}>
-            {({ schoolId }) => {
-              return (
-                <ProFormSelect
-                  label="专业"
-                  placeholder="请选择专业"
-                  name="specialtyId"
-                  dependencies={['schoolId']}
-                  showSearch
-                  params={{ schoolId }}
-                  disabled={!schoolId}
-                  options={specialtyOptions}
-                  request={async ({ keyWords, ...params }) => {
-                    console.log({ params });
-                    if (schoolId) {
-                      return request('/specialty', {
-                        method: 'get',
-                        params: { name: keyWords, ...params, pageNum: 1, pageSize: 1000 },
-                      })
-                        .then((res) => {
-                          return res?.records?.map((x) => {
-                            return { label: x.name, value: x.specialtyId };
-                          });
-                        })
-                        .catch((e) => {
-                          notification.error({ message: e.message });
-                          return Promise.reject(e.message);
-                        });
-                    }
-                  }}
-                />
-              );
-            }}
-          </ProFormDependency>
-
-          
-          <ProFormText
-            label="学号"
-            placeholder="输入学号"
-            name="studentNo"
-            fieldProps={{ bordered: !id, readOnly: !!id }}
-            rules={[{ required: true, message: '请填写学号' }]}
-          />
-
-          <Form.Item
-            name="image"
-            label="体检报告"
-            placeholder="请选择体检报告"
-            extra="支持pdf文件"
-            rules={[{ required: true, message: '请上传体检报告' }]}
-          >
-            <UploadImage />
-          </Form.Item>
-        </ProForm>
-      
-      </Container> */}
+    
     </PageContainer>
   );
 };

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

@@ -48,9 +48,16 @@ const VisitList = () => {
       title: '学校',
       dataIndex: 'schoolId',
       align: 'center',
-      render: (_, row) => row.schoolName,
-      renderFormItem,
+      render: (_, row) => row.schoolName||"-",
+      renderFormItem: (item, config, form) => (
+        <School
+          autoDefault={false}
+          onChange={(schoolId) => {form.resetFields(['specialtyId']);form.setFieldsValue({ schoolId });}}
+          allowClear
+        ></School>
+      ),
     },
+   
 
     {
       title: '学号',
@@ -67,9 +74,13 @@ const VisitList = () => {
     },
     {
       title: '性别',
-      dataIndex: 'sex',
+      dataIndex: 'status',
       align: 'center',
       hideInSearch: true,
+      valueEnum: {
+        1: { text: '男' },
+        2: { text: '女' },
+      },
     },
     {
       title: '专业',
@@ -86,7 +97,7 @@ const VisitList = () => {
       dataIndex: 'createDate',
       align: 'center',
       hideInSearch: true,
-      valueType: 'date',
+      valueType: 'dateTime',
     },
     
     {
@@ -107,7 +118,7 @@ const VisitList = () => {
     <PageContainer>
       <ProTable
         columns={columns}
-        
+        params={{}}
         request={queryTable('/testLog')}
         formRef={ref}
         rowKey="serialNo"

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

@@ -63,7 +63,7 @@ const VisitEdit = (props) => {
   };
 
   const handleSubmit = (value) => {
-    request('/medicalLog', { method: 'post', data: { schoolId, ...value } })
+    request('/medicalLog', { method: 'post', data: { schoolId:school, ...value } })
       .then(() => {
         notification.success({ message: '新建成功' });
         history.go('-1');

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

@@ -12,12 +12,12 @@ const VisitList = () => {
   const ref = useRef();
   const [school, setSchool] = useState({});
 
-  const handleMedicalClick = (id) => {
+  const handleMedicalClick = (row) => {
     console.log(school, 'school');
     history.push(
-      id
-        ? `/medical/visit/edit?id=${id}&schoolId=${school?.schoolId}`
-        : `/medical/visit/edit?schoolId=${school?.schoolId}`,
+      row
+        ? `/medical/visit/edit?id=${row?.serialNo}&schoolId=${row?.schoolId}`
+        : `/medical/visit/edit`,
     );
   };
 
@@ -32,25 +32,25 @@ const VisitList = () => {
     </Button>,
   ];
 
-  const queryFunc = (params, page, sort, filter) => {
-    if (!school.schoolId) {
-      return Promise.resolve({ data: [], success: true, total: 0 });
-    }
-    console.log(school, 'queryFunc');
-    const newParams = { ...params, schoolId: school.schoolId };
-    return queryTable('/medicalLog')(newParams, page, sort, filter);
-  };
+  // const queryFunc = (params, page, sort, filter) => {
+  //   if (!school.schoolId) {
+  //     return Promise.resolve({ data: [], success: true, total: 0 });
+  //   }
+  //   console.log(school, 'queryFunc');
+  //   const newParams = { ...params, schoolId: school.schoolId };
+  //   return queryTable('/medicalLog')(newParams, page, sort, filter);
+  // };
 
-  const renderFormItem = (item, config, form) => {
-    const handleSchoolChange = (schoolId, schoolInfo) => {
-      form.setFieldsValue({ schoolId });
-      form.submit();
-      console.log(schoolInfo, 'schoolInfo');
-      setSchool({ ...schoolInfo });
-    };
+  // 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 />;
-  };
+  //   return <School onChange={handleSchoolChange} allowClear />;
+  // };
 
   const columns = [
     {
@@ -67,12 +67,25 @@ const VisitList = () => {
     //   valueType: 'select',
     //   renderFormItem,
     // },
+    // {
+    //   title: '学校',
+    //   dataIndex: 'schoolId',
+    //   align: 'center',
+    //   render: (_, row) => row.schoolName,
+    //   renderFormItem,
+    // },
     {
       title: '学校',
       dataIndex: 'schoolId',
       align: 'center',
-      render: (_, row) => row.schoolName,
-      renderFormItem,
+      render: (_, row) => row.schoolName||"-",
+      renderFormItem: (item, config, form) => (
+        <School
+          autoDefault={false}
+          onChange={(schoolId) => {form.resetFields(['specialtyId']);form.setFieldsValue({ schoolId });}}
+          allowClear
+        ></School>
+      ),
     },
 
     {
@@ -104,7 +117,9 @@ const VisitList = () => {
       align: 'center',
       render: (_, row) => row.specialtyName||'-',
       renderFormItem: (item, config, form) => {
+     
         const schoolId = form.getFieldValue('schoolId');
+    
         return <Specialty schoolid={schoolId} disabled={!schoolId}></Specialty>;
       },
     },
@@ -123,10 +138,10 @@ const VisitList = () => {
     // },
     {
       title: '就诊时间',
-      dataIndex: 'recordDate',
+      dataIndex: 'createDate',
       align: 'center',
       hideInSearch: true,
-      valueType: 'date',
+      valueType: 'dateTime',
     },
 
     {
@@ -136,7 +151,7 @@ const VisitList = () => {
       hideInSearch: true,
       render: (text, record) => (
         <Space size="middle">
-          <a onClick={() => handleMedicalClick(record.serialNo)}>查看报告</a>
+          <a onClick={() => handleMedicalClick(record)}>查看报告</a>
         </Space>
       ),
     },
@@ -146,7 +161,7 @@ const VisitList = () => {
     <PageContainer>
       <ProTable
         columns={columns}
-        request={queryFunc}
+        request={queryTable('/medicalLog')}
         formRef={ref}
         rowKey="serialNo"
         headerTitle="就诊列表"

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

@@ -38,7 +38,13 @@ const StudentList = () => {
       dataIndex: 'schoolId',
       align: 'center',
       render: (_, row) => row.schoolName||"-",
-      renderFormItem: () => <School autoDefault={false} allowClear></School>,
+      renderFormItem: (item, config, form) => (
+        <School
+          autoDefault={false}
+          onChange={(schoolId) => {form.resetFields(['specialtyId']);form.setFieldsValue({ schoolId });}}
+          allowClear
+        ></School>
+      ),
     },
     {
       title: '专业',