fix

src/components/Specialty/index.jsx

@@ -0,0 +1,76 @@
+import React, { useEffect, useState } from 'react';
+import { Select, Spin } from 'antd';
+import request from '@/utils/request';
+
+export default (props) => {
+  const [loading, setLoading] = useState(false);
+  const [list, setList] = useState([]);
+  const [value, setValue] = useState();
+
+  const filterFunc = (input, option) => {
+    return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+  };
+
+  const handleChange = (val) => {
+    setValue(val);
+    const specialty = list.filter((s) => s.schoolId === val)[0];
+
+    props.onChange(val, specialty);
+  };
+
+  useEffect(() => {
+    if (props.value !== value) {
+      console.log('---------');
+      if (!value) {
+        setValue();
+      } else {
+        setValue(props.value);
+      }
+    }
+  }, [props.value, value]);
+
+  useEffect(() => {
+    if (props.schoolid) {
+      setLoading(true);
+
+      request('/specialty', { params: { schoolId: props.schoolid, pageSize: 100 } })
+        .then((res) => {
+          const records = res.records || [];
+          setList(records);
+          setLoading(false);
+          setValue();
+          // if (props.autoDefault !== false && records.length > 0) {
+          //   setValue(records[0].specialty);
+          //   props.onChange(records[0].specialtyId, records[0]);
+          // }
+        })
+        .catch((e) => {
+          // eslint-disable-next-line
+          console.error(e.message);
+          setLoading(false);
+        });
+    }
+
+    // eslint-disable-next-line
+  }, [props.schoolid]);
+
+  return (
+    <Spin spinning={loading}>
+      <Select
+        showSearch
+        optionFilterProp="children"
+        filterOption={filterFunc}
+        {...props}
+        value={value}
+        onChange={handleChange}
+        allowClear
+      >
+        {list.map((s) => (
+          <Select.Option key={s.specialtyId} value={s.specialtyId}>
+            {s.name}
+          </Select.Option>
+        ))}
+      </Select>
+    </Spin>
+  );
+};

src/pages/Cms/Banner/List/index.jsx

@@ -45,6 +45,25 @@ const BannerList = () => {
       });
   };
 
+  const changeStatus = (row) => {
+    setLoading(true);
+
+    request(`/banner/${row.serialNo}`, {
+      method: 'put',
+      data: { ...row, status: row.status === 1 ? 0 : 1 },
+    })
+      .then(() => {
+        notification.info({ message: '修改成功' });
+        setLoading(false);
+        ref.current.submit();
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+        setLoading(false);
+        return Promise.reject(e.message);
+      });
+  };
+
   const columns = [
     {
       title: '排序',
@@ -82,7 +101,11 @@ const BannerList = () => {
       dataIndex: 'status',
       align: 'center',
       hideInSearch: true,
-      // render: (text) => <Image src={text} />,
+
+      valueEnum: {
+        0: { text: '未启用', status: 'Default' },
+        1: { text: '启用', status: 'Success' },
+      },
     },
     {
       title: '操作',
@@ -91,6 +114,9 @@ const BannerList = () => {
       hideInSearch: true,
       render: (text, record) => (
         <Space size="middle">
+          <a key="status" onClick={() => changeStatus(record)}>
+            {record.status === 1 ? '弃用' : '启用'}
+          </a>
           <a onClick={() => handleBannerClick(record.serialNo)}>编辑</a>
           <Popconfirm
             key="popconfirm"

src/pages/Cms/Hot/List/index.jsx

@@ -45,6 +45,25 @@ const HotList = () => {
       });
   };
 
+  const changeStatus = (row) => {
+    setLoading(true);
+
+    request(`/topic/${row.serialNo}`, {
+      method: 'put',
+      data: { ...row, status: row.status === 1 ? 0 : 1 },
+    })
+      .then(() => {
+        notification.info({ message: '修改成功' });
+        setLoading(false);
+        ref.current.submit();
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+        setLoading(false);
+        return Promise.reject(e.message);
+      });
+  };
+
   const columns = [
     {
       title: '排序',
@@ -65,7 +84,7 @@ const HotList = () => {
     },
     {
       title: '文章标题',
-      dataIndex: 'title',
+      dataIndex: 'targetTitle',
       align: 'center',
       className: 'drag-visible',
     },
@@ -82,7 +101,10 @@ const HotList = () => {
       dataIndex: 'status',
       align: 'center',
       hideInSearch: true,
-      // render: (text) => <Image src={text} />,
+      valueEnum: {
+        0: { text: '未启用', status: 'Default' },
+        1: { text: '启用', status: 'Success' },
+      },
     },
     {
       title: '操作',
@@ -91,6 +113,9 @@ const HotList = () => {
       hideInSearch: true,
       render: (text, record) => (
         <Space size="middle">
+           <a key="status" onClick={() => changeStatus(record)}>
+            {record.status === 1 ? '弃用' : '启用'}
+          </a>
           <a onClick={() => handleHotClick(record.serialNo)}>编辑</a>
           <Popconfirm
             key="popconfirm"

src/pages/Medical/Hospital/index.jsx

@@ -156,7 +156,7 @@ export default () => {
         actionRef={tableRef}
         columns={columns}
         request={queryFunc}
-        rowKey="schoolId"
+        rowKey="hospitalId"
         headerTitle="诊室列表"
         toolBarRender={() => actions}
       />

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

@@ -1,17 +1,16 @@
 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 { Input, Form, Button, notification } from 'antd';
 import ProForm, { ProFormText, ProFormTextArea, ProFormSelect } from '@ant-design/pro-form';
 import request from '@/utils/request';
 
-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();
@@ -20,7 +19,6 @@ const VisitEdit = (props) => {
     if (id) {
       request(`/student/${id}`)
         .then((res) => {
-          console.log(res, 'res');
           form.setFieldsValue(res);
           setSearchLoading(false);
         })
@@ -32,23 +30,22 @@ const VisitEdit = (props) => {
     }
   };
 
-  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])
+  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) {
@@ -59,21 +56,15 @@ if(id){
     }
   };
 
-  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 });
-    });
+    request('/medicalLog', { method: 'post', data: { schoolId, ...value } })
+      .then(() => {
+        notification.success({ message: '新建成功' });
+        history.go('-1');
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+      });
   };
   return (
     <PageContainer
@@ -87,16 +78,15 @@ if(id){
     >
       <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}
-              />
-            )}
-
+          {!id && (
+            <Search
+              placeholder="请输入学号"
+              loading={searchLoading}
+              style={{ width: 200, marginBottom: '20px' }}
+              onSearch={onSearch}
+            />
+          )}
+          <ProForm.Group layout="inline" title="就诊信息">
             <ProFormText
               label="姓名"
               placeholder="输入名称"
@@ -137,42 +127,16 @@ if(id){
               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: '请选择科室' }]}
