Merge branch 'master' of http://git.ycjcjy.com/medical-plat/pc-admin

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

@@ -14,11 +14,11 @@ const VisitList = () => {
     history.push(id ? `/medical/Test/edit?id=${id}` : '/medical/Test/edit');
   }, []);
 
-  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 columns = [
     {
       title: '就诊编号',
@@ -35,43 +35,43 @@ const VisitList = () => {
 
     {
       title: '学号',
-      dataIndex: 'd',
+      dataIndex: 'studentNo',
       align: 'center',
      
     },
     {
       title: '姓名',
-      dataIndex: 'status',
+      dataIndex: 'name',
       align: 'center',
       hideInSearch: true,
       // hideInTable: true,
     },
     {
       title: '性别',
-      dataIndex: 'status',
+      dataIndex: 'sex',
       align: 'center',
       hideInSearch: true,
     },
     {
       title: '专业',
-      dataIndex: 'status',
+      dataIndex: 'specialtyName',
       align: 'center',
       // hideInTable: true,
     },
     {
       title: '医生',
-      dataIndex: 'createDate',
+      dataIndex: 'doctorName',
       align: 'center',
       hideInSearch: true,
       valueType: 'date',
     },
-    {
-      title: '就诊科室',
-      dataIndex: 'createDate',
-      align: 'center',
-      hideInSearch: true,
+    // {
+    //   title: '就诊科室',
+    //   dataIndex: 'createDate',
+    //   align: 'center',
+    //   hideInSearch: true,
 
-    },
+    // },
     {
       title: '创建时间',
       dataIndex: 'createDate',
@@ -105,7 +105,7 @@ const VisitList = () => {
         search={{
           labelWidth: '4em',
         }}
-        toolBarRender={() => actions}
+        // toolBarRender={() => actions}
       />
     </PageContainer>
   );

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

@@ -6,24 +6,28 @@ import Container from '@/components/Container';
 import { Input, Form, Button, notification } from 'antd';
 import ProForm, { ProFormText, ProFormTextArea, ProFormSelect } from '@ant-design/pro-form';
 import request from '@/utils/request';
+import School from '@/components/School';
 
 const { Search } = Input;
 const VisitEdit = (props) => {
   const { id, schoolId } = props.location.query;
 
   const [searchLoading, setSearchLoading] = useState(false);
-
+  const [school, setSchool] = useState();
   const [form] = Form.useForm();
 
+  // eslint-disable-next-line no-shadow
   const getData = (id) => {
     if (id) {
-      request(`/student-no/${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: [] });
@@ -66,6 +70,20 @@ const VisitEdit = (props) => {
         notification.error({ message: e.message });
       });
   };
+
+  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 });
+    //   });
+  };
+
   return (
     <PageContainer
       header={{
@@ -79,12 +97,15 @@ const VisitEdit = (props) => {
       <Container>
         <ProForm form={form} submitter={!id} onFinish={handleSubmit}>
           {!id && (
-            <Search
-              placeholder="请输入学号"
-              loading={searchLoading}
-              style={{ width: 200, marginBottom: '20px' }}
-              onSearch={onSearch}
-            />
+            <ProForm.Group layout="inline">
+              <School value={school} onChange={handleSchoolChange} style={{ width: 200, marginBottom: '20px' }} allowClear />
+              <Search
+                placeholder="请输入学号"
+                loading={searchLoading}
+                style={{ width: 200, marginBottom: '20px' }}
+                onSearch={onSearch}
+              />
+            </ProForm.Group>
           )}
           <ProForm.Group layout="inline" title="就诊信息">
             <ProFormText

src/pages/Student/Student/Edit/index.jsx

@@ -45,7 +45,9 @@ const StudentEdit = (props) => {
 
             <Descriptions title="学生信息" style={{ marginBottom: 32 }}>
               <Descriptions.Item label="姓名">{data.name}</Descriptions.Item>
-              <Descriptions.Item label="性别">{data.sex === 1 ? '男':'女'}</Descriptions.Item>
+              <Descriptions.Item label="性别">
+                {data.sex === 1 ? '男' : (data.sex === 2  ?'女':'未知')}
+              </Descriptions.Item>
               <Descriptions.Item label="积分">{data.personData?.pointNum}</Descriptions.Item>
               <Descriptions.Item label="联系方式">{data.phone}</Descriptions.Item>
               <Descriptions.Item label="邮箱">{data.email}</Descriptions.Item>
@@ -57,7 +59,7 @@ const StudentEdit = (props) => {
             <Descriptions.Item label="学校">{data.schoolName}</Descriptions.Item>
             <Descriptions.Item label="专业">{data.specialtyName}</Descriptions.Item>
             <Descriptions.Item label="学界">{data.schoolBatch}</Descriptions.Item>
-            <Descriptions.Item label="学号">{data.studentId}</Descriptions.Item>
+            <Descriptions.Item label="学号">{data.studentNo}</Descriptions.Item>
           </Descriptions>
         </Card>
       </Container>

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

@@ -37,14 +37,14 @@ const StudentList = () => {
       title: '学校',
       dataIndex: 'schoolId',
       align: 'center',
-      render: (_, row) => row.schoolName,
+      render: (_, row) => row.schoolName||"-",
       renderFormItem: () => <School autoDefault={false} allowClear></School>,
     },
     {
       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>;
@@ -52,7 +52,7 @@ const StudentList = () => {
     },
     {
       title: '学号',
-      dataIndex: 'studentId',
+      dataIndex: 'studentNo',
       align: 'center',
     },
     {