组织修改

src/components/OrgManager/AddSubOrg.js

@@ -66,13 +66,10 @@ function StepContent(props){
     const [tabDatas, setTabDatas] = useState([]);
     const [activeTab, setActiveTab] = useState('');
     const [sysCheckeds, setSysCheckeds] = useState([]);
-    const {orgId,orgName,hisTypeList,save}  = useContext(OrgContext);
+    const [name, setName] = useState('');
+    const { orgId, orgName, hisTypeList, save, detail}  = useContext(OrgContext);
     const {current,pre,next} = props;
-    const initialValues={
-        parentId:orgId,
-        parentName:orgName,
-        status:1
-    };
+    const initialValues = detail
     const vilidateRules = {
         required: '${label}不能为空!',
         types: {
@@ -90,6 +87,7 @@ function StepContent(props){
                 setTreeDatas(treeDatas);
                 setTabDatas([treeDatas[0]]);
                 setActiveTab(treeDatas[0].key);
+                setName(treeDatas[0].title)
             }
 
         })
@@ -122,7 +120,6 @@ function StepContent(props){
             1:[['addHospitalUserVO','username'],['addHospitalUserVO','password'],'confirmPsd'],
         };
         form.validateFields(validateKeys[current]).then((res)=>{
-            //console.log(res,form)
             next(form);
         });
     }
