fix bug

src/pages/platform/setting/departmentMana/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-03-09 17:11:35
+ * @LastEditTime: 2023-03-24 12:22:43
  * @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
  */
@@ -19,7 +19,7 @@ import { ProColumns } from '@ant-design/pro-table';
 import { message, Popconfirm } from 'antd';
 import FormItem from 'antd/lib/form/FormItem';
 import { useEffect, useState } from 'react'
-import { addData, delData, editData, getData, getDepartmentType, getRelaHosp, importDepartmentData } from './service';
+import { addData, delData, editData, getDepartmentData, getDepartmentType, getRelaHosp, importDepartmentData } from './service';
 
 import './style.less';
 
@@ -87,7 +87,7 @@ export default function DepartmentMana() {
 
 
     const getTableData = async (params: any) => {
-        const resp = await getData(params);
+        const resp = await getDepartmentData(params);
         set_reload(false);
         if (resp) {
             return {

src/pages/platform/setting/departmentMana/service.ts

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 16:31:27
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-09 17:11:29
+ * @LastEditTime: 2023-03-24 12:22:03
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/service.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -25,7 +25,7 @@ export type DepartmentDataType = {
 }
 
 
-export const getData = (params?:any) => {
+export const getDepartmentData = (params?:any) => {
   return request<{
        current:number;
        list:DepartmentDataType[];

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-13 15:22:48
- * @LastEditTime: 2023-03-24 11:25:37
+ * @LastEditTime: 2023-03-24 12:20:28
  * @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
@@ -171,10 +171,6 @@ const HospManage: FC<PageProps> = ({ hospManageModel: state, dispatch }) => {
     const [drawerTableDataFilterParams, set_drawerTableDataFilterParams] = useState<any | undefined>();
 
     const [checkBoxCodes, set_checkBoxCodes] = useState<any[]>([]); //勾选的菜单
-
-    const [needCancelCheckedMenus, set_needCancelCheckedMenus] = useState<any[]>([]);
-
-
     const [drawerTableDataSearchKeywords, set_drawerTableDataSearchKeywords] = useState<string>('');
 
     const [checkedTableMenuIds, set_checkedTableMenuIds] = useState<any[]>([]);
@@ -286,8 +282,10 @@ const HospManage: FC<PageProps> = ({ hospManageModel: state, dispatch }) => {
     ];
 
     const getTreeReqFunc = async (hospId: string) => {
-      const resp = await getHospOwnSys(hospId);
-      set_treeData(resp);
+      if(hospId){
+        const resp = await getHospOwnSys(hospId);
+        set_treeData(resp);
+      }
     }
 
     const onSelect: TreeProps['onSelect'] = (selectedKeys, info) => {
@@ -352,6 +350,7 @@ const HospManage: FC<PageProps> = ({ hospManageModel: state, dispatch }) => {
 
 
     const getTableData = async (params: any, sort: any, filter: any) => {
+
       set_drawerTablereload(false);
       if (currentSelectedTreeNode) {
         const resp = await getMenuRelaPerm({ ...params, hospId: record.id });
@@ -380,7 +379,6 @@ const HospManage: FC<PageProps> = ({ hospManageModel: state, dispatch }) => {
           setTreeRecursion(resp);
 
           set_checkBoxCodes(temp);
-          console.log({temp});
           set_checkedTableMenuIds(temp.map((a: any) => a.menuId));
           set_oldSelectedMenuIds(temp.map((a: any) => a.menuId));
 
@@ -402,8 +400,6 @@ const HospManage: FC<PageProps> = ({ hospManageModel: state, dispatch }) => {
 
       let old = oldSelectedMenuIds;
       
-      console.log({oldSelectedMenuIds,checkBoxCodes});
-      
       const result = checkBoxCodes.map((item: any) => {
        
         old.splice(old.findIndex(a=>a == item.menuId),1);
@@ -422,7 +418,6 @@ const HospManage: FC<PageProps> = ({ hospManageModel: state, dispatch }) => {
         set_drawerTablereload(true);
         set_checkBoxCodes([]);
         set_checkedTableMenuIds([]);
-        set_needCancelCheckedMenus([]);
       }
 
     }
@@ -462,7 +457,7 @@ const HospManage: FC<PageProps> = ({ hospManageModel: state, dispatch }) => {
       //切换系统清空数据
       set_checkBoxCodes([]);
       set_checkedTableMenuIds([]);
-      set_needCancelCheckedMenus([]);
+
 
     }, [currentSelectedTreeNode]);
 
@@ -809,7 +804,7 @@ const HospManage: FC<PageProps> = ({ hospManageModel: state, dispatch }) => {
         <div className='filter'>
           <div className='filterItem'>
             <span className='label'>检索：</span>
-            <KCInput placeholder={'请输入参数名称'} style={{ width: 160 }} search allowClear
+            <KCInput placeholder={'请输入院区名称'} style={{ width: 160 }} search allowClear
               onChange={(e) => {
                 set_tableDataSearchKeywords(e.target.value);
                 if (e.target.value.length == 0) {

src/pages/platform/setting/pubDicTypeMana/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-03-09 15:57:36
+ * @LastEditTime: 2023-03-24 12:10:56
  * @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
  */
@@ -14,7 +14,7 @@ import KCTable from '@/components/kcTable';
 import { getAllHosp } from '@/service/hospList';
 import { ModalForm, ProFormSelect, ProFormText, ProFormTextArea } from '@ant-design/pro-form'
 import { ProColumns } from '@ant-design/pro-table';
-import { message, Popconfirm } from 'antd';
+import { message, Modal, Popconfirm } from 'antd';
 import React, { useState } from 'react'
 import { addData, delData, editData, getData } from './service';
 
@@ -96,6 +96,9 @@ export default function PubDicTypeMana() {
           }
     }
 
+
+    
+
     const updateTable = async (formVal: any, type: 'EDIT' | "ADD") => {
        
         if (type == 'ADD') {

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-11 09:43:18
- * @LastEditTime: 2023-03-23 19:28:47
+ * @LastEditTime: 2023-03-24 12:28:42
  * @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/userManage/index.tsx
@@ -22,6 +22,7 @@ import KCUpload from '@/components/KCUpload';
 import { RcFile } from 'antd/lib/upload/interface';
 import { KCInput } from '@/components/KCInput';
 import FormItem from 'antd/es/form/FormItem';
+import { getDepartmentData } from '../departmentMana/service';
 
 export enum TableActType {
   NOACT,
@@ -283,11 +284,17 @@ const UserManage: FC<PageProps> = ({ userManageModel: state, dispatch }) => {
                     name="departmentId"
                     noStyle
                     style={{width:160}}
-                    options={setSelectorData('PRACTICE_DEPARTMENT_TYPE').list}
                     placeholder="请选择"
+                    request={async () => {
+                          const resp = await getDepartmentData({pageSize:1000});
+                          if(resp){
+                            return resp.list.map(a=>({label:a.name,value:a.id})) 
+                          }
+                          return [];
+                    }}
                     fieldProps={{
+                      showSearch:true,
                       onChange:(val) => {
-                        console.log('departmentId',val);
                         set_tableDataFilterParams({
                           ...tableDataFilterParams,
                           departmentId:val

src/pages/platform/setting/userManage/modal.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-12 17:11:11
- * @LastEditTime: 2023-03-23 17:51:52
+ * @LastEditTime: 2023-03-24 12:31:46
  * @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/userManage/modal.tsx
@@ -19,6 +19,7 @@ import { LoadingOutlined, PlusOutlined, UploadOutlined } from '@ant-design/icons
 // import { TableActType } from "./typings";
 
 import './style.less';
+import { getDepartmentData } from '../departmentMana/service';
 
 export enum TableActType {
   NOACT,
@@ -273,7 +274,16 @@ const ActModal: React.FC<ActModalProps> = ({
                   <ProFormSelect
                     name="departmentId"
                     label="科室："
-                    options={setSelectorData('PRACTICE_DEPARTMENT_TYPE').list}
+                    request={async () => {
+                      const resp = await getDepartmentData({pageSize:1000});
+                      if(resp){
+                        return resp.list.map(a=>({label:a.name,value:a.id})) 
+                      }
+                      return [];
+                     }}
+                     fieldProps={{
+                        showSearch:true
+                     }}
                     placeholder="请选择"
                   />
                 </div>