featgs

config/routes.js

@@ -181,6 +181,12 @@ export default [
                     menuCode: 'medical.test',
                     hideInMenu: true,
                     component: './Medical/Test/Edit',
+                  },              
+                  {
+                    path: '/medical/hospital',
+                    name: '诊室管理',
+                    menuCode: 'medical.hospital',
+                    component: './Medical/Hospital',
                   },
                 ],
               },
@@ -244,13 +250,6 @@ export default [
                     menuCode: 'system.params',
                     component: './System/Params',
                   },
-              
-                  {
-                    path: '/system/clinic',
-                    name: '诊室管理',
-                    menuCode: 'system.clinic',
-                    component: '../layouts/BlankLayout',
-                  },
                 ],
               },
               {

src/components/School/index.jsx

@@ -0,0 +1,64 @@
+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 school = list.filter((s) => s.schoolId === val)[0]
+
+    props.onChange(val, school)
+  }
+
+  useEffect(() => {
+    if (props.value !== value) {
+      setValue(props.value)
+    }
+  }, [props.value, value])
+
+  useEffect(() => {
+    setLoading(true)
+    request('/school', { params: { pageSize: 100 } }).then(res => {
+      const records = res.records || []
+      setList(records)
+      setLoading(false)
+
+      if (props.autoDefault !== false && records.length > 0) {
+        setValue(records[0].schoolId)
+        props.onChange(records[0].schoolId, records[0])
+      }
+
+    }).catch((e) => {
+      // eslint-disable-next-line
+      console.error(e.message)
+      setLoading(false)
+    })
+
+  // eslint-disable-next-line
+  }, [])
+
+  return (
+    <Spin spinning={loading}>
+      <Select
+        showSearch
+        optionFilterProp="children"
+        filterOption={filterFunc}
+        {...props}
+        value={value}
+        onChange={handleChange}
+      >
+      {
+        list.map((s) => (<Select.Option key={s.schoolId} value={s.schoolId}>{s.name}</Select.Option>))
+      }
+      </Select>
+    </Spin>
+  )
+}

src/pages/Medical/Hospital/index.jsx