@@ -130,24 +127,25 @@ function StepContent(props){
         form.validateFields([['softwares',0,'id'],['softwares',0,'softwareMenuIds'],['softwares',0,'softwareResourceIds']]).then((res)=>{
             save(form.getFieldsValue())
         });
-
     }
     //树形结构选中事件
     function checkTreeEvent(i,idsArr,sourceIds){
-        console.log(32,i,idsArr,sourceIds,activeTab)
         const formData=form.getFieldsValue();
         const arr=formData.softwares;
         arr[i]={
             id:activeTab,
+            name:name,
             softwareMenuIds:idsArr,
             softwareResourceIds:sourceIds
         };
         form.setFieldsValue({
             softwares:arr
         });
+        
     }
     function onTabChange(activeTab){
-        setActiveTab(activeTab)
+        setName(activeTab.split('-')[0])
+        setActiveTab(activeTab.split('-')[1])
     }
     //开放系统勾选事件
     function softwareChange(checkedValue){
@@ -293,11 +291,10 @@ function StepContent(props){
                 <Tabs onChange={onTabChange} type="card">
                     {
                         tabDatas.map((it,i)=>{
-                            console.log(0,it,i,tabDatas)
                             return (
-                                <TabPane tab={it.title} key={i}>
+                                <TabPane tab={it.title} key={it.title+'-'+i}>
                                     <Form.Item key={i} name={['softwares', i, 'softwareMenuIds']} noStyle>
-                                        <MenuTree data={it} checkEv={(checkedKeys,sourceIds)=>checkTreeEvent(i,checkedKeys,sourceIds)}/>
+                                        <MenuTree data={it} checkeds={form.getFieldValue().softwares ? form.getFieldValue().softwares[i] : []} checkEv={(checkedKeys,sourceIds)=>checkTreeEvent(i,checkedKeys,sourceIds)}/>
                                     </Form.Item>
                                     <Form.Item key={i+"a"} hidden={true} name={['softwares', i, 'id']} noStyle>
                                         <Input/>
@@ -305,6 +302,9 @@ function StepContent(props){
                                     <Form.Item key={i+"b"} hidden={true} name={['softwares', i, 'softwareResourceIds']} noStyle>
                                         <Input/>
                                     </Form.Item>
+                                    <Form.Item key={i + "c"} hidden={true} name={['softwares', i, 'name']} noStyle>
+                                        <Input />
+                                    </Form.Item>
                                 </TabPane>
                             )
                         })

src/components/OrgManager/MenuTree.js

@@ -4,7 +4,7 @@ import { Tree  } from 'antd';
 
 //const { post,api } = apiObj;
 function MenuTree(props){
-    const {data,checkEv} = props;
+    const { data, checkEv, checkeds} = props;
 
     //菜单选中事件
     function onCheck(checkedKeys,e){
@@ -26,6 +26,7 @@ function MenuTree(props){
         <Tree
             checkable
             onCheck={onCheck}
+            defaultCheckedKeys={checkeds ? checkeds.softwareMenuIds : []}
             onSelect={onSelect}
             treeData={treeData}
         />

src/components/OrgManager/index.js

@@ -1,217 +1,245 @@
-import {useEffect,useState} from 'react';
+import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux'
-import { Table,Modal, message, Menu, Breadcrumb, Dropdown, Space, Form, Input, Button, Row, Col, Select } from 'antd';
-import { DownOutlined,PlusOutlined } from '@ant-design/icons';
+import { Table, Modal, message, Menu, Breadcrumb, Dropdown, Space, Form, Input, Button, Row, Col, Select } from 'antd';
+import { DownOutlined, PlusOutlined } from '@ant-design/icons';
 import AddSubOrg from './AddSubOrg';
 import './index.less';
 import apiObj from '@api/index';
 import OrgContext from './org-context';
-
-const {post,api,xPost} = apiObj;
+import utils from '@utils/index'
+const { pickCheckedTreeIds } = utils;
+const { post, api, xPost } = apiObj;
 const { Option } = Select;
-function OrgManager(){
+function OrgManager() {
     useEffect(() => {
         //监听resize事件
-        setTableHt(window.innerHeight-260);
-        window.addEventListener('resize',()=>{
-            setTableHt(window.innerHeight-260);
+        setTableHt(window.innerHeight - 260);
+        window.addEventListener('resize', () => {
+            setTableHt(window.innerHeight - 260);
         });
         //刷新列表
         getTableData();
         //解绑事件
-        return function clear(){
+        return function clear() {
             window.removeEventListener("resize");
         }
-    },[]);
+    }, []);
 
     const [dataSource, setDataSource] = useState([]);   //列表数据
-    const [orgDetail, setOrgDetail] = useState([]);   //组织详情数据
     const [tableHt, setTableHt] = useState(300);   //表格滚动高度
-    const [visible,setVisible] = useState(false);   //删除禁用确认弹窗显示
-    const [addVisible,setAddVisible] = useState(false);         //新增页面显示
+    const [visible, setVisible] = useState(false);   //删除禁用确认弹窗显示
+    const [addVisible, setAddVisible] = useState(false);         //新增页面显示
     const [confirmLoading, setConfirmLoading] = useState(false);
     //弹窗类型：1删除 2有子组织、用户删除 3禁用 4有子组织、用户禁用 5重置密码
-    const [modalType,setModalType] = useState(1);
-    const [operId,setOperId] = useState('');    //当前操作的组织id
-    const [orgId,setOrgId] = useState('');      //上级组织id
-    const [orgName,setOrgName] = useState('');      //上级组织名称，新增修改用
+    const [modalType, setModalType] = useState(1);
+    const [operId, setOperId] = useState('');    //当前操作的组织id
+    const [orgId, setOrgId] = useState('');      //上级组织id
+    const [orgName, setOrgName] = useState('');      //上级组织名称，新增修改用
+    const [orgDetail, setOrgDetail] = useState(null);
+    const [type, setType] = useState('');
     //从state中取出状态、类型列表
-    const staticInfo =useSelector(state => {
+    const staticInfo = useSelector(state => {
         return state.staticInfo;
     });
-    const {hisTypeList,statusList} = staticInfo;
+    const { hisTypeList, statusList } = staticInfo;
 
-    const tipText={
-        1:'确定要删除该组织？',
-        2:'当前组织内可能包含子组织或其相关用户，删除后所包含信息将一并被删除',
-        3:'确定要禁用该组织？',
-        4:'当前组织内可能包含子组织或其相关用户，禁用后所包含信息将一并被禁用',
-        5:'确定要重置该组织密码？',
+    const tipText = {
+        1: '确定要删除该组织？',
+        2: '当前组织内可能包含子组织或其相关用户，删除后所包含信息将一并被删除',
+        3: '确定要禁用该组织？',
+        4: '当前组织内可能包含子组织或其相关用户，禁用后所包含信息将一并被禁用',
+        5: '确定要重置该组织密码？',
     };
 
     //获取表格数据
-    function getTableData(param={}){
-        post(api.getHospitalListInfo,param).then((res)=>{
-            if(res.data.code===200){
+    function getTableData(param = {}) {
+        post(api.getHospitalListInfo, param).then((res) => {
+            if (res.data.code === 200) {
                 const data = res.data.data;
-                setOrgId(data[0]?data[0].hospitalId:'');
-                setOrgName(data[0]?data[0].hospitalName:'')
+                setOrgId(data[0] ? data[0].hospitalId : '');
+                setOrgName(data[0] ? data[0].hospitalName : '')
                 setDataSource(data);
             }
 
         })
     }
     //启用/禁用
-    function enable(flag,id) {
-        const param = {HospitalId:id||operId,status:flag};
-        xPost(api.disableHospital,param).then((res)=>{
-            if(res.data.code===200){
+    function enable(flag, id) {
+        const param = { HospitalId: id || operId, status: flag };
+        xPost(api.disableHospital, param).then((res) => {
+            if (res.data.code === 200) {
                 getTableData();
                 setVisible(false);
-                message.success((flag?'启用':'禁用')+"成功");
-            }else{
-                message.warning(res.data.msg||'操作失败');
+                message.success((flag ? '启用' : '禁用') + "成功");
+            } else {
+                message.warning(res.data.msg || '操作失败');
             }
-        }).catch(()=>{
+        }).catch(() => {
             message.error("接口出错");
         });
     }
     //重置密码
-    function onResetPsd(){
-        const param = {HospitalId:operId};
-        xPost(api.resetPassword,param).then((res)=>{
-            if(res.data.code===200){
+    function onResetPsd() {
+        const param = { HospitalId: operId };
+        xPost(api.resetPassword, param).then((res) => {
+            if (res.data.code === 200) {
                 getTableData();
                 setVisible(false)
                 message.success("重置成功");
-            }else{
-                message.warning(res.data.msg||'操作失败');
+            } else {
+                message.warning(res.data.msg || '操作失败');
             }
-        }).catch(()=>{
+        }).catch(() => {
             message.error("接口出错");
         });
     }
     //删除
-    function onDelete(){
-        const param = {HospitalId:operId};
-        xPost(api.deleteHospital,param).then((res)=>{
-            if(res.data.code===200){
+    function onDelete() {
+        const param = { HospitalId: operId };
+        xPost(api.deleteHospital, param).then((res) => {
+            if (res.data.code === 200) {
                 getTableData();
                 setVisible(false);
                 message.success("删除成功");
-            }else{
-                message.warning(res.data.msg||'操作失败');
+            } else {
+                message.warning(res.data.msg || '操作失败');
             }
-        }).catch(()=>{
+        }).catch(() => {
             message.error("接口出错");
         });
     }
     //显示弹窗
-    function showModal(type,id){
+    function showModal(type, id) {
         setModalType(type);
         setOperId(id);
         setVisible(true);
     }
     //弹窗确认事件
-    function handleOk(){
-        if("1,2".indexOf(modalType)>-1){
+    function handleOk() {
+        if ("1,2".indexOf(modalType) > -1) {
             onDelete();
-        }else if("3,4".indexOf(modalType)>-1){
+        } else if ("3,4".indexOf(modalType) > -1) {
             enable(0);
-        }else if(modalType===5){
+        } else if (modalType === 5) {
             onResetPsd();
         }
 
     }
     //弹窗取消
-    function handleCancel(){
+    function handleCancel() {
         setVisible(false);
         setAddVisible(false);
     }
     //新增子组织弹窗
-    function showAddOrg(){
+    function showAddOrg() {
         setAddVisible(true);
+        setType(1)
+        setOrgDetail({
+            parentId: orgId,
+            parentName: orgName,
+            status: 1
+        })
     }
-    function getOrgDetail(id,type){
-        xPost(api.getHospitalById,{HospitalId:id,type}).then((res)=>{
-            const {data,code}=res.data;
-            if(code===200){
-                console.log(data)
+    function getOrgDetail(id, type) {
+        xPost(api.getHospitalById, { HospitalId: id, type }).then((res) => {
+            const { data, code } = res.data;
+            if (code === 200) {
                 structDetail(data);
                 //setOrgDetail(res.data.data);
-            }else{
-                message.warning(res.data.msg||'获取详情失败')
+            } else {
+                message.warning(res.data.msg || '获取详情失败')
             }
         });
     }
-    function structDetail(data){
-        let obj = Object.assign({},data);
-        //obj.addHospitalUserVO=Object.assign({},data.getHospitalUserDTO);
-        //obj.softwares=Object.assign({},data.loginUserMenuResourceTree);
+    function structDetail(data) {
+        const content = JSON.parse(JSON.stringify(data).replace(/getHospitalUserDTO/g, "addHospitalUserVO"));
+        const menuData = content.getRoleDTO.loginUserMenuResourceTree;
+        content.confirmPsd = content.addHospitalUserVO.password
+        let softwares = [], sids = [];
+        for (let i = 0; i < menuData.length; i++) {
+            const obj = pickCheckedTreeIds(menuData[i]);
+            softwares.push(obj);
+        }
+        const fData = Object.assign({}, content, { softwares });
+        setOrgDetail(fData);
     }
     //修改子组织
-    function editSubOrg(id,type){
-        getOrgDetail(id,type);
+    function editSubOrg(id, type) {
+        getOrgDetail(id, type);
         setAddVisible(true);
+        setType(2)
+        setOperId(id);
     }
     //保存
-    function addSubOrg(formData){
-        console.log('保存参数：',formData);
+    function addSubOrg(formData) {
         const param = formData;
-        post(api.addHospital,param).then((res)=>{
-            if(res.data.code===200){
+        let url = api.addHospital
+        if (type == 2) {
+            url = api.updateHospital
+            param.id = operId
+        }
+        post(url, param).then((res) => {
+            if (res.data.code === 200) {
                 getTableData();
                 setAddVisible(false);
                 message.success("添加成功");
-            }else{
-                message.warning(res.data.msg||'操作失败');
+            } else {
+                message.warning(res.data.msg || '操作失败');
             }
-        }).catch(()=>{
+        }).catch(() => {
             message.error("接口出错");
         });
     }
-    function goBack(){
+    function goBack() {
         setAddVisible(false);
+        setOrgDetail(null)
     }
     //表格渲染
-    function RenderTable(){
+    function RenderTable() {
         const columns = [
             { title: '组织机构层级', dataIndex: 'hospitalName', key: 'hospitalName' },
-            { title: '类型',width:150,  key: 'type',render:(row)=>{
-                    if(row.children){
+            {
+                title: '类型', width: 150, key: 'type', render: (row) => {
+                    if (row.children) {
                         return '-'
-                    }else{
+                    } else {
                         return row.typeName;
                     }
-                } },
-            { title: '状态',width:120,  key: 'status',render:(row)=>{
-                    if(row.children){
+                }
+            },
+            {
+                title: '状态', width: 120, key: 'status', render: (row) => {
+                    if (row.children) {
                         return '-'
-                    }else{
-                        return (<span className={ (row.status==='1')?'Enable':'Disable' }>{row.statusName}</span>);
+                    } else {
+                        return (<span className={(row.status === '1') ? 'Enable' : 'Disable'}>{row.statusName}</span>);
                     }
-                } },
-            { title: '创建时间',width:240, dataIndex: 'gmtCreate', key: 'gmtCreate' },
-            { title: '操作',width:240, key: 'operation', render: (row) => {
+                }
+            },
+            { title: '创建时间', width: 240, dataIndex: 'gmtCreate', key: 'gmtCreate' },
+            {
+                title: '操作', width: 240, key: 'operation', render: (row) => {
                     //console.log(21,row)
-                    if(row.rootFlag){
+                    if (row.rootFlag) {
                         return '-'
                     }
                     const menu = (
                         <Menu>
-                            <Menu.Item key="0" onClick={()=>showModal(5,row.hospitalId)}>重置密码</Menu.Item>
-                            <Menu.Item key="1" onClick={()=>showModal((row.hasUserFlag||row.hasHospitalFlag?2:1),row.hospitalId)}>删除</Menu.Item>
+                            <Menu.Item key="0" onClick={() => showModal(5, row.hospitalId)}>重置密码</Menu.Item>
+                            <Menu.Item key="1" onClick={() => showModal((row.hasUserFlag || row.hasHospitalFlag ? 2 : 1), row.hospitalId)}>删除</Menu.Item>
                         </Menu>
                     );
                     return (<Space size="middle">
-                        <a onClick={()=>editSubOrg(row.hospitalId,row.type)}>修改</a>
-                        {row.status==='1'?(<a onClick={()=>showModal(row.hasUserFlag||row.hasHospitalFlag?4:3,row.hospitalId)}>禁用</a>):(<a onClick={()=>enable(1,row.hospitalId)}>启用</a>)}
+                        <a onClick={() => editSubOrg(row.hospitalId, row.type)}>修改</a>
+                        {row.status === '1' ? (<a onClick={() => showModal(row.hasUserFlag || row.hasHospitalFlag ? 4 : 3, row.hospitalId)}>禁用</a>) : (<a onClick={() => enable(1, row.hospitalId)}>启用</a>)}
                         <Dropdown overlay={menu} trigger={['click']}>
                             <a className="ant-dropdown-link">
                                 更多 <DownOutlined />
                             </a>
                         </Dropdown>
-                    </Space>) }},
+                    </Space>)
+                }
+            },
         ];
         return (
             <Table
@@ -219,7 +247,7 @@ function OrgManager(){
                 pagination={false}
                 className="components-table-demo-nested"
                 rowKey={record => record.hospitalId}
-                expandable={{defaultExpandAllRows:true}}
+                expandable={{ defaultExpandAllRows: true }}
                 columns={columns}
                 dataSource={dataSource}
             />
@@ -229,17 +257,17 @@ function OrgManager(){
     const [form] = Form.useForm();
     const onFinish = (values: any) => {
         getTableData(values);
-        console.log('筛选项:',values);
+        console.log('筛选项:', values);
     };
     const onReset = () => {
         form.resetFields();
         getTableData();
     };
-    if(addVisible){
+    if (addVisible && orgDetail) {
         return (
-                <OrgContext.Provider value={{orgId,orgName,hisTypeList,save:addSubOrg}}>
-                    <AddSubOrg back={goBack}/>
-                </OrgContext.Provider>
+            <OrgContext.Provider value={{ orgId, orgName, hisTypeList, save: addSubOrg, detail: orgDetail }}>
+                <AddSubOrg back={goBack} />
+            </OrgContext.Provider>
         )
     }
     return (
@@ -249,7 +277,7 @@ function OrgManager(){
                     <Row gutter={24}>
                         <Col span={5} key={0}>
                             <Form.Item name="hospitalName" label="组织名称">
-                                <Input placeholder='组织名称'/>
+                                <Input placeholder='组织名称' />
                             </Form.Item>
                         </Col>
                         <Col span={5} key={1}>
@@ -257,9 +285,9 @@ function OrgManager(){
                                 <Select
                                     allowClear
                                 >
-                                    {hisTypeList.map((item)=>{
+                                    {hisTypeList.map((item) => {
                                         return (
-                                            <Option value={item.name}  key={item.name}>{item.val}</Option>
+                                            <Option value={item.name} key={item.name}>{item.val}</Option>
                                         )
                                     })}
                                 </Select>
@@ -270,9 +298,9 @@ function OrgManager(){
                                 <Select
                                     allowClear
                                 >
-                                    {statusList.map((item)=>{
+                                    {statusList.map((item) => {
                                         return (
-                                            <Option value={item.name}  key={item.name}>{item.val}</Option>
+                                            <Option value={item.name} key={item.name}>{item.val}</Option>
                                         )
                                     })}
                                 </Select>
@@ -294,7 +322,7 @@ function OrgManager(){
             <div className="table">
                 <div className="table-header">
                     <h2 className="table-title">组织管理</h2>
-                    <Button type="primary" icon={<PlusOutlined />} onClick={()=> showAddOrg()}>新增子组织</Button>
+                    <Button type="primary" icon={<PlusOutlined />} onClick={() => showAddOrg()}>新增子组织</Button>
                 </div>
                 <RenderTable />
             </div>

src/components/RoleManager/AddRole.js

@@ -38,6 +38,7 @@ function ContentForm(props){
     const initialValues=detail||{
         status:'1'
     };
+    
     const vilidateRules = {
         required: '${label}不能为空!',
         types: {