1178232204@qq.com 3 年 前
コミット
232900b004

+ 2 - 1
src/api/index.js

@@ -1,7 +1,7 @@
 import api from './request';
 import {message} from 'antd'
 const axios=require('axios');
-//axios.defaults.baseURL = 'http://192.168.3.184:8871';//'http://192.168.2.237:8871/';
+// axios.defaults.baseURL = 'http://192.168.3.237:8871';//'http://192.168.2.237:8871/';
 const post=(url,data)=>{
     return axios({
         method:'post',
@@ -64,6 +64,7 @@ function interceptors(){
             localStorage.removeItem("token");
             localStorage.removeItem("systemId");
             localStorage.removeItem("hospitalId");
+            localStorage.removeItem("software")
             message.error("登录信息失效,请重新登录");
             window.location = '/';
         }else{

+ 1 - 0
src/components/AHeader/index.js

@@ -38,6 +38,7 @@ function AHeader({ history, hideName }) {
         localStorage.removeItem("token");
         localStorage.removeItem("systemId");
         localStorage.removeItem("hospitalId");
+        localStorage.removeItem("software")
         dispatch(panesNow([]));
         history.push('/login');
     }

+ 8 - 12
src/components/FuncManager/AddFunc.js

@@ -23,22 +23,17 @@ function AddUser(props) {
   const staticInfo = useSelector(state => {
     return state.staticInfo;
   });
+  console.log(type);
+  
   const { titleList } = staticInfo;
   const initialValues = detail
   //所属系统
   function getHospitalTree() {
-    xPost(api.getUserHospitals).then((res) => {
-      if (res.data.code === 200) {
-        const data = res.data.data.software
-        const treeFunc = organizationData(data)
-        setTreeFunc(treeFunc)
-      } else {
-        message.warning(res.data.msg || '获取医院列表失败');
-      }
-    })
+    const arr = JSON.parse(localStorage.getItem('software'))
+    const treeFunc = organizationData(arr)
+    setTreeFunc(treeFunc)
   }
   function organizationData(arr) {
-    
     arr.forEach(item => {
       item.value = item.id
       item.title = item.name
@@ -65,8 +60,8 @@ function AddUser(props) {
     const formData = form.getFieldValue()
     let params = values
     params.parentId = formData.parentId
-    params.permissions = params.permissions.split(',')
-    if (type == 2) {
+    params.permissions = formData.permissions?formData.permissions.split(','):''
+    if (type == 2 || type == 4) {
       params.id = id
       updateMenu(params)
     } else {
@@ -132,6 +127,7 @@ function AddUser(props) {
         <Form.Item
           name="parentName"
           label="上级菜单"
+          hidden={type == 2 || type == 1}
         >
           <Input disabled />
         </Form.Item>

+ 3 - 3
src/components/FuncManager/index.js

@@ -80,7 +80,7 @@ function OrgManager() {
     setAddVisible(type)
     setType(flag)
     setId(id)
-    if (flag == 2) {
+    if (flag == 2 || flag == 4) {
       getMenuById(id)
     } else if (flag == 1) {
       setFuncDetail({
@@ -108,7 +108,6 @@ function OrgManager() {
     } else if (modalType == 2) {
       enable(0, id);
     }
-
   }
   const messageBox = (type, id) => {
     setVisible(true)
@@ -171,7 +170,7 @@ function OrgManager() {
           );
           return (<Space size="middle">
             <a onClick={() => addSubFunc('新增子功能', true, 3, row.id, row.name)}>新增子功能</a>
-            <a onClick={() => showModal('修改功能', true, 2, row.id, row.softwareId)}>修改</a>
+            <a onClick={() => showModal('修改功能', true, row.parentId=='0'?2:4, row.id, row.softwareId)}>修改</a>
             <Dropdown overlay={menu} trigger={['click']}>
               <a className="ant-dropdown-link">
                 更多 <DownOutlined />
@@ -199,6 +198,7 @@ function OrgManager() {
   function userChange() {
     setAddVisible(false)
     setFuncDetail(null)
+    getMenusTree();
   }
   return (
     <div className='wrapper'>

+ 1 - 2
src/components/SysChoose/index.js

@@ -51,6 +51,7 @@ function SysChoose({history}) {
                 setSysName(software[0].name)
                 setSysId(software[0].id);
                 dispatch(setUser(userInfo));
+                localStorage.setItem('software', JSON.stringify(software));
                 //默认显示第一个系统的组织
                 setHisList(software[0]?software[0].hospitals:[]);
                 setTimeout(()=>{
@@ -66,8 +67,6 @@ function SysChoose({history}) {
     }
     //点击进入
     function getIn(id, type, sysid){
-        console.log(type);
-        
         dispatch(setSys({sysId,sysName,hisId:id}));
         localStorage.setItem('systemId', sysId || sysid);
         localStorage.setItem('hospitalId',id);