修复登陆界面错误提示

config/config.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:04:20
- * @LastEditTime: 2023-04-17 16:03:29
+ * @LastEditTime: 2023-05-25 16:49:32
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/config/config.ts
@@ -128,9 +128,6 @@ export default defineConfig({
               path: '/platform/setting/notificationTemplate',
               component: '@/pages/platform/setting/notificationTemplate/index.tsx',
             },
-
-
-
             {
               path: '/platform/setting/reports/0',
               component: '@/pages/platform/setting/reports/index.tsx',

config/proxy.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-07 10:00:52
- * @LastEditTime: 2023-04-27 10:25:47
+ * @LastEditTime: 2023-05-12 09:44:56
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/config/proxy.ts
@@ -39,6 +39,7 @@ const proxy: { [key: string]: any } = {
       target: 'http://localhost:8000',
       changeOrigin: true,
       pathRewrite: { '^': '' },
+      
     },
   },
 };

src/app.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { PageLoading } from '@ant-design/pro-layout';
 import { notification, Modal } from 'antd';
-import { RequestConfig, history, useModel } from 'umi';
+import { RequestConfig, history } from 'umi';
 import type { RequestOptionsInit } from 'umi-request';
 import { getHospSubSystemList, UserDataType } from '@/service/login';
 
@@ -10,8 +10,7 @@ import { logoutHandle } from './global';
 import { Platforms } from './constant';
 import { SpacicalPageParamsType } from './typings';
 
-import Report from '@/pages/platform/setting/reports';
-import Static from '@/pages/platform/setting/static';
+
 
 
 const loginPath = '/login';
@@ -24,7 +23,9 @@ if (history && history.location.query) {
     const localHospSign = localStorage.getItem('hospSign');
     hospSign = localHospSign ? localHospSign : '';
   }
