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

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

@@ -6,7 +6,7 @@ import request from '@/utils/request';
 
 import ProForm, { ProFormText, ProFormSelect } from '@ant-design/pro-form';
 import UploadImage from '@/components/UploadImage';
-import { notification, Form } from 'antd';
+import { notification, Form, Button } from 'antd';
 
 const BannerEdit = (props) => {
   const { id } = props.location.query;
@@ -20,8 +20,7 @@ const BannerEdit = (props) => {
       request(`/banner/${id}`)
         .then((res) => {
           form.setFieldsValue(res);
-          //   setBannerData(res);
-          //   set
+
           setLoading(false);
         })
         .catch((e) => {
@@ -32,7 +31,6 @@ const BannerEdit = (props) => {
   }, [form, id]);
 
   const handleSubmit = (values) => {
-    console.log(values, form.getFieldsValue(), 'handleSubmit');
     if (!id) {
       setLoading(true);
       return request('/banner', { method: 'post', data: values })
@@ -66,7 +64,15 @@ const BannerEdit = (props) => {
   };
 
   return (
-    <PageContainer>
+    <PageContainer
+      header={{
+        extra: [
+          <Button key="1" onClick={() => history.go('-1')}>
+            返回
+          </Button>,
+        ],
+      }}
+    >
       <Container loading={loading}>
         <ProForm form={form} onFinish={handleSubmit}>
           <Form.Item
@@ -106,7 +112,6 @@ const BannerEdit = (props) => {
             name="targetId"
             showSearch
             request={async ({ keyWords }) => {
-              // console.log()
               // if (keyWords) {
               return request('/post', {
                 method: 'get',

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

@@ -32,7 +32,6 @@ const BannerList = () => {
 
   const deleteBannerClick = (id) => {
     setLoading(true);
-    console.log(ref, 'ref');
 
     request(`/banner/${id}`, { method: 'delete' })
       .then(() => {
@@ -163,7 +162,6 @@ const BannerList = () => {
 
   const getData = (params, sort, filter) => {
     return queryTable('/banner')(params, sort, filter).then((res) => {
-      console.log(res, 'getData');
       setDataSource(res.data);
       return res;
     });

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

@@ -6,7 +6,7 @@ import request from '@/utils/request';
 
 import ProForm, { ProFormSelect } from '@ant-design/pro-form';
 import UploadImage from '@/components/UploadImage';
-import { notification, Form } from 'antd';
+import { notification, Form, Button } from 'antd';
 
 const HotEdit = (props) => {
   const { id } = props.location.query;
@@ -32,7 +32,7 @@ const HotEdit = (props) => {
   }, [form, id]);
 
   const handleSubmit = (values) => {
-    console.log(values, form.getFieldsValue(), 'handleSubmit');
+
     if (!id) {
       setLoading(true);
       return request('/topic', { method: 'post', data: values })
@@ -66,7 +66,15 @@ const HotEdit = (props) => {
   };
 
   return (
-    <PageContainer>
+    <PageContainer
+      header={{
+        extra: [
+          <Button key="1" onClick={() => history.go('-1')}>
+            返回
+          </Button>,
+        ],
+      }}
+    >
       <Container loading={loading}>
         <ProForm form={form} onFinish={handleSubmit}>
           <Form.Item
@@ -99,7 +107,6 @@ const HotEdit = (props) => {
             name="targetId"
             showSearch
             request={async ({ keyWords }) => {
-              // console.log()
               // if (keyWords) {
               return request('/post', {
                 method: 'get',

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

@@ -32,7 +32,6 @@ const HotList = () => {
 
   const deleteHotClick = (id) => {
     setLoading(true);
-    console.log(ref, 'ref');
 
     request(`/topic/${id}`, { method: 'delete' })
       .then(() => {
@@ -162,7 +161,6 @@ const HotList = () => {
 
   const getData = (params, sort, filter) => {
     return queryTable('/topic')(params, sort, filter).then((res) => {
-      console.log(res, 'getData');
       setDataSource(res.data);
       return res;
     });

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

@@ -1,26 +1,33 @@
-import React, { useRef,useState, useCallback } from 'react';
+import React, { useRef, useState } 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 { Button, Space } from 'antd';
+import { queryTable } from '@/utils/request';
 import School from '@/components/School';
 import Specialty from '@/components/Specialty';
 
 const VisitList = () => {
-
-
   const ref = useRef();
   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}`);
-  }
+    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()}>
+  const actions = [
+    <Button
+      key="button"
+      icon={<PlusOutlined />}
+      type="primary"
+      onClick={() => handleMedicalClick()}
+    >
       新建
     </Button>,
   ];
@@ -29,7 +36,7 @@ const VisitList = () => {
     if (!school.schoolId) {
       return Promise.resolve({ data: [], success: true, total: 0 });
     }
-    console.log(school,'queryFunc')
+    console.log(school, 'queryFunc');
     const newParams = { ...params, schoolId: school.schoolId };
     return queryTable('/medicalLog')(newParams, page, sort, filter);
   };
@@ -38,11 +45,11 @@ const VisitList = () => {
     const handleSchoolChange = (schoolId, schoolInfo) => {
       form.setFieldsValue({ schoolId });
       form.submit();
-      console.log(schoolInfo,'schoolInfo')
-      setSchool({...schoolInfo});
+      console.log(schoolInfo, 'schoolInfo');
+      setSchool({ ...schoolInfo });
     };
 
-    return <School onChange={handleSchoolChange} allowClear/>;
+    return <School onChange={handleSchoolChange} allowClear />;
   };
 
   const columns = [
@@ -72,7 +79,6 @@ const VisitList = () => {
       title: '学号',
       dataIndex: 'studentId',
       align: 'center',
-     
     },
     {
       title: '姓名',
@@ -92,7 +98,6 @@ const VisitList = () => {
       },
     },
 
-   
     {
       title: '专业',
       dataIndex: 'specialtyId',
@@ -123,7 +128,7 @@ const VisitList = () => {
       hideInSearch: true,
       valueType: 'date',
     },
-    
+
     {
       title: '操作',
       dataIndex: 'action',
@@ -132,7 +137,6 @@ const VisitList = () => {
       render: (text, record) => (
         <Space size="middle">
           <a onClick={() => handleMedicalClick(record.serialNo)}>查看报告</a>
-         
         </Space>
       ),
     },

src/pages/Post/Edit/index.jsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
-import { connect } from 'umi';
-import { notification, Tabs } from 'antd';
+import { connect,history } from 'umi';
+import { notification, Tabs,Button } from 'antd';
 import { PageContainer } from '@ant-design/pro-layout';
 import Container from '@/components/Container';
 import request from '@/utils/request';
@@ -58,7 +58,14 @@ const PostEdit = (props) => {
   }, [props]);
 
   return (
-    <PageContainer>
+    <PageContainer
+    header={{
+      extra: [
+        <Button key="1" onClick={() => history.go('-1')}>
+          返回
+        </Button>,
+      ],
+    }}>
       <Container>
         <Tabs>
           <TabPane tab="科普信息" key="1">

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

@@ -3,7 +3,7 @@ import { connect, history } from 'umi';
 import { PageContainer } from '@ant-design/pro-layout';
 import Container from '@/components/Container';
 import request from '@/utils/request';
-import { notification, Tabs } from 'antd';
+import { notification, Tabs, Button } from 'antd';
 import SchoolFrom from './components/SchoolFrom';
 import Specialty from './Specialty';
 
@@ -61,7 +61,15 @@ const SchoolEdit = (props) => {
   };
 
   return (
-    <PageContainer>
+    <PageContainer
+      header={{
+        extra: [
+          <Button key="1" onClick={() => history.go('-1')}>
+            返回
+          </Button>,
+        ],
+      }}
+    >
       <Container>
         <Tabs>
           <TabPane tab="学校" key="1">

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

@@ -36,11 +36,6 @@ const BannerEdit = (props) => {
       }}
     >
       <Container loading={loading}>
-        {/* <div style={{ textAlign: 'right' }}>
-          {' '}
-          <Button onClick={() => history.go('-1')}>返回</Button>
-        </div> */}
-
         <Card bordered={false}>
           <div style={{ display: 'flex' }}>
             <div style={{ marginRight: 40 }}>

src/pages/System/Role/Edit.jsx

@@ -1,35 +1,36 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect } from 'react';
+import { history } from 'umi';
 import { PageContainer } from '@ant-design/pro-layout';
 import { Button, Card, notification } from 'antd';
 import request from '@/utils/request';
-import RoleForm from './components/Form'
-import RoleMenu from './components/Menu'
+import RoleForm from './components/Form';
+import RoleMenu from './components/Menu';
 
-export default  (props) => {
+export default (props) => {
   const { id } = props.location.query;
   const [loading, setLoading] = useState(false);
   const [saveLoading, setSaveLoading] = useState(false);
   const [role, setRole] = useState({});
   // 数据库授权菜单
-  const [roleMenu, setRoleMenu] = useState([])
+  const [roleMenu, setRoleMenu] = useState([]);
   // 待保存菜单
-  const [menuData, setMenuData] = useState([])
-  
+  const [menuData, setMenuData] = useState([]);
+
   const handleFormChange = (newRole) => {
     setRole(newRole);
   };
 
   const handleMenuChange = (menuList) => {
-    setMenuData(menuList)
-  }
+    setMenuData(menuList);
+  };
 
   const handleMenuSave = () => {
-    const data = menuData.map((m) => ({ roleId: id, menuId: m.menuId }))
-    setSaveLoading(true)
+    const data = menuData.map((m) => ({ roleId: id, menuId: m.menuId }));
+    setSaveLoading(true);
     request(`/role-menu/${id}`, { method: 'post', data })
       .then(() => {
-        setRoleMenu(data)
-        setMenuData([])
+        setRoleMenu(data);
+        setMenuData([]);
         setSaveLoading(false);
         notification.success({ message: '操作成功' });
       })
@@ -37,16 +38,16 @@ export default  (props) => {
         setSaveLoading(false);
         notification.error({ message: e.message });
       });
-  }
-  
+  };
+
   useEffect(() => {
     if (id) {
       setLoading(true);
       request(`/role/${id}`)
         .then((res) => {
           setRole(res);
-          setRoleMenu(res.menuList||[])
-          setMenuData([])
+          setRoleMenu(res.menuList || []);
+          setMenuData([]);
           setLoading(false);
         })
         .catch((e) => {
@@ -57,7 +58,15 @@ export default  (props) => {
   }, [id]);
 
   return (
-    <PageContainer>
+    <PageContainer
+      header={{
+        extra: [
+          <Button key="1" onClick={() => history.go('-1')}>
+            返回
+          </Button>,
+        ],
+      }}
+    >
       <Card style={{ width: '100%' }} loading={loading}>
         <RoleForm role={role} onChange={handleFormChange} />
       </Card>
@@ -65,10 +74,19 @@ export default  (props) => {
       <Card
         title="授权菜单"
         style={{ width: '100%', marginTop: '2em' }}
-        extra={<Button type="primary" disabled={!menuData.length} loading={saveLoading} onClick={handleMenuSave}>保存</Button>}
+        extra={
+          <Button
+            type="primary"
+            disabled={!menuData.length}
+            loading={saveLoading}
+            onClick={handleMenuSave}
+          >
+            保存
+          </Button>
+        }
       >
         <RoleMenu roleMenu={roleMenu} onChange={handleMenuChange} />
       </Card>
     </PageContainer>
-  )
-}
+  );
+};

src/pages/User/Edit/index.jsx

@@ -1,10 +1,11 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect } from 'react';
 import { PageContainer } from '@ant-design/pro-layout';
-import { notification, Tabs } from 'antd';
+import { notification, Tabs, Button } from 'antd';
 import Container from '@/components/Container';
 import request from '@/utils/request';
-import UserForm from './components/User'
-import UserRole from './components/Role'
+import UserForm from './components/User';
+import UserRole from './components/Role';
+import { history } from 'umi';
 
 const { TabPane } = Tabs;
 
@@ -17,8 +18,8 @@ export default (props) => {
     setUser({
       ...user,
       roleList,
-    })
-  }
+    });
+  };
 
   useEffect(() => {
     if (id) {
@@ -36,21 +37,29 @@ export default (props) => {
   }, [id]);
 
   return (
-    <PageContainer>
-    <Container>
-      <Tabs>
-        <TabPane tab="基本信息" key="1">
-          <Container loading={loading}>
-            <UserForm user={user} onChange={setUser} />
-          </Container>
-        </TabPane>
-        <TabPane tab="角色设置" key="2">
-          <Container>
-            <UserRole user={user} onSubmit={handleRoleSubmit} />
-          </Container>
-        </TabPane>
-      </Tabs>
-    </Container>
+    <PageContainer
+      header={{
+        extra: [
+          <Button key="1" onClick={() => history.go('-1')}>
+            返回
+          </Button>,
+        ],
+      }}
+    >
+      <Container>
+        <Tabs>
+          <TabPane tab="基本信息" key="1">
+            <Container loading={loading}>
+              <UserForm user={user} onChange={setUser} />
+            </Container>
+          </TabPane>
+          <TabPane tab="角色设置" key="2">
+            <Container>
+              <UserRole user={user} onSubmit={handleRoleSubmit} />
+            </Container>
+          </TabPane>
+        </Tabs>
+      </Container>
     </PageContainer>
-  )
-}
+  );
+};