-            />
+          </ProForm.Group>
 
-            <ProFormTextArea
-              label="诊断报告"
-              placeholder="输入诊断报告"
-              name="attchment"
-             
-              fieldProps={{readOnly: !!id }}
-              rules={[{ required: true, message: '请填写诊断报告' }]}
-            />
-          </ProCard.Group>
+          <ProFormTextArea
+            label="诊断报告"
+            placeholder="输入诊断报告"
+            name="attchment"
+            fieldProps={{ readOnly: !!id, rows: 10 }}
+            rules={[{ required: true, message: '请填写诊断报告' }]}
+            style={{ width: '100%' }}
+          />
         </ProForm>
       </Container>
     </PageContainer>

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

@@ -6,6 +6,7 @@ import { PlusOutlined } from '@ant-design/icons';
 import { Button,  Space } from 'antd';
 import  { queryTable } from '@/utils/request';
 import School from '@/components/School';
+import Specialty from '@/components/Specialty';
 
 const VisitList = () => {
 
@@ -41,7 +42,7 @@ const VisitList = () => {
       setSchool({...schoolInfo});
     };
 
-    return <School onChange={handleSchoolChange} />;
+    return <School onChange={handleSchoolChange} allowClear/>;
   };
 
   const columns = [
@@ -52,23 +53,30 @@ const VisitList = () => {
 
       align: 'center',
     },
+    // {
+    //   title: '学校',
+    //   key: 'schoolId',
+    //   dataIndex: 'schoolId',
+    //   valueType: 'select',
+    //   renderFormItem,
+    // },
     {
-      title: '所属学校',
-      key: 'schoolId',
+      title: '学校',
       dataIndex: 'schoolId',
-      valueType: 'select',
+      align: 'center',
+      render: (_, row) => row.schoolName,
       renderFormItem,
     },
 
     {
       title: '学号',
-      dataIndex: 'd',
+      dataIndex: 'studentId',
       align: 'center',
      
     },
     {
       title: '姓名',
-      dataIndex: 'status',
+      dataIndex: 'name',
       align: 'center',
       hideInSearch: true,
       // hideInTable: true,
@@ -78,27 +86,36 @@ const VisitList = () => {
       dataIndex: 'status',
       align: 'center',
       hideInSearch: true,
+      valueEnum: {
+        1: { text: '男' },
+        2: { text: '女' },
+      },
     },
+
+   
     {
       title: '专业',
-      dataIndex: 'status',
+      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: '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: 'recordDate',

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

@@ -50,7 +50,7 @@ const Specialty = (props) => {
   //   };
 
   const deleteSchoolClick = () => {
-      console.log(ref)
+
     ref.current.reload();
     //   request(`/specialty/${id}`, { method: 'delete' })
     //     .then(() => {
@@ -76,6 +76,7 @@ const Specialty = (props) => {
       dataIndex: 'schoolNmae',
       align: 'center',
       hideInSearch: true,
+      render: () => props.data.name
     },
 
     {

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

@@ -36,6 +36,25 @@ const SchoolList = () => {
       });
   };
 
+  const changeStatus = (row) => {
+    setLoading(true);
+
+    request(`/school/${row.schoolId}`, {
+      method: 'put',
+      data: { ...row, status: row.status === 1 ? 0 : 1 },
+    })
+      .then(() => {
+        notification.info({ message: '修改成功' });
+        setLoading(false);
+        ref.current.submit();
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+        setLoading(false);
+        return Promise.reject(e.message);
+      });
+  };
+
   const columns = [
     {
       title: 'logo',
@@ -64,26 +83,22 @@ const SchoolList = () => {
       title: '上架状态',
       dataIndex: 'status',
       align: 'center',
-      // hideInTable: true,
+      hideInTable: true,
       valueType: 'select',
-      valueEnum:{
-        0: {
-          text: '已下架',
-          status: 'Processing',
-        },
-        1: {
-          text: '已上架',
-          status: 'Success',
-        },
+      valueEnum: {
+       
+        0: { text: '未上架', status: 'Default' },
+        1: { text: '已上架', status: 'Success' },
       },
     },
     {
-      title: '上传时间',
+      title: '创建时间',
       dataIndex: 'createDate',
       align: 'center',
       hideInSearch: true,
       valueType: 'date',
     },
+    // autoDefault
     {
       title: '操作',
       dataIndex: 'action',
@@ -91,6 +106,9 @@ const SchoolList = () => {
       hideInSearch: true,
       render: (text, record) => (
         <Space size="middle">
+          <a key="status" onClick={() => changeStatus(record)}>
+            {record.status === 1 ? '下架' : '上架'}
+          </a>
           <a onClick={() => handleSchoolClick(record.schoolId)}>编辑</a>
           <Popconfirm
             key="popconfirm"

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

@@ -26,12 +26,19 @@ const BannerEdit = (props) => {
   }, [id]);
 
   return (
-    <PageContainer>
+    <PageContainer
+    header={{
+      extra: [
+        <Button key="1" onClick={() => history.go('-1')}>
+          返回
+        </Button>,
+      ],
+    }}>
       <Container loading={loading}>
-        <div style={{ textAlign: 'right' }}>
+        {/* <div style={{ textAlign: 'right' }}>
           {' '}
           <Button onClick={() => history.go('-1')}>返回</Button>
-        </div>
+        </div> */}
 
         <Card bordered={false}>
           {/* <div style={{ display: 'flex' }}>
@@ -45,7 +52,7 @@ const BannerEdit = (props) => {
               <Descriptions.Item label="积分">{data.createDate}</Descriptions.Item>
               <Descriptions.Item label="微信昵称">{data.nickName}</Descriptions.Item>
               <Descriptions.Item label="联系方式">{data.phone}</Descriptions.Item>
-              <Descriptions.Item label="邮箱">{data.eMail}</Descriptions.Item>
+              <Descriptions.Item label="邮箱">{data.email}</Descriptions.Item>
             </Descriptions>
           {/* </div> */}
 

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

@@ -1,9 +1,11 @@
 import React, { useCallback } from 'react';
 import { connect, history } from 'umi';
+import { Space } from 'antd';
 import { PageContainer } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
-import { Space } from 'antd';
+import School from '@/components/School';
 import { queryTable } from '@/utils/request';
+import Specialty from '@/components/Specialty';
 
 const StudentList = () => {
   const handleStudentClick = useCallback((id) => {
@@ -17,6 +19,7 @@ const StudentList = () => {
       title: '编号',
       dataIndex: 'personId',
       align: 'center',
+      width: 300,
       hideInSearch: true,
     },
     {
@@ -25,7 +28,7 @@ const StudentList = () => {
       align: 'center',
     },
     {
-      title: '昵称',
+      title: '微信昵称',
       dataIndex: 'nickName',
       align: 'center',
       hideInSearch: true,
@@ -39,17 +42,20 @@ const StudentList = () => {
     {
       title: '学校',
       dataIndex: 'schoolId',
-
       align: 'center',
-
+      render: (_, row) => row.schoolName,
+      renderFormItem: () => <School autoDefault={false} allowClear></School>,
     },
     {
       title: '专业',
-      dataIndex: 'specialtyName',
-
+      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: 'studentId',
@@ -73,7 +79,7 @@ const StudentList = () => {
       <ProTable
         columns={columns}
         request={queryTable('/person')}
-        rowKey="schoolId"
+        rowKey="personId"
         headerTitle="学校列表"
         search={{
           labelWidth: '4em',