fix

src/components/UploadImage/index.jsx

@@ -26,7 +26,7 @@ export default (props) => {
 
   return (
     <Upload
-      accept=".png, .jpg, .jpeg, .gif"
+      accept=".png, .jpg, .jpeg, .gif, .pdf"
       listType="picture-card"
       className="avatar-uploader"
       showUploadList={false}

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

@@ -1,19 +1,337 @@
-import React from 'react';
-import { connect } from 'umi';
+import React, { useEffect, useState } from 'react';
+import { connect, history } from 'umi';
+
 import { PageContainer } from '@ant-design/pro-layout';
+import Container from '@/components/Container';
+import { Input, Form, Button, notification, Upload, message } from 'antd';
+import ProForm, {
+  ProFormText,
+  ProFormTextArea,
+  ProFormSelect,
+  ProFormDependency,
+} from '@ant-design/pro-form';
+import request from '@/utils/request';
+import School from '@/components/School';
+import UploadImage from '@/components/UploadImage';
+import { UploadOutlined } from '@ant-design/icons';
+import uploadFile from '@/utils/uploadFile';
+
+const { Search } = Input;
+const TestEdit = (props) => {
+  const { id, schoolId } = props.location.query;
+
+  const [searchLoading, setSearchLoading] = useState(false);
+  const [school, setSchool] = useState();
+  const [fileList, setFileList] = useState([]);
+
+  const [searchValue, setSearchValue] = useState();
+
+  const [form] = Form.useForm();
 
-const VisitList = () => {
+  // eslint-disable-next-line no-shadow
+  const getData = (id) => {
+    if (id) {
+      request(`/student-no/${id}`, { params: { schoolId: school } })
+        .then((res) => {
+          form.setFieldsValue(res);
+          setSearchLoading(false);
+        })
+        .catch((e) => {
+          setSearchLoading(false);
+          notification.error({ message: '未找到该学生' });
+          form.resetFields();
+        });
+    } else {
+      // this.setState({ data: [] });
+    }
+  };
 
+  useEffect(() => {
+    if (id) {
+      if (id) {
+        request(`/medical-log/${id}`)
+          .then((res) => {
+            form.setFieldsValue({ ...res });
+            setSearchLoading(false);
+          })
+          .catch((e) => {
+            setSearchLoading(false);
+          });
+      } else {
+        // this.setState({ data: [] });
+      }
+    }
+  }, [id]);
 
- 
+  const onSearch = (value) => {
+    if (value) {
+      getData(value);
+      setSearchLoading(true);
+    } else {
+      // this.setState({ data: [] });
+    }
+  };
+
+  const addTestLog = async (value) => {
+    await request('/taTestLog', { method: 'post', data: value })
+      .then(() => {
+        // notification.success({ message: '新建成功' });
+        // history.go('-1');
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+      });
+  };
+
+  const handleSubmit = async (value) => {
+    console.log(value);
+    const { studentId, attchment } = value;
+    if (!studentId) {
+      message.error(`请选择学生`);
+    }
+    try {
+      if (attchment && attchment.fileList.length > 0) {
+        attchment.fileList.map((x) => {
+          addTestLog({ studentId, name: x.name, attchment: x.response });
+          return null;
+        });
+        notification.success({ message: '新建成功' });
+        history.go('-1');
+      }
+    } catch (error) {
+      notification.error({ message: '创建失败' });
+    }
+  };
+
+  const handleSchoolChange = (value) => {
+    setSchool(value);
+    setSearchValue('');
+    form.resetFields();
+  };
 
   return (
-    <PageContainer>
-      234
+    <PageContainer
+      header={{
+        extra: [
+          <Button key="1" onClick={() => history.go('-1')}>
+            返回
+          </Button>,
+        ],
+      }}
+    >
+      <Container>
+        <ProForm form={form} submitter={!id} onFinish={handleSubmit}>
+          {!id && (
+            <ProForm.Group layout="inline">
+              <School
+                value={school}
+                onChange={handleSchoolChange}
+                style={{ width: 200, marginBottom: '20px' }}
+                allowClear
+              />
+              <Search
+                placeholder="请输入学号"
+                value={searchValue}
+                onChange={(e) => setSearchValue(e.value)}
+                loading={searchLoading}
+                style={{ width: 200, marginBottom: '20px' }}
+                onSearch={onSearch}
+              />
+            </ProForm.Group>
+          )}
+          <Form.Item name="studentId" noStyle />
+
+          <ProForm.Group layout="inline" title="就诊信息">
+            <ProFormText
+              label="姓名"
+              placeholder="输入名称"
+              name="name"
+              fieldProps={{ bordered: false, readOnly: true }}
+              // rules={[{ required: true, message: '请填写名称' }]}
+            />
+            <ProFormSelect
+              options={[
+                {
+                  value: 1,
+                  label: '男',
+                },
+                {
+                  value: 2,
+                  label: '女',
+                },
+              ]}
+              name="sex"
+              label="性别"
+              fieldProps={{ bordered: false, open: false, allowClear: false }}
+              // rules={[{ required: true, message: '请选择性别' }]}
+            />
+            <ProFormText
+              label="学号"
+              placeholder="输入学号"
+              name="studentNo"
+              fieldProps={{ bordered: false, readOnly: true }}
+              // rules={[{ required: true, message: '请填写学号' }]}
+            />
+            <ProFormText
+              label="联系方式"
+              placeholder="输入联系方式"
+              name="phone"
+              fieldProps={{ bordered: false, readOnly: true }}
+              // rules={[{ required: true, message: '请填写联系方式' }]}
+            />
+          </ProForm.Group>
+
+          <Form.Item
+            name="attchment"
+            label="体检报告"
+            placeholder="请选择体检报告"
+            extra="支持pdf文件"
+            // valuePropName="fileList"
+            rules={[{ required: true, message: '请上传体检报告' }]}
+          >
+            <Upload
+              accept=".pdf"
+              // listType="picture-card"
+              // className="avatar-uploader"
+              // showUploadList={false}
+              // fileList={fileList}
+              customRequest={uploadFile}
+              onChange={(info) => {
+                if (info.file.status !== 'uploading') {
+                  console.log(info.file, info.fileList);
+                }
+                if (info.file.status === 'done') {
+                  message.success(`${info.file.name} 上传成功`);
+                  // setFileList([info.file])
+                } else if (info.file.status === 'error') {
+                  message.error(`${info.file.name} 上传失败`);
+                }
+              }}
+            >
+              <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>
   );
 };
 
-export default connect((s) => ({
-  typeList: s.post.typeList,
-}))(VisitList);
+export default TestEdit;

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

@@ -1,36 +1,55 @@
-import React, { useRef, useCallback } from 'react';
+import React, { useState, useRef, useCallback } from 'react';
 import { connect, history } from 'umi';
 import { PageContainer } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import { PlusOutlined } from '@ant-design/icons';
-import { Button,  Space } from 'antd';
+import { Button,  Space,Image } from 'antd';
 import  { queryTable } from '@/utils/request';
+import School from '@/components/School';
+import Specialty from '@/components/Specialty';
 
 const VisitList = () => {
 
-
+  const [school, setSchool] = useState({});
+  const [abc, setA] = useState();
+  
   const ref = useRef();
   const handleMedicalClick = useCallback((id) => {
-    history.push(id ? `/medical/Test/edit?id=${id}` : '/medical/Test/edit');
+    history.push(id ? `/medical/Test/edit?id=${id}&schoolId=${school?.schoolId}` : `/medical/Test/edit?schoolId=${school?.schoolId}`);
   }, []);
 
-  // const actions = [   
-  //   <Button key="button" icon={<PlusOutlined />} type="primary" onClick={() => handleMedicalClick()}>
-  //     新建
-  //   </Button>,
-  // ];
+  const actions = [   
+    <Button key="button" icon={<PlusOutlined />} type="primary" onClick={() => handleMedicalClick()}>
+      新建
+    </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: '就诊编号',
+      title: '编号',
       dataIndex: 'serialNo',
       hideInSearch: true,
 
       align: 'center',
     },
     {
-      title: '学校名称',
-      dataIndex: 'schoolName',
+      title: '学校',
+      dataIndex: 'schoolId',
       align: 'center',
+      render: (_, row) => row.schoolName,
+      renderFormItem,
     },
 
     {
@@ -54,24 +73,14 @@ const VisitList = () => {
     },
     {
       title: '专业',
-      dataIndex: 'specialtyName',
+      dataIndex: 'specialtyId',
       align: 'center',
-      // hideInTable: true,
+      render: (_, row) => row.specialtyName||'-',
+      renderFormItem: (item, config, form) => {
+        const schoolId = form.getFieldValue('schoolId');
+        return <Specialty schoolid={schoolId} disabled={!schoolId}></Specialty>;
+      },
     },
-    {
-      title: '医生',
-      dataIndex: 'doctorName',
-      align: 'center',
-      hideInSearch: true,
-      valueType: 'date',
-    },
-    // {
-    //   title: '就诊科室',
-    //   dataIndex: 'createDate',
-    //   align: 'center',
-    //   hideInSearch: true,
-
-    // },
     {
       title: '创建时间',
       dataIndex: 'createDate',
@@ -87,8 +96,8 @@ const VisitList = () => {
       hideInSearch: true,
       render: (text, record) => (
         <Space size="middle">
-          <a onClick={() => handleMedicalClick(record.serialNo)}>查看报告</a>
-         
+          <a href={record.attchment} target="_blank" rel="noreferrer">查看报告</a>
+          {/* <a onClick={()=>setA(record.attchment)}>查看报告</a> */}
         </Space>
       ),
     },
@@ -98,6 +107,7 @@ const VisitList = () => {
     <PageContainer>
       <ProTable
         columns={columns}
+        
         request={queryTable('/testLog')}
         formRef={ref}
         rowKey="serialNo"
@@ -105,8 +115,10 @@ const VisitList = () => {
         search={{
           labelWidth: '4em',
         }}
-        // toolBarRender={() => actions}
+        toolBarRender={() => actions}
       />
+     
+   
     </PageContainer>
   );
 };

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

@@ -14,6 +14,8 @@ const VisitEdit = (props) => {
 
   const [searchLoading, setSearchLoading] = useState(false);
   const [school, setSchool] = useState();
+  const [searchValue, setSearchValue] = useState();
+  
   const [form] = Form.useForm();
 
   // eslint-disable-next-line no-shadow
@@ -73,15 +75,9 @@ const VisitEdit = (props) => {
 
   const handleSchoolChange = (value) => {
     setSchool(value)
-    console.log(value)
-    // request('/medicalLog', { method: 'post', data: { schoolId, ...value } })
-    //   .then(() => {
-    //     notification.success({ message: '新建成功' });
-    //     history.go('-1');
-    //   })
-    //   .catch((e) => {
-    //     notification.error({ message: e.message });
-    //   });
+    setSearchValue('')
+    form.resetFields()
+
   };
 
   return (
@@ -101,6 +97,8 @@ const VisitEdit = (props) => {
               <School value={school} onChange={handleSchoolChange} style={{ width: 200, marginBottom: '20px' }} allowClear />
               <Search
                 placeholder="请输入学号"
+                value={searchValue}
+                onChange={(e)=>setSearchValue(e.value)}
                 loading={searchLoading}
                 style={{ width: 200, marginBottom: '20px' }}
                 onSearch={onSearch}

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

@@ -102,7 +102,7 @@ const VisitList = () => {
       title: '专业',
       dataIndex: 'specialtyId',
       align: 'center',
-      render: (_, row) => row.specialtyName,
+      render: (_, row) => row.specialtyName||'-',
       renderFormItem: (item, config, form) => {
         const schoolId = form.getFieldValue('schoolId');
         return <Specialty schoolid={schoolId} disabled={!schoolId}></Specialty>;