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

package.json

@@ -45,6 +45,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.0.0",
+    "@ant-design/pro-card": "^1.11.10",
     "@ant-design/pro-descriptions": "^1.2.0",
     "@ant-design/pro-form": "^1.3.0",
     "@ant-design/pro-layout": "^6.9.0",

src/common/constants.js

@@ -1,6 +0,0 @@
-const stateOptions = {
-  0: { text: '未上架' },
-  1: { text: '已上架' },
-};
-
-export { stateOptions };

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

@@ -101,7 +101,7 @@ const VisitList = () => {
         request={queryTable('/testLog')}
         formRef={ref}
         rowKey="serialNo"
-        headerTitle="就诊列表"
+        headerTitle="体检列表"
         search={{
           labelWidth: '4em',
         }}

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

@@ -1,19 +1,184 @@
-import React from 'react';
-import { connect } from 'umi';
+import React, { useEffect, useState } from 'react';
+import { connect, history } from 'umi';
+import ProCard from '@ant-design/pro-card';
 import { PageContainer } from '@ant-design/pro-layout';
+import Container from '@/components/Container';
+import { Input, Select, Form, Button, notification } from 'antd';
+import ProForm, { ProFormText, ProFormTextArea, ProFormSelect } from '@ant-design/pro-form';
+import request from '@/utils/request';
 
-const VisitList = () => {
+const { Option } = Select;
+const { Search } = Input;
+const VisitEdit = (props) => {
+  const { id, schoolId } = props.location.query;
+  const [list, setList] = useState([]);
+  const [searchLoading, setSearchLoading] = useState(false);
 
+  const [form] = Form.useForm();
 
- 
+  const getData = (id) => {
+    if (id) {
+      request(`/student/${id}`)
+        .then((res) => {
+          console.log(res, 'res');
+          form.setFieldsValue(res);
+          setSearchLoading(false);
+        })
+        .catch((e) => {
+          setSearchLoading(false);
+        });
+    } else {
+      // this.setState({ data: [] });
+    }
+  };
 
+  useEffect(()=>{
+if(id){
+  if (id) {
+    request(`/medical-log/${id}`)
+      .then((res) => {
+        console.log(res, '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 handleChange = (value) => {
+    // this.setState({ value });
+  };
+  const handleSubmit = (value) => {
+    // this.setState({ value });
+    console.log(value, 'handleSubmit');
+    request('/medicalLog', { method: 'post', data: {schoolId, ...value } })
+    .then(() => {
+
+      notification.success({ message: '新建成功' });
+      history.go('-1')
+    })
+    .catch((e) => {
+      notification.error({ message: e.message });
+    });
+  };
   return (
-    <PageContainer>
-      234
+    <PageContainer
+      header={{
+        extra: [
+          <Button key="1" onClick={() => history.go('-1')}>
+            返回
+          </Button>,
+        ],
+      }}
+    >
+      <Container>
+        <ProForm form={form} submitter={!id} onFinish={handleSubmit}>
+          <ProCard.Group title="就诊信息" bodyStyle={{ padding: 20 }}>
+            {!id && (
+              <Search
+                placeholder="请输入学号"
+                loading={searchLoading}
+                style={{ width: 200, marginBottom: '20px' }}
+                onSearch={onSearch}
+              />
+            )}
+
+            <ProFormText
+              label="姓名"
+              placeholder="输入名称"
+              name="name"
+              fieldProps={{ bordered: !id, readOnly: !!id }}
+              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: '请选择性别' }]}
+            />
+
+            <ProFormText
+              label="学号"
+              placeholder="输入学号"
+              name="studentId"
+              fieldProps={{ bordered: !id, readOnly: !!id }}
+              rules={[{ required: true, message: '请填写学号' }]}
+            />
+
+            <ProFormText
+              label="联系方式"
+              placeholder="输入联系方式"
+              name="phone"
+              fieldProps={{ bordered: !id, readOnly: !!id }}
+              rules={[{ required: true, message: '请填写联系方式' }]}
+            />
+          </ProCard.Group>
+          <ProCard.Group title="诊断" bodyStyle={{ padding: 20 }}>
+            <ProFormSelect
+              label="就诊科室"
+              placeholder="输选择"
+              name="hospitalId"
+              fieldProps={{ bordered: !id, open: id ? false : undefined }}
+              request={async ({ keyWords }) => {
+                // console.log()
+                // if (keyWords) {
+                return request('/hospital', {
+                  method: 'get',
+                  params: { name: keyWords, schoolId, pageNum: 1, pageSize: 1000 },
+                })
+                  .then((res) => {
+                    return res?.records?.map((x) => {
+                      return { label: x.name, value: x.hospitalId };
+                    });
+                  })
+                  .catch((e) => {
+                    return Promise.reject(e.message);
+                  });
+                // }
+              }}
+              rules={[{ required: true, message: '请选择科室' }]}
+            />
+
+            <ProFormTextArea
+              label="诊断报告"
+              placeholder="输入诊断报告"
+              name="attchment"
+             
+              fieldProps={{readOnly: !!id }}
+              rules={[{ required: true, message: '请填写诊断报告' }]}
+            />
+          </ProCard.Group>
+        </ProForm>
+      </Container>
     </PageContainer>
   );
 };
 
 export default connect((s) => ({
   typeList: s.post.typeList,
-}))(VisitList);
+}))(VisitEdit);

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

@@ -1,24 +1,49 @@
-import React, { useRef, useCallback } from 'react';
+import React, { useRef,useState, 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  { queryTable } from '@/utils/request';
+import School from '@/components/School';
 
 const VisitList = () => {
 
 
   const ref = useRef();
-  const handleMedicalClick = useCallback((id) => {
-    history.push(id ? `/medical/visit/edit?id=${id}` : '/medical/visit/edit');
-  }, []);
+  const [school, setSchool] = useState({});
+
+  const handleMedicalClick = (id) => {
+    console.log(school,'school')
+    history.push(id ? `/medical/visit/edit?id=${id}&schoolId=${school?.schoolId}` : `/medical/visit/edit?schoolId=${school?.schoolId}`);
+  }
 
   const actions = [   
     <Button key="button" icon={<PlusOutlined />} type="primary" onClick={() => handleMedicalClick()}>
       新建
     </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 renderFormItem = (item, config, form) => {
+    const handleSchoolChange = (schoolId, schoolInfo) => {
+      form.setFieldsValue({ schoolId });
+      form.submit();
+      console.log(schoolInfo,'schoolInfo')
+      setSchool({...schoolInfo});
+    };
+
+    return <School onChange={handleSchoolChange} />;
+  };
+
   const columns = [
     {
       title: '就诊编号',
@@ -28,9 +53,11 @@ const VisitList = () => {
       align: 'center',
     },
     {
-      title: '学校名称',
-      dataIndex: 'schoolName',
-      align: 'center',
+      title: '所属学校',
+      key: 'schoolId',
+      dataIndex: 'schoolId',
+      valueType: 'select',
+      renderFormItem,
     },
 
     {
@@ -98,7 +125,7 @@ const VisitList = () => {
     <PageContainer>
       <ProTable
         columns={columns}
-        request={queryTable('/medicalLog')}
+        request={queryFunc}
         formRef={ref}
         rowKey="serialNo"
         headerTitle="就诊列表"

src/pages/Student/School/Edit/Specialty.jsx

@@ -115,7 +115,7 @@ const Specialty = (props) => {
         actionRef={ref}
         search={false}
         rowKey="specialtyId"
-        // headerTitle="专业列表"
+        headerTitle={props.data.name}
 
         toolBarRender={() => actions}
       />

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

@@ -66,9 +66,15 @@ const SchoolList = () => {
       align: 'center',
       // hideInTable: true,
       valueType: 'select',
-      valueEnum: {
-        0: { text: '未上架' },
-        1: { text: '已上架' },
+      valueEnum:{
+        0: {
+          text: '已下架',
+          status: 'Processing',
+        },
+        1: {
+          text: '已上架',
+          status: 'Success',
+        },
       },
     },
     {

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

@@ -34,12 +34,12 @@ const BannerEdit = (props) => {
         </div>
 
         <Card bordered={false}>
-          <div style={{ display: 'flex' }}>
+          {/* <div style={{ display: 'flex' }}>
             <div>
               <Image src={data.avatar} width={200}></Image>
-            </div>
+            </div> */}
 
-            <Descriptions title="学生信息" style={{ marginBottom: 32, marginLeft: 40 }}>
+            <Descriptions title="学生信息" style={{ marginBottom: 32 }}>
               <Descriptions.Item label="姓名">{data.name}</Descriptions.Item>
               <Descriptions.Item label="性别">{data.sex}</Descriptions.Item>
               <Descriptions.Item label="积分">{data.createDate}</Descriptions.Item>
@@ -47,7 +47,7 @@ const BannerEdit = (props) => {
               <Descriptions.Item label="联系方式">{data.phone}</Descriptions.Item>
               <Descriptions.Item label="邮箱">{data.eMail}</Descriptions.Item>
             </Descriptions>
-          </div>
+          {/* </div> */}
 
           <Divider style={{ marginBottom: 32 }} />
           <Descriptions title="学校信息" style={{ marginBottom: 32 }}>

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

@@ -38,9 +38,10 @@ const StudentList = () => {
     },
     {
       title: '学校',
-      dataIndex: 'schoolName',
+      dataIndex: 'schoolId',
 
       align: 'center',
+
     },
     {
       title: '专业',