用户/字典等新版功能

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-13 15:22:48
- * @LastEditTime: 2023-03-17 16:01:54
+ * @LastEditTime: 2023-03-22 14:00:06
  * @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
@@ -22,7 +22,7 @@ import { KCInput } from '@/components/KCInput';
 import { createFromIconfontCN, DownOutlined } from '@ant-design/icons';
 import { DrawerForm } from '@ant-design/pro-form';
 import { DataNode } from 'antd/es/tree';
-import { getTableDataRequest, getTreeData, getTreeDataRespType } from '../systemNavMana/service';
+
 
 import expandedIcon from '../../../../../public/images/treenode_open.png';
 import closeIcon from '../../../../../public/images/treenode_collapse.png';

src/pages/platform/setting/notificationTemplate/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-21 11:27:51
+ * @LastEditTime: 2023-03-22 17:40:53
  * @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
  */
@@ -146,7 +146,7 @@ export default function PubDicTypeMana() {
 
             return {
                 defaultvalue: defaultValue[0] ? defaultValue[0].value : '',
-                list: dataArr.map((t: any) => ({ label: t.code, value: t.value }))
+                list: dataArr.map((t: any) => ({ label: t.value, value: t.code }))
             }
         }
 
@@ -160,16 +160,19 @@ export default function PubDicTypeMana() {
 
 
     const updateTable = async (formVal: any, type: 'EDIT' | "ADD") => {
-
+        
         if (type == 'ADD') {
-            const resp = await addData({ ...formVal, hospId: 0 });
+            const resp = await addData({ ...formVal,
+                systemPath:formVal.systemId?formVal.systemId.join(','):'',
+                systemId:(formVal.systemId&&formVal.systemId.length>0)?formVal.systemId[formVal.systemId.length -1]:''});
             if (resp) {
                 set_reload(true);
             }
         }
         if (type == 'EDIT') {
-            const { dictId } = currentEdit;
-            const resp = await editData({ ...formVal, dictId, hospId: 0 });
+            const resp = await editData({ ...formVal,
+                systemPath:formVal.systemId?formVal.systemId.join(','):'',
+                systemId:(formVal.systemId&&formVal.systemId.length>0)?formVal.systemId[formVal.systemId.length -1]:''});
             if (resp) {
                 set_reload(true);
             }
@@ -184,12 +187,15 @@ export default function PubDicTypeMana() {
             <ModalForm
                 title={`${type == 'EDIT' ? '编辑' : '新增'}消息模板`}
                 width={688}
-                initialValues={type == 'EDIT' ? { ...record } : {}}
+                initialValues={type == 'EDIT' ? { 
+                    ...record,
+                    systemId:record.systemPath?record.systemPath.split(','):[]
+                 } : {}}
                 trigger={
-                    type == 'EDIT' ? <a key="edit" onClick={() => set_currentEdit(record)}>编辑</a> : <span className='add'>新增</span>
+                    type == 'EDIT' ? <a key="edit" >编辑</a> : <span className='add'>新增</span>
                 }
                 onFinish={(val) => {
-                    return updateTable(val, type);
+                    return updateTable(type == 'EDIT'?{...val,id:record.id}:{...val}, type);
                 }}
                 colProps={{span:12}}
                 grid
@@ -229,10 +235,6 @@ export default function PubDicTypeMana() {
                         return []
 
                     }}
-
-                    fieldProps={{
-
-                    }}
                 />
 
                 <ProFormCascader
@@ -257,7 +259,7 @@ export default function PubDicTypeMana() {
                 />
 
                 <ProFormSelect
-                    name="receiveTypeName"
+                    name="receiveType"
                     label="接收类型："
                     options={setSelectorData('RECEIVE_TYPE').list}
                     placeholder="请选择"

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-13 15:22:48
- * @LastEditTime: 2023-03-21 11:23:55
+ * @LastEditTime: 2023-03-22 14:03:03
  * @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
@@ -19,8 +19,8 @@ import './style.less';
 import type { RoleItemType as TableListItem } from '@/service/role';
 import { KCInput } from '@/components/KCInput';
 import { createFromIconfontCN, DownOutlined } from '@ant-design/icons';
-import { getMenuRelaPerm, saveHospMenuApiPerm } from '@/service/hospList';
-import { getTreeData, getTreeDataRespType } from '../systemNavMana/service';
+
+
 import { CheckboxValueType } from 'antd/lib/checkbox/Group';
 import { getDeepestTreeData } from '@/utils';
 import { DrawerForm } from '@ant-design/pro-form';
@@ -29,6 +29,7 @@ import { DataNode } from 'antd/es/tree';
 import expandedIcon from '../../../../../public/images/treenode_open.png';
 import closeIcon from '../../../../../public/images/treenode_collapse.png';
 import DirectoryTree from 'antd/es/tree/DirectoryTree';
+import { getTreeData, getTreeDataRespType } from '../systemNavMana/service';
 
 export enum TableActType {
   NOACT,

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-11 09:43:18
- * @LastEditTime: 2023-03-20 11:36:12
+ * @LastEditTime: 2023-03-23 09:50:38
  * @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
@@ -59,7 +59,7 @@ const UserManage: FC<PageProps> = ({ userManageModel: state, dispatch }) => {
     },
     {
       title: '电话',
-      dataIndex: 'phoneNum',
+      dataIndex: 'phoneNumber',
     },
     {
       title: '身份证号',

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-12 17:11:11
- * @LastEditTime: 2023-03-20 17:28:48
+ * @LastEditTime: 2023-03-23 09:46:23
  * @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
@@ -75,6 +75,7 @@ const ActModal: React.FC<ActModalProps> = ({
   const onVisibleChangeHandle = (bool: boolean) => {
     // console.log({bool});
     if (!bool) {
+      setAvatarUrl('');
       dispatch &&
         dispatch({
           type: 'userManageModel/cancelTableAct',
@@ -123,11 +124,11 @@ const ActModal: React.FC<ActModalProps> = ({
         return prev.sort - next.sort;
       });
 
-      // console.log({dataArr,defaultValue});
-
       return {
         defaultvalue: defaultValue[0] ? defaultValue[0].value : '',
-        list: dataArr.map(t => ({ label: t.code, value: t.value }))
+        list: dataArr.map(t =>{
+             return ({ label: t.value, value: t.code })
+        })
       }
     }
 
@@ -164,7 +165,12 @@ const ActModal: React.FC<ActModalProps> = ({
           practiceSubject: setSelectorData('PROCESSIONAL_SUBJECTS_TYPE').defaultvalue,
           title: setSelectorData('TITLE_TYPE').defaultvalue,
           practiceCate: setSelectorData('JOB_TYPE').defaultvalue,
-          practiceStatus: setSelectorData('PROFESSIONAL_STATUS_TYPE').defaultvalue
+          practiceStatus: setSelectorData('PROFESSIONAL_STATUS_TYPE').defaultvalue,
+          position:setSelectorData('POSITION').defaultvalue,
+          departmentId:setSelectorData('PRACTICE_DEPARTMENT_TYPE').defaultvalue,
+          userCate:setSelectorData('PERSONNEL_CATEGORY').defaultvalue,
+          degree:setSelectorData('EDUCATION').defaultvalue,
+          
         }
       }
       title={tableAct == TableActType.EDIT ? '编辑用户' : '新增用户'}
@@ -304,16 +310,16 @@ const ActModal: React.FC<ActModalProps> = ({
                 <ProFormDependency name={['isOnService']}>
                   {({ isOnService }) => (
                     <div className='formItem'>
-                      <ProFormDateTimePicker disabled={isOnService == 1} label='离职日期：' name="outTime" placeholder={'请选择离职时间'} />
+                      <ProFormDateTimePicker disabled={isOnService == 0} label='离职日期：' name="outTime" placeholder={'请选择离职时间'} />
                     </div>
                   )}
                 </ProFormDependency>
 
                 <div className='formItem'>
                   <ProFormSelect
-                    name="title"
+                    name="degree"
                     label="学历："
-                    options={setSelectorData('TITLE_TYPE').list}
+                    options={setSelectorData('EDUCATION').list}
                     placeholder="请选择"
                     rules={[{ required: true, message: '请选择学历!' }]}
                   />
@@ -345,7 +351,7 @@ const ActModal: React.FC<ActModalProps> = ({
                   {({ userCate }) => (userCate == 6 || userCate == 5) && (
                     <div className='formItem'>
                       <ProFormSelect
-                        name="practiceCate"
+                        name="practiceSubject"
                         label="执业科目："
                         options={setSelectorData('PROCESSIONAL_SUBJECTS_TYPE').list}
                         placeholder="请选择"
@@ -382,7 +388,7 @@ const ActModal: React.FC<ActModalProps> = ({
                     <div className='formItem' style={{position:'relative',left:-175}}>
                       <ProFormSelect
                         name="doctorLevel"
-                        label="医师级别："
+                        label="医师："
                         options={setSelectorData('PHYSICIAN_TYPE').list}
                         placeholder="请选择"
                         rules={[{ required: true, message: '请选择!' }]}