-}
+} 
+
+
 
 /** 获取用户信息比较慢的时候会展示一个 loading */
 export const initialStateConfig = {
@@ -100,6 +101,7 @@ export async function getInitialState(): Promise<InitialStateType> {
 }
 
 const requestInterceptorsHandle = (url: string, options: RequestOptionsInit) => {
+   
   const userData = localStorage.getItem('userData');
   let authHeader = { token: '' };
 
@@ -120,6 +122,7 @@ const responseInterceptorsHandle = async (response: Response, options: RequestOp
 
 
   const _response: {
+    message: any;
     data?: any;
     status: number;
     success?: boolean;
@@ -140,8 +143,9 @@ const responseInterceptorsHandle = async (response: Response, options: RequestOp
       success: true,
     };
   } else {
+  
     notification.error({
-      message: `${_response.msg}`,
+      message: `${_response.msg?_response.msg:_response.message}`,
     });
     return false
   }
@@ -166,6 +170,7 @@ interface ResponseErr extends Error {
 const errorHandlerFunc = (error: ResponseErr) => {
 
   try {
+
     const { info } = error;
     const { errorCode, errorMessage } = info;
 
@@ -189,7 +194,9 @@ const errorHandlerFunc = (error: ResponseErr) => {
         message: ` ${errorCode}:出现错误！`,
         description: errorMessage,
       });
-    } else {
+    } else if(false){
+
+    }else{
       notification.error({
         message: ` ${errorCode}:${errorMessage}`,
       });
@@ -252,8 +259,8 @@ export const qiankun = fetch('/config').then(() => ({
     {
       name: 'budgetManaSystem', // 唯一 id
       //entry: '//localhost:8001',
-      entry: '//120.27.235.181:5000/perform/',  //开发
-      //entry: '//47.96.149.190:5000/perform/', //演示
+      //entry: '//120.27.235.181:5000/perform/',  //开发
+      entry: '//47.96.149.190:5000/perform/', //演示
     },
     {
       name: 'PFMBackC', // 唯一 id

src/pages/platform/setting/paramsMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-04-13 13:18:58
+ * @LastEditTime: 2023-05-12 09:41:18
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -32,7 +32,7 @@ export default function ParamsMana() {
 
 
 
-    const columns = [
+    const columns:ProColumns[] = [
         {
             title: '参数名称',
             dataIndex: 'name',
@@ -45,6 +45,8 @@ export default function ParamsMana() {
         {
             title: '参数值',
             dataIndex: 'value',
+            width:200,
+            ellipsis:true
         },
         {
             title: '院区',
@@ -322,7 +324,7 @@ export default function ParamsMana() {
                 </div>
             </div>
             <div style={{ marginTop: 16 }}>
-                <KCTable columns={columns as ProColumns[]} reload={reload} rowKey='id' newVer params={tableDataFilterParams} request={(params) => getTableData(params)} />
+                <KCTable columns={columns} reload={reload} rowKey='id' newVer params={tableDataFilterParams} request={(params) => getTableData(params)} />
             </div>
         </div>
     )

src/pages/platform/setting/roleManage/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-13 15:22:48
- * @LastEditTime: 2023-03-24 10:34:30
+ * @LastEditTime: 2023-05-25 18:36:55
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/hospManage/index.tsx
@@ -50,607 +50,615 @@ const SearchIcon = createFromIconfontCN({
   scriptUrl: '//at.alicdn.com/t/c/font_1927152_g1njmm1kh7b.js',
 });
 
-const RoleManage: FC<PageProps> = ({ roleManageModel: state, dispatch }) => {
-  const { reloadTable } = state;
-
-  const [tableDataFilterParams, set_tableDataFilterParams] = useState<any | undefined>();
-  const [tableDataSearchKeywords, set_tableDataSearchKeywords] = useState<string>('');
-  const [drawerVisible, set_drawerVisible] = useState(false);
-
-  const columns: ProColumns<TableListItem>[] = [
-    {
-      title: 'ID',
-      dataIndex: 'roleId',
-      hideInTable: true,
-    },
-    {
-      title: '院区名称',
-      dataIndex: 'hospName',
-    },
-    {
-      title: '角色名称',
-      dataIndex: 'roleName',
-      hideInSearch: false,
-    },
-    {
-      title: '备注',
-      dataIndex: 'remark',
-    },
-    {
-      title: '变更人',
-      dataIndex: 'hospAbbreviation',
-    },
-    {
-      title: '有数账号',
-      dataIndex: 'account',
-    },
-    {
-      title: '变更日期',
-      dataIndex: 'modifyTime',
-    },
-    {
-      title: '操作',
-      width: 240,
-      key: 'option',
-      valueType: 'option',
-      render: (text, record) => [
-        <a key="link4" onClick={() => editUserBind(record)}>
-          用户
-        </a>,
-        <Divider key="3" type="vertical" style={{ margin: '0 1px' }} />,
-        <a key="link" onClick={() => editHandle(record)}>
-          编辑
-        </a>,
-        <Divider key="1" type="vertical" style={{ margin: '0 1px' }} />,
-        <Popconfirm
-          title="是否确定删除?"
-          onConfirm={() => delHandle(record)}
-          // onCancel={cancel}
-          okText="确定"
-          cancelText="取消"
-          key="link2"
-        >
-          <a>删除</a>
-        </Popconfirm>,
-         <Divider key="9" type="vertical" style={{ margin: '0 1px' }} />,
-        <Dropdown key='4' menu={{
-          items: [
-            { key:'0',label: <a key="link3" onClick={() => editMenuBind(record)}>菜单</a>},
-            { key: '5', label: <DrawerActBtn key="link7" record={record} /> },
-            { key: '2', label: <a key="link4" onClick={() => initRoleData('func',record)} >初始化功能</a> },
-            { key: '6', label: <a key="link6" onClick={() => initRoleData('read',record)}>初始化只读</a> },
-          ]
-        }}>
-          <a>
-            更多 <DownOutlined />
-          </a>
-        </Dropdown>
-      ],
-    },
 
-  ];
 
-  const DrawerActBtn = ({ record }: { record: any }) => {
+const DrawerActBtn = ({ record }: { record: any }) => {
 
     
-    const [treeData, set_treeData] = useState<getTreeDataRespType[]>([]);
-    const [currentSelectedTreeNode, set_currentSelectedTreeNode] = useState<any | undefined>(undefined);
-    const [drawerTablereload, set_drawerTablereload] = useState(false);
-    const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
-    const [searchValue, setSearchValue] = useState('');
-    const [autoExpandParent, setAutoExpandParent] = useState(true);
-    const [drawerTableDataFilterParams, set_drawerTableDataFilterParams] = useState<any | undefined>();
-
-    const [checkBoxCodes, set_checkBoxCodes] = useState<any[]>([]);
+  const [treeData, set_treeData] = useState<getTreeDataRespType[]>([]);
+  const [currentSelectedTreeNode, set_currentSelectedTreeNode] = useState<any | undefined>(undefined);
+  const [drawerTablereload, set_drawerTablereload] = useState(false);
+  const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
+  const [searchValue, setSearchValue] = useState('');
+  const [autoExpandParent, setAutoExpandParent] = useState(true);
+  const [drawerTableDataFilterParams, set_drawerTableDataFilterParams] = useState<any | undefined>();
 
-    const [drawerTableDataSearchKeywords, set_drawerTableDataSearchKeywords] = useState<string>('');
+  const [checkBoxCodes, set_checkBoxCodes] = useState<any[]>([]);
 
-    const [checkedTableMenuIds, set_checkedTableMenuIds] = useState<any[]>([]);
+  const [drawerTableDataSearchKeywords, set_drawerTableDataSearchKeywords] = useState<string>('');
 
-    const [oldSelectedMenuIds,set_oldSelectedMenuIds] = useState<any[]>([]);
+  const [checkedTableMenuIds, set_checkedTableMenuIds] = useState<any[]>([]);
 
-    const columnsData: ProColumns<TableListItem>[] = [
-      {
-        title: '名称',
-        dataIndex: 'name',
-        width: 300,
-        ellipsis: true
-      },
-      {
-        title: '类型',
-        width: 50,
-        dataIndex: 'contentType',
-        key: 'contentType',
-        render: (_: any, record: any) => {
-          //console.log({ record });
-          switch (record.type) {
-            case 0:
-              return '目录'
-            case 1:
-              return '菜单'
-            case 2:
-              return 'api'
-            case 3:
-              return '系统'
-            case 4:
-              return '有数bi'
-            case 5:
-              return '体系'
-            case 6:
-              return '中心层'
-            case 7:
-              return '平台层'
-            default:
-              break;
-          }
-        },
-      },
-      {
-        title: '功能',
-        dataIndex: 'deptName',
-        key: 'deptName',
-        render: (_: any, record: any) => {
+  const [oldSelectedMenuIds,set_oldSelectedMenuIds] = useState<any[]>([]);
 
-          if (record.functionList) {
-            const options = record.functionList.map((item: any, index: number) => ({ label: item.name, value: item.code }))
+  const [drawerVisible, set_drawerVisible] = useState(false);
 
-            const needItem = checkBoxCodes.filter(a => a.menuId == record.menuId);
+  const columnsData: ProColumns<TableListItem>[] = [
+    {
+      title: '名称',
+      dataIndex: 'name',
+      width: 300,
+      ellipsis: true
+    },
+    {
+      title: '类型',
+      width: 50,
+      dataIndex: 'contentType',
+      key: 'contentType',
+      render: (_: any, record: any) => {
+        //console.log({ record });
+        switch (record.type) {
+          case 0:
+            return '目录'
+          case 1:
+            return '菜单'
+          case 2:
+            return 'api'
+          case 3:
+            return '系统'
+          case 4:
+            return '有数bi'
+          case 5:
+            return '体系'
+          case 6:
+            return '中心层'
+          case 7:
+            return '平台层'
+          default:
+            break;
+        }
+      },
+    },
+    {
+      title: '功能',
+      dataIndex: 'deptName',
+      key: 'deptName',
+      render: (_: any, record: any) => {
 
-            const codes = needItem && needItem.length > 0 ? needItem[0].function.map((a: any) => a.code) : [];
+        if (record.functionList) {
+          const options = record.functionList.map((item: any, index: number) => ({ label: item.name, value: item.code }))
 
-            const onCheckGroupChange = (checkedValue: CheckboxValueType[]) => {
+          const needItem = checkBoxCodes.filter(a => a.menuId == record.menuId);
 
-              if (checkedValue.length > 0) {
-                const _temp = checkBoxCodes;
-                const index = checkBoxCodes.findIndex((item) => item.menuId == record.menuId);
+          const codes = needItem && needItem.length > 0 ? needItem[0].function.map((a: any) => a.code) : [];
 
+          const onCheckGroupChange = (checkedValue: CheckboxValueType[]) => {
 
-                const needed = options.filter((item: any) => checkedValue.includes(item.value));
-                const transfered = needed.map((item: any) => ({ name: item.label, code: item.value }));
+            if (checkedValue.length > 0) {
+              const _temp = checkBoxCodes;
+              const index = checkBoxCodes.findIndex((item) => item.menuId == record.menuId);
 
-                if (index >= 0) {
-                  //先去除旧的的对象
-                  _temp.splice(index, 1);
-                }
 
-                _temp.push({
-                  menuId: record.menuId,
-                  function: transfered
-                });
+              const needed = options.filter((item: any) => checkedValue.includes(item.value));
+              const transfered = needed.map((item: any) => ({ name: item.label, code: item.value }));
 
-                const menuIdsArr = _temp.map((item: any) => item.menuId);
+              if (index >= 0) {
+                //先去除旧的的对象
+                _temp.splice(index, 1);
+              }
 
-                set_checkedTableMenuIds([...menuIdsArr])
+              _temp.push({
+                menuId: record.menuId,
+                function: transfered
+              });
 
-                set_checkBoxCodes([..._temp]);
-              } else {
-                //取消选择
-                const _temp = checkBoxCodes;
-                const index = checkBoxCodes.findIndex((item) => item.menuId == record.menuId);
+              const menuIdsArr = _temp.map((item: any) => item.menuId);
 
-                _temp.splice(index, 1);
+              set_checkedTableMenuIds([...menuIdsArr])
 
-                const menuIdsArr = _temp.map((item: any) => item.menuId);
-                set_checkedTableMenuIds([...menuIdsArr])
-                set_checkBoxCodes([..._temp]);
+              set_checkBoxCodes([..._temp]);
+            } else {
+              //取消选择
+              const _temp = checkBoxCodes;
+              const index = checkBoxCodes.findIndex((item) => item.menuId == record.menuId);
 
-              }
+              _temp.splice(index, 1);
 
+              const menuIdsArr = _temp.map((item: any) => item.menuId);
+              set_checkedTableMenuIds([...menuIdsArr])
+              set_checkBoxCodes([..._temp]);
 
             }
 
-            return (
-              <Checkbox.Group
-                options={options}
-                value={codes}
-                onChange={(checkedValue: CheckboxValueType[]) => onCheckGroupChange(checkedValue)}
-              />
-            )
+
           }
-          return '-'
+
+          return (
+            <Checkbox.Group
+              options={options}
+              value={codes}
+              onChange={(checkedValue: CheckboxValueType[]) => onCheckGroupChange(checkedValue)}
+            />
+          )
         }
+        return '-'
+      }
 
-      },
-    ];
+    },
+  ];
 
-    const getTreeReqFunc = async (hospId: string) => {
-      const resp = await getHospOwnSys(hospId);
-      set_treeData(resp);
-    }
+  const getTreeReqFunc = async (hospId: string) => {
+    const resp = await getHospOwnSys(hospId);
+    set_treeData(resp);
+  }
 
-    const onSelect: TreeProps['onSelect'] = (selectedKeys, info) => {
-      //console.log('selected', selectedKeys, info);
-      const { node } = info;
-      set_currentSelectedTreeNode(node);
-    };
+  const onSelect: TreeProps['onSelect'] = (selectedKeys, info) => {
+    //console.log('selected', selectedKeys, info);
+    const { node } = info;
+    set_currentSelectedTreeNode(node);
+  };
 
-    const dataList: any[] = [];
-
-    const getParentKey = (key: React.Key, tree: any[]): React.Key => {
-      let parentKey: React.Key;
-      for (let i = 0; i < tree.length; i++) {
-        const node = tree[i];
-        if (node.children) {
-          if (node.children.some((item: { code: React.Key; }) => item.code === key)) {
-            parentKey = node.code;
-          } else if (getParentKey(key, node.children)) {
-            parentKey = getParentKey(key, node.children);
-          }
+  const dataList: any[] = [];
+
+  const getParentKey = (key: React.Key, tree: any[]): React.Key => {
+    let parentKey: React.Key;
+    for (let i = 0; i < tree.length; i++) {
+      const node = tree[i];
+      if (node.children) {
+        if (node.children.some((item: { code: React.Key; }) => item.code === key)) {
+          parentKey = node.code;
+        } else if (getParentKey(key, node.children)) {
+          parentKey = getParentKey(key, node.children);
         }
       }
-      return parentKey!;
-    };
+    }
+    return parentKey!;
+  };
 
 
-    const onTreeSearchKeyChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const onTreeSearchKeyChange = (e: React.ChangeEvent<HTMLInputElement>) => {
 
-      const { value } = e.target;
-      const newExpandedKeys = dataList
-        .map((item) => {
-          if (item.name.indexOf(value) > -1) {
-            return getParentKey(item.code, treeData);
-          }
-          return null;
-        });
+    const { value } = e.target;
+    const newExpandedKeys = dataList
+      .map((item) => {
+        if (item.name.indexOf(value) > -1) {
+          return getParentKey(item.code, treeData);
+        }
+        return null;
+      });
 
-      const b = newExpandedKeys.filter((item, i, self) => item && self.indexOf(item) === i);
+    const b = newExpandedKeys.filter((item, i, self) => item && self.indexOf(item) === i);
 
-      setExpandedKeys(newExpandedKeys as React.Key[]);
-      setSearchValue(value);
-      setAutoExpandParent(true);
-    }
+    setExpandedKeys(newExpandedKeys as React.Key[]);
+    setSearchValue(value);
+    setAutoExpandParent(true);
+  }
 
 
-    const onExpand = (newExpandedKeys: React.Key[]) => {
-      setExpandedKeys(newExpandedKeys);
-      setAutoExpandParent(false);
-    };
+  const onExpand = (newExpandedKeys: React.Key[]) => {
+    setExpandedKeys(newExpandedKeys);
+    setAutoExpandParent(false);
+  };
 
-    const generateList = (data: getTreeDataRespType[]) => {
-      for (let i = 0; i < data.length; i++) {
-        const node = data[i];
-        const { code, name } = node;
-        dataList.push({ code, name: name });
-        if (node.children) {
-          generateList(node.children);
-        }
+  const generateList = (data: getTreeDataRespType[]) => {
+    for (let i = 0; i < data.length; i++) {
+      const node = data[i];
+      const { code, name } = node;
+      dataList.push({ code, name: name });
+      if (node.children) {
+        generateList(node.children);
       }
-    };
-    generateList(treeData as any);
-
-
-    const getTableData = async (params: any, sort: any, filter: any) => {
-       
-      set_drawerTablereload(false);
-      if (currentSelectedTreeNode&&record.hospId&&record.roleId) {
-        // console.log({params,record});
-        const resp = await getRolePermRelaMenu({ ...params, hospId: record.hospId,roleId:record.roleId});
-        if (resp) {
-          let temp: { menuId: any; function: any; }[] = [];
-          const setTreeRecursion = (data: any) => {
-            data.map((item: any, index: number) => {
-
-
-              if (item.type == 1 && item.functionCheckList) {
-                //菜单
-                temp.push({
-                  menuId: item.menuId,
-                  function: item.functionCheckList
-                });
-              }
+    }
+  };
+  generateList(treeData as any);
 
-              if (item.children && item.children.length != 0) {
-                setTreeRecursion(item.children);
-              }
 
-            });
-          }
+  const getTableData = async (params: any, sort: any, filter: any) => {
+    //console.log({record});
+    set_drawerTablereload(false);
+    if (currentSelectedTreeNode&&record.hospId&&record.roleId) {
+      // console.log({params,record});
+      const resp = await getRolePermRelaMenu({ ...params, hospId: record.hospId,roleId:record.roleId});
+      if (resp) {
+        let temp: { menuId: any; function: any; }[] = [];
+        const setTreeRecursion = (data: any) => {
+          data.map((item: any, index: number) => {
 
-          setTreeRecursion(resp);
 
-          set_checkBoxCodes(temp);
-      
-          set_checkedTableMenuIds(temp.map((a: any) => a.menuId));
-          set_oldSelectedMenuIds(temp.map((a: any) => a.menuId));
+            if (item.type == 1 && item.functionCheckList) {
+              //菜单
+              temp.push({
+                menuId: item.menuId,
+                function: item.functionCheckList
+              });
+            }
 
-          return {
-            data: resp,
-            success: true,
-          }
+            if (item.children && item.children.length != 0) {
+              setTreeRecursion(item.children);
+            }
+
+          });
         }
+
+        setTreeRecursion(resp);
+
+        set_checkBoxCodes(temp);
+    
+        set_checkedTableMenuIds(temp.map((a: any) => a.menuId));
+        set_oldSelectedMenuIds(temp.map((a: any) => a.menuId));
+
         return {
-          data: [],
-          success: true
+          data: resp,
+          success: true,
         }
       }
-      return []
-      
+      return {
+        data: [],
+        success: true
+      }
     }
+    return []
+    
+  }
 
-    const saveResult = async () => {
+  const saveResult = async () => {
 
-      let old = oldSelectedMenuIds;
-      //const needCancelMenus = needCancelCheckedMenus.map(a=>({hospId: record.id ,systemId: currentSelectedTreeNode.code,function:[],menuId:a}));
-      const result = checkBoxCodes.map((item: any) => {
-              old.splice(old.findIndex(a=>a == item.menuId),1);
-              return { ...item, hospId: record.hospId,roleId:record.roleId,systemId: currentSelectedTreeNode.code }
-      });
+    let old = oldSelectedMenuIds;
+    //const needCancelMenus = needCancelCheckedMenus.map(a=>({hospId: record.id ,systemId: currentSelectedTreeNode.code,function:[],menuId:a}));
+    const result = checkBoxCodes.map((item: any) => {
+            old.splice(old.findIndex(a=>a == item.menuId),1);
+            return { ...item, hospId: record.hospId,roleId:record.roleId,systemId: currentSelectedTreeNode.code }
+    });
 
 
-      const needCancelMenus = old.map(a => ({ 
-        hospId: record.hospId, 
-        systemId: currentSelectedTreeNode.code,
-        menuId:a,
-        roleId:record.roleId, function: [], 
-      }));
-     
-      const data = [...result, ...needCancelMenus];
-      
-  
-      const resp = await saveRoleRelaApiPerm(result.length == 0?[{hospId: record.hospId,roleId:record.roleId,systemId: currentSelectedTreeNode.code}]:data);
-      if (resp) {
-        set_drawerTablereload(true);
-        set_checkBoxCodes([]);
-        set_checkedTableMenuIds([]);
-      }
+    const needCancelMenus = old.map(a => ({ 
+      hospId: record.hospId, 
+      systemId: currentSelectedTreeNode.code,
+      menuId:a,
+      roleId:record.roleId, function: [], 
+    }));
+   
+    const data = [...result, ...needCancelMenus];
+    
 
+    const resp = await saveRoleRelaApiPerm(result.length == 0?[{hospId: record.hospId,roleId:record.roleId,systemId: currentSelectedTreeNode.code}]:data);
+    if (resp) {
+      set_drawerTablereload(true);
+      set_checkBoxCodes([]);
+      set_checkedTableMenuIds([]);
     }
 
-    const onCancel = () => {
-      set_drawerVisible(false);
-    }
+  }
 
-    const drawerTableDataSearchHandle = (paramName: string) => {
+  const onCancel = () => {
+    set_drawerVisible(false);
+  }
 
+  const drawerTableDataSearchHandle = (paramName: string) => {
 
-      set_drawerTableDataFilterParams({
-        ...drawerTableDataFilterParams,
-        [`${paramName}`]: drawerTableDataSearchKeywords
-      })
-    }
 
+    set_drawerTableDataFilterParams({
+      ...drawerTableDataFilterParams,
+      [`${paramName}`]: drawerTableDataSearchKeywords
+    })
+  }
 
-    const oneKeySetReadOnly = (bool:boolean)=>{
-       
-        if(bool){
-          const _temp = checkBoxCodes.map((item:any)=>{
-                const needed = item.function.filter((a:any)=>a.code == 'search');
-                return {...item,function:needed}
-          })
-          set_checkBoxCodes([..._temp]);
-        }
 
-    }
+  const oneKeySetReadOnly = (bool:boolean)=>{
+     
+      if(bool){
+        const _temp = checkBoxCodes.map((item:any)=>{
+              const needed = item.function.filter((a:any)=>a.code == 'search');
+              return {...item,function:needed}
+        })
+        set_checkBoxCodes([..._temp]);
+      }
 
+  }
 
-    useEffect(() => {
-      if (currentSelectedTreeNode) {
-        set_drawerTableDataFilterParams({ ...drawerTableDataFilterParams, systemId: currentSelectedTreeNode.code })
-      }
 
-      //切换系统清空数据
-      set_checkBoxCodes([]);
-      set_checkedTableMenuIds([]);
+  useEffect(() => {
+    if (currentSelectedTreeNode) {
+      set_drawerTableDataFilterParams({ ...drawerTableDataFilterParams, systemId: currentSelectedTreeNode.code })
+    }
 
+    //切换系统清空数据
+    set_checkBoxCodes([]);
+    set_checkedTableMenuIds([]);
 
-    }, [currentSelectedTreeNode]);
 
-    useEffect(() => {
-      //初始化左侧树结构数据后
+  }, [currentSelectedTreeNode]);
 
-      if (treeData?.length > 0) {
+  useEffect(() => {
+    //初始化左侧树结构数据后
 
-        if (treeData[0].children && treeData[0].children.length > 0) {
-          const [node, nodeParent] = getDeepestTreeData(treeData[0], 'children');
+    if (treeData?.length > 0) {
 
-          set_currentSelectedTreeNode(node);
-          setExpandedKeys([nodeParent.code]);
-        }
+      if (treeData[0].children && treeData[0].children.length > 0) {
+        const [node, nodeParent] = getDeepestTreeData(treeData[0], 'children');
+
+        set_currentSelectedTreeNode(node);
+        setExpandedKeys([nodeParent.code]);
       }
-    }, [treeData]);
+    }
+  }, [treeData]);
 
 
 
-    useEffect(() => {
-      getTreeReqFunc(record.hospId);
+  useEffect(() => {
+    getTreeReqFunc(record.hospId);
 
-    }, []);
+  }, []);
 
 
-    return (
-      <DrawerForm
-        trigger={
-          <a key="link3" onClick={(e) => { set_drawerVisible(true); }}>功能</a>
-        }
-        width={908}
-        // visible={drawerVisible}
-        drawerProps={{
-          open: drawerVisible,
-          closable: false,
-          destroyOnClose: true,
-          extra: <div>anniu</div>,
-        }}
-        submitter={false}
-      >
-        <div className='setApiPermDrawer'>
-          <div className='topbar'>
-            <div className='title'>{`院区功能权限设置（${record.hospName}）`}</div>
-            <div className='btnGroup'>
-              <span className='cancel' onClick={() => onCancel()}>取消</span>
-              <span className='save' onClick={() => saveResult()}>保存</span>
-            </div>
+  return (
+    <DrawerForm
+      trigger={
+        <a key="link3" onClick={()=>set_drawerVisible(true)}>功能</a>
+      }
+      drawerProps={{
+          open:drawerVisible,
+          afterOpenChange(open) {
+              set_drawerVisible(open)
+          },
+          closable:false,
+          extra:null
+      }}
+
+      width={908}
+      submitter={false}
+    >
+      <div className='setApiPermDrawer'>
+        <div className='topbar'>
+          <div className='title'>{`角色功能权限设置（${record.roleName}）`}</div>
+          <div className='btnGroup'>
+            <span className='cancel' onClick={() => onCancel()}>取消</span>
+            <span className='save' onClick={() => saveResult()}>保存</span>
           </div>
-          <div className='content'>
-            <div className='leftTree'>
-              <div className='search'>
-                <Input
-                  className='searchInput'
-                  placeholder="请输入"
-                  size='small'
-                  allowClear
-
-                  style={{ marginBottom: 16 }}
-                  onChange={onTreeSearchKeyChange}
-                  suffix={
-                    <SearchIcon type='iconsousuo' />
+        </div>
+        <div className='content'>
+          <div className='leftTree'>
+            <div className='search'>
+              <Input
+                className='searchInput'
+                placeholder="请输入"
+                size='small'
+                allowClear
+
+                style={{ marginBottom: 16 }}
+                onChange={onTreeSearchKeyChange}
+                suffix={
+                  <SearchIcon type='iconsousuo' />
+                }
+              />
+            </div>
+            {
+              treeData && treeData.length > 0 && (
+                <DirectoryTree
+                  fieldNames={{ title: 'name', key: 'code' }}
+                  rootStyle={{ height: '100%', paddingBottom: 50, overflowY: 'scroll', overflowX: 'hidden' }}
+                  onSelect={onSelect}
+                  onExpand={onExpand}
+                  expandedKeys={expandedKeys}
+                  autoExpandParent={autoExpandParent}
+                  selectedKeys={currentSelectedTreeNode ? [currentSelectedTreeNode.code] : []}
+                  blockNode={true}
+                  icon={() => null}
+                  titleRender={
+                    (nodeData: any) => {
+
+                      const strTitle = nodeData.name as string;
+                      const index = strTitle.indexOf(searchValue);
+                      const beforeStr = strTitle.substring(0, index);
+                      const afterStr = strTitle.slice(index + searchValue.length);
+                      const title =
+                        index > -1 ? (
+                          <span>
+                            {beforeStr}
+                            <span className="site-tree-search-value" style={{ color: 'red', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{searchValue}</span>
+                            {afterStr}
+                          </span>
+                        ) : (
+                          <span className='strTitle'>{strTitle}</span>
+                        );
+                      return <div style={{
+                        display: 'flex', flexDirection: 'row',
+                        width: '100%',
+                        justifyContent: 'flex-start', alignItems: 'center', height: 32,
+                        borderRadius: '4px',
+                        overflow: 'hidden',
+                        color: '#17181A',
+                        textOverflow: 'ellipsis',
+                        whiteSpace: 'nowrap'
+
+                      }}>{title}</div>
+                    }
                   }
+                  defaultSelectedKeys={[treeData[0].children[0].code]}
+                  treeData={treeData as unknown as DataNode[]}
+                  switcherIcon={(props: any) => {
+                    const { expanded } = props;
+                    //return <button className='site-table-row-expand-icon site-table-row-expand-icon-expanded'></button>
+                    return !expanded ? <img style={{ width: 20, height: 20, position: 'relative', top: 5 }} src={expandedIcon} /> : <img style={{ width: 20, height: 20, position: 'relative', top: 5 }} src={closeIcon} />
+                  }}
                 />
-              </div>
-              {
-                treeData && treeData.length > 0 && (
-                  <DirectoryTree
-                    fieldNames={{ title: 'name', key: 'code' }}
-                    rootStyle={{ height: '100%', paddingBottom: 50, overflowY: 'scroll', overflowX: 'hidden' }}
-                    onSelect={onSelect}
-                    onExpand={onExpand}
-                    expandedKeys={expandedKeys}
-                    autoExpandParent={autoExpandParent}
-                    selectedKeys={currentSelectedTreeNode ? [currentSelectedTreeNode.code] : []}
-                    blockNode={true}
-                    icon={() => null}
-                    titleRender={
-                      (nodeData: any) => {
-
-                        const strTitle = nodeData.name as string;
-                        const index = strTitle.indexOf(searchValue);
-                        const beforeStr = strTitle.substring(0, index);
-                        const afterStr = strTitle.slice(index + searchValue.length);
-                        const title =
-                          index > -1 ? (
-                            <span>
-                              {beforeStr}
-                              <span className="site-tree-search-value" style={{ color: 'red', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{searchValue}</span>
-                              {afterStr}
-                            </span>
-                          ) : (
-                            <span className='strTitle'>{strTitle}</span>
-                          );
-                        return <div style={{
-                          display: 'flex', flexDirection: 'row',
-                          width: '100%',
-                          justifyContent: 'flex-start', alignItems: 'center', height: 32,
-                          borderRadius: '4px',
-                          overflow: 'hidden',
-                          color: '#17181A',
-                          textOverflow: 'ellipsis',
-                          whiteSpace: 'nowrap'
-
-                        }}>{title}</div>
+              )
+            }
+          </div>
+          {/* <div style={{width:16,height:'92vh',background:'#F5F7FA'}}></div> */}
+          <div className='rightContent'>
+            <div className='tableToolbar'>
+              <div className='filter'>
+                <div className='filterItem'>
+                  <span className='label'>检索：</span>
+                  <KCInput placeholder={'请输入'} style={{ width: 160 }} search allowClear
+                    onChange={(e) => {
+                      set_drawerTableDataSearchKeywords(e.target.value);
+                      if (e.target.value.length == 0) {
+                        set_drawerTableDataFilterParams({
+                          ...drawerTableDataFilterParams,
+                          name: ''
+                        });
                       }
-                    }
-                    defaultSelectedKeys={[treeData[0].children[0].code]}
-                    treeData={treeData as unknown as DataNode[]}
-                    switcherIcon={(props: any) => {
-                      const { expanded } = props;
-                      //return <button className='site-table-row-expand-icon site-table-row-expand-icon-expanded'></button>
-                      return !expanded ? <img style={{ width: 20, height: 20, position: 'relative', top: 5 }} src={expandedIcon} /> : <img style={{ width: 20, height: 20, position: 'relative', top: 5 }} src={closeIcon} />
                     }}
-                  />
-                )
-              }
-            </div>
-            {/* <div style={{width:16,height:'92vh',background:'#F5F7FA'}}></div> */}
-            <div className='rightContent'>
-              <div className='tableToolbar'>
-                <div className='filter'>
-                  <div className='filterItem'>
-                    <span className='label'>检索：</span>
-                    <KCInput placeholder={'请输入'} style={{ width: 160 }} search allowClear
-                      onChange={(e) => {
-                        set_drawerTableDataSearchKeywords(e.target.value);
-                        if (e.target.value.length == 0) {
-                          set_drawerTableDataFilterParams({
-                            ...drawerTableDataFilterParams,
-                            name: ''
-                          });
-                        }
-                      }}
-                      onSearch={() => drawerTableDataSearchHandle('name')}
-
-                    />
-                  </div>
-                </div>
+                    onSearch={() => drawerTableDataSearchHandle('name')}
 
-                <div className={'btnGroup'}>
-                     {/* <a style={{color: '#17181A'}}><Switch style={{position:'relative',marginRight:4}} size='small'  onChange={(bool)=>oneKeySetReadOnly(bool)} />只读</a> */}
-                  {/* <UpDataActBtn key={'act'} record={undefined} type='ADD' /> */}
+                  />
                 </div>
+              </div>
 
+              <div className={'btnGroup'}>
+                   {/* <a style={{color: '#17181A'}}><Switch style={{position:'relative',marginRight:4}} size='small'  onChange={(bool)=>oneKeySetReadOnly(bool)} />只读</a> */}
+                {/* <UpDataActBtn key={'act'} record={undefined} type='ADD' /> */}
               </div>
-              {currentSelectedTreeNode && <KCTable
-                rowSelection={{
-                  // 自定义选择项参考: https://ant.design/components/table-cn/#components-table-demo-row-selection-custom
-                  // 注释该行则默认不显示下拉选项
-                  checkStrictly: false,
-                  onChange(selectedRowKeys, selectedRows, info) {
-                    // console.log({selectedRowKeys, selectedRows, info});
-                    if (selectedRowKeys.length == 0) {
-                      set_checkedTableMenuIds([]);
-                    }
-                    if (selectedRows.length == 0) {
-                      set_checkBoxCodes([]);
-                    }
-                  },
-                  selectedRowKeys: checkedTableMenuIds,
-                  selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT],
-                  onSelect: (record, selected, selectedRows, nativeEvent) => {
-                    //console.log({ record, selected, selectedRows, nativeEvent });
-
-                    let checkedData = checkBoxCodes;
-
-                    if (selected) {
-                      //选中
-                      selectedRows.forEach(a => {
-                        if (a.functionList) {
-                          checkedData.push({
-                            menuId: a.menuId,
-                            function: a.functionList
-                          });
-                        
-                        }
-                        
-                      });
-                      //更新表格row选中状态
-                      if (record.type == 0) {
-                        //选中的是目录
-                        const ids = record.children.map((item: any) => item.menuId);
-                        const totalData = Array.from(new Set([...checkedTableMenuIds, ...ids]));
-                    
-                        set_checkedTableMenuIds([...totalData]);
-                      }
-                      if (record.type == 1) {
-                        //菜单
-                        set_checkedTableMenuIds([...checkedTableMenuIds, record.menuId]);
 
+            </div>
+            {currentSelectedTreeNode && <KCTable
+              rowSelection={{
+                // 自定义选择项参考: https://ant.design/components/table-cn/#components-table-demo-row-selection-custom
+                // 注释该行则默认不显示下拉选项
+                checkStrictly: false,
+                onChange(selectedRowKeys, selectedRows, info) {
+                  // console.log({selectedRowKeys, selectedRows, info});
+                  if (selectedRowKeys.length == 0) {
+                    set_checkedTableMenuIds([]);
+                  }
+                  if (selectedRows.length == 0) {
+                    set_checkBoxCodes([]);
+                  }
+                },
+                selectedRowKeys: checkedTableMenuIds,
+                selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT],
+                onSelect: (record, selected, selectedRows, nativeEvent) => {
+                  //console.log({ record, selected, selectedRows, nativeEvent });
+
+                  let checkedData = checkBoxCodes;
+
+                  if (selected) {
+                    //选中
+                    selectedRows.forEach(a => {
+                      if (a.functionList) {
+                        checkedData.push({
+                          menuId: a.menuId,
+                          function: a.functionList
+                        });
+                      
                       }
+                      
+                    });
+                    //更新表格row选中状态
+                    if (record.type == 0) {
+                      //选中的是目录
+                      const ids = record.children.map((item: any) => item.menuId);
+                      const totalData = Array.from(new Set([...checkedTableMenuIds, ...ids]));
+                  
+                      set_checkedTableMenuIds([...totalData]);
+                    }
+                    if (record.type == 1) {
+                      //菜单
+                      set_checkedTableMenuIds([...checkedTableMenuIds, record.menuId]);
+
+                    }
 
-                      set_checkBoxCodes([...checkedData]);
+                    set_checkBoxCodes([...checkedData]);
 
-                    } else {
+                  } else {
 
-                      //取消勾选\
-                      let _tempCheckedCodes = checkBoxCodes;
-            
-                      const leftCheckedMenuIds = selectedRows.map(a=>a.menuId);
+                    //取消勾选\
+                    let _tempCheckedCodes = checkBoxCodes;
+          
+                    const leftCheckedMenuIds = selectedRows.map(a=>a.menuId);
 
-                      const filtedCheckCodes = _tempCheckedCodes.filter(a=>(leftCheckedMenuIds.includes(a.menuId)));
+                    const filtedCheckCodes = _tempCheckedCodes.filter(a=>(leftCheckedMenuIds.includes(a.menuId)));
 
-                      set_checkedTableMenuIds([...leftCheckedMenuIds]);
-                
-                      set_checkBoxCodes([...uniqueFunc(filtedCheckCodes,'menuId')]);
+                    set_checkedTableMenuIds([...leftCheckedMenuIds]);
+              
+                    set_checkBoxCodes([...uniqueFunc(filtedCheckCodes,'menuId')]);
 
-                    }
                   }
-                }}
-                pagination={false} reload={drawerTablereload} newVer params={drawerTableDataFilterParams} rowKey='menuId' columns={columnsData as ProColumns[]} request={(params: any, sort: any, filter: any) => getTableData(params, sort, filter)} />}
+                }
+              }}
+              pagination={false} reload={drawerTablereload} newVer params={drawerTableDataFilterParams} rowKey='menuId' columns={columnsData as ProColumns[]} request={(params: any, sort: any, filter: any) => getTableData(params, sort, filter)} />}
 
-            </div>
           </div>
         </div>
+      </div>
 
-      </DrawerForm>
-    )
-  }
+    </DrawerForm>
+  )
+}
+
+const RoleManage: FC<PageProps> = ({ roleManageModel: state, dispatch }) => {
+  const { reloadTable } = state;
+
+  const [tableDataFilterParams, set_tableDataFilterParams] = useState<any | undefined>();
+  const [tableDataSearchKeywords, set_tableDataSearchKeywords] = useState<string>('');
+  const [drawerVisible, set_drawerVisible] = useState(false);
+
+  const columns: ProColumns<TableListItem>[] = [
+    {
+      title: 'ID',
+      dataIndex: 'roleId',
+      hideInTable: true,
+    },
+    {
+      title: '院区名称',
+      dataIndex: 'hospName',
+    },
+    {
+      title: '角色名称',
+      dataIndex: 'roleName',
+      hideInSearch: false,
+    },
+    {
+      title: '备注',
+      dataIndex: 'remark',
+    },
+    {
+      title: '变更人',
+      dataIndex: 'hospAbbreviation',
+    },
+    {
+      title: '有数账号',
+      dataIndex: 'account',
+    },
+    {
+      title: '变更日期',
+      dataIndex: 'modifyTime',
+    },
+    {
+      title: '操作',
+      width: 240,
+      key: 'option',
+      valueType: 'option',
+      render: (text, record) => [
+        <a key="link4" onClick={() => editUserBind(record)}>
+          用户
+        </a>,
+        <Divider key="3" type="vertical" style={{ margin: '0 1px' }} />,
+        <a key="link" onClick={() => editHandle(record)}>
+          编辑
+        </a>,
+        <Divider key="1" type="vertical" style={{ margin: '0 1px' }} />,
+        <Popconfirm
+          title="是否确定删除?"
+          onConfirm={() => delHandle(record)}
+          // onCancel={cancel}
+          okText="确定"
+          cancelText="取消"
+          key="link2"
+        >
+          <a>删除</a>
+        </Popconfirm>,
+         <Divider key="9" type="vertical" style={{ margin: '0 1px' }} />,
+        <Dropdown key='4' menu={{
+          items: [
+            { key:'0',label: <a key="link3" onClick={() => editMenuBind(record)}>菜单</a>},
+            { key: '5', label: <DrawerActBtn key="link7" record={record} /> },
+            { key: '2', label: <a key="link4" onClick={() => initRoleData('func',record)} >初始化功能</a> },
+            { key: '6', label: <a key="link6" onClick={() => initRoleData('read',record)}>初始化只读</a> },
+          ]
+        }}>
+          <a>
+            更多 <DownOutlined />
+          </a>
+        </Dropdown>
+      ],
+    },
+
+  ];
+
+ 
 
   const getData = async (params: TableRequestParamsType) => {
     const { current = 1, pageSize = 10, roleName } = params;