@@ -0,0 +1,173 @@
+import React, { useRef, useState } from 'react';
+import { PageContainer } from '@ant-design/pro-layout';
+import ProTable from '@ant-design/pro-table';
+import { Button, Modal, Input, notification } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import request, { queryTable } from '@/utils/request';
+import School from '@/components/School';
+
+export default () => {
+  const tableRef = useRef();
+  const [school, setSchool] = useState();
+  const [current, setCurrent] = useState();
+  const [inputVal, setInputVal] = useState([]);
+  const [show, setShow] = useState(false);
+
+  const queryFunc = (params, page, sort, filter) => {
+    if (!school.schoolId) {
+      return Promise.resolve({ data: [], success: true, total: 0 });
+    }
+
+    const newParams = { ...params, schoolId: school.schoolId };
+    return queryTable('/hospital')(newParams, page, sort, filter);
+  };
+
+  const handleEdit = (hospital) => {
+    setCurrent(hospital);
+    setInputVal(hospital.name);
+    setShow(true);
+  };
+
+  const handleAdd = () => {
+    setCurrent();
+    setInputVal();
+    setShow(true);
+  };
+
+  const changeStatus = (hospital) => {
+    // 0 变 1, 1 变 0
+    // eslint-disable-next-line no-bitwise
+    const status = hospital.status ^ 1;
+    const data = { ...hospital, status }
+
+    request(`/hospital/${hospital.hospitalId}`, {
+      method: 'put',
+      data,
+    })
+      .then(() => {
+        tableRef.current.reload();
+        notification.success({ message: '操作成功' });
+      })
+      .catch((e) => {
+        notification.error({ message: e.message });
+      });
+
+
+  };
+
+  const renderFormItem = (item, config, form) => {
+    const handleSchoolChange = (schoolId, schoolInfo) => {
+      form.setFieldsValue({ schoolId });
+      form.submit();
+      setSchool(schoolInfo);
+    };
+
+    return <School onChange={handleSchoolChange} />;
+  };
+
+  const columns = [
+    {
+      title: '所属学校',
+      key: 'schoolId',
+      dataIndex: 'schoolId',
+      hideInTable: true,
+      valueType: 'select',
+      renderFormItem,
+    },
+    {
+      title: '诊室名称',
+      key: 'name',
+      dataIndex: 'name',
+    },
+    {
+      title: '状态',
+      key: 'status',
+      dataIndex: 'status',
+      valueEnum: {
+        0: { text: '未启用', status: 'Default' },
+        1: { text: '启用', status: 'Success' },
+      },
+      hideInSearch: true,
+    },
+    {
+      title: '创建日期',
+      key: 'createDate',
+      dataIndex: 'createDate',
+      valueType: 'date',
+      hideInSearch: true,
+    },
+    {
+      title: '操作',
+      key: 'option',
+      valueType: 'option',
+      width: 180,
+      render: (_, hospital) => [
+        <a key="edit" onClick={() => handleEdit(hospital)}>
+          修改
+        </a>,
+        <a key="status" onClick={() => changeStatus(hospital)}>
+          {hospital.status === 1 ? '弃用' : '启用'}
+        </a>,
+      ],
+    },
+  ];
+
+  const handleSubmit = () => {
+    setShow(false);
+
+    if (!inputVal) {
+      return;
+    }
+
+    if (current && current.hospitalId) {
+      request(`/hospital/${current.hospitalId}`, {
+        method: 'put',
+        data: { ...current, name: inputVal },
+      })
+        .then(() => {
+          tableRef.current.reload();
+          notification.success({ message: '修改成功' });
+        })
+        .catch((e) => {
+          notification.error({ message: e.message });
+        });
+    } else {
+      request('/hospital', { method: 'post', data: { schoolId: school.schoolId, name: inputVal } })
+        .then(() => {
+          tableRef.current.reload();
+          notification.success({ message: '修改成功' });
+        })
+        .catch((e) => {
+          notification.error({ message: e.message });
+        });
+    }
+  };
+
+  const actions = [
+    <Button key="button" icon={<PlusOutlined />} type="primary" onClick={handleAdd}>
+      新建
+    </Button>,
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable
+        manualRequest
+        actionRef={tableRef}
+        columns={columns}
+        request={queryFunc}
+        rowKey="schoolId"
+        headerTitle="诊室列表"
+        toolBarRender={() => actions}
+      />
+      <Modal
+        title={school?.name}
+        visible={show}
+        onOk={handleSubmit}
+        onCancel={() => setShow(false)}
+      >
+        <Input size="large" value={inputVal} onChange={(e) => setInputVal(e.target.value)} />
+      </Modal>
+    </PageContainer>
+  );
+};

src/pages/System/Params/index.jsx

@@ -10,6 +10,12 @@ export default () => {
   const [inputVal, setInputVal] = useState([])
   const [show, setShow] = useState(false)
 
+  const handleEdit = (config) => {
+    setCurrent(config)
+    setInputVal(config.value)
+    setShow(true)
+  }
+
   const columns = [
     {
       title: '编码',
@@ -37,12 +43,6 @@ export default () => {
     },
   ]
 
-  const handleEdit = (config) => {
-    setCurrent(config)
-    setInputVal(config.value)
-    setShow(true)
-  }
-
   const handleSubmit = () => {
     setShow(false)
     request(`/sys-config/${current.serialNo}`, { method: 'put', data: { ...current, value: inputVal } }).then(() => {

src/pages/System/Role/Edit.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { PageContainer } from '@ant-design/pro-layout';
-import { Button, Card, Divider, notification } from 'antd';
+import { Button, Card, notification } from 'antd';
 import request from '@/utils/request';
 import RoleForm from './components/Form'
 import RoleMenu from './components/Menu'

src/pages/User/List/index.jsx

@@ -25,6 +25,7 @@ export default () => {
 
   const changeStatus = (user) => {
     // 0 变 1, 1 变 0
+    // eslint-disable-next-line no-bitwise
     const status = user.status ^ 1
     request(`/user/${user.userId}`, { method: 'put', data: { ...user, status } } ).then(() => {
       notification.success({ message: '操作成功' })