feats

src/components/Specialty/index.jsx

@@ -20,7 +20,6 @@ export default (props) => {
 
   useEffect(() => {
     if (props.value !== value) {
-      console.log(props.value,value,'---------');
       if (!value) {
         setValue(value);
       } else {
@@ -39,10 +38,6 @@ export default (props) => {
           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

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

@@ -7,6 +7,7 @@ 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';
+import Specialty from '@/components/Specialty'
 
 const { Search } = Input;
 const VisitEdit = (props) => {
@@ -14,6 +15,7 @@ const VisitEdit = (props) => {
 
   const [searchLoading, setSearchLoading] = useState(false);
   const [school, setSchool] = useState();
+  const [specialtyId, setSpecialtyId] = useState()
   const [searchValue, setSearchValue] = useState();
   
   const [form] = Form.useForm();
@@ -63,7 +65,12 @@ const VisitEdit = (props) => {
   };
 
   const handleSubmit = (value) => {
-    request('/medicalLog', { method: 'post', data: { schoolId:school, ...value } })
+    if (!specialtyId) {
+      notification.warn({ message: '请选择专业' })
+      return;
+    }
+
+    request('/medicalLog', { method: 'post', data: { schoolId: school, specialtyId, ...value } })
       .then(() => {
         notification.success({ message: '新建成功' });
         history.go('-1');
@@ -77,7 +84,6 @@ const VisitEdit = (props) => {
     setSchool(value)
     setSearchValue('')
     form.resetFields()
-
   };
 
   return (
@@ -106,6 +112,16 @@ const VisitEdit = (props) => {
             </ProForm.Group>
           )}
           <ProForm.Group layout="inline" title="就诊信息">
+            <Form.Item label="专业" required>
+              <Specialty
+                value={specialtyId}
+                schoolid={schoolId || school}
+                onChange={(x) => setSpecialtyId(x)}
+                style={{ minWidth: '150px' }}
+                placeholder="请选择专业"
+              />
+            </Form.Item>
+
             <ProFormText
               label="姓名"
               placeholder="输入名称"

src/pages/Post/Type/index.jsx

@@ -3,7 +3,7 @@ import { connect } from 'umi';
 import { PageContainer } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import { PlusOutlined } from '@ant-design/icons';
-import { Button, notification } from 'antd';
+import { Button, Popconfirm, notification } from 'antd';
 import {
   ModalForm,
   ProFormText,
@@ -50,6 +50,17 @@ const PostTypeList = (props) => {
     })
   }
 
+  const handleDelete = (row) => {
+    return request(`/post-type/${row.typeId}`, { method: 'delete' }).then(() => {
+      notification.success({ message: '操作成功' })
+      tableRef.current.reload()
+      setVisible(false)
+    }).catch((e) => {
+      console.error(e)
+      notification.warn({ message: e.message })
+    })
+  }
+
   const actions = [
     <Button key="button" icon={<PlusOutlined />} type="primary" onClick={() => handleEdit()}>
       新建
@@ -99,6 +110,15 @@ const PostTypeList = (props) => {
         <a key="up" onClick={() => emitPublishOrNot(item)}>
           {item.status === 1 ? '下架' : '上架'}
         </a>,
+        <Popconfirm
+          key="popconfirm"
+          title={`确认删除吗?`}
+          onConfirm={() => handleDelete(item)}
+          okText="是"
+          cancelText="否"
+        >
+          <a>删除</a>
+        </Popconfirm>
       ],
     },
   ];