.

src/pages/SystemManagement/Administrator/index.jsx

@@ -1,5 +1,21 @@
 import React, { useState, useEffect, useRef } from 'react';
-import { Button, Popconfirm, Modal, Form, Input, message, Radio, Select, Checkbox } from 'antd';
+import {
+  Button,
+  Popconfirm,
+  Modal,
+  Form,
+  Input,
+  message,
+  Radio,
+  Select,
+  List,
+  Row,
+  Col,
+  Card,
+  Tree,
+  Typography,
+  Checkbox,
+} from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { getCooperativeList } from '@/services/cooperative';
 import {
@@ -16,6 +32,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable';
 import moment from 'moment';
 import Search from '@/components/CooperativeSearch';
+import './index.less';
 
 const FormItem = Form.Item;
 const { Option } = Select;
@@ -39,7 +56,33 @@ export default (props) => {
   const [currentCheckbox, setCurrentCheckbox] = useState();
   //列表数据
   const actionRef = useRef();
+  const [data, setData] = useState([]);
+  const [orgId, setOrgId] = useState();
 
+  // 动态生成树
+  const handelNode = (item) => {
+    let node = (
+      <div
+        key={item.orgId}
+        style={{
+          justifyContent: 'space-between',
+          display: 'flex',
+          // width: '100%',
+          padding: '8px 0',
+        }}
+      >
+        <span>{item.title}</span>
+      </div>
+    );
+    return node;
+  };
+  const onSelect = (checkedKeys, info) => {
+    if (info.selected) {
+      setOrgId(info.node.key);
+    } else {
+      setOrgId();
+    }
+  };
   // 编辑弹窗的表单提交
   const Submit = (values) => {
     const newData = { ...values };
@@ -182,6 +225,10 @@ export default (props) => {
     //获取机构列表数据
     getCooperativeList().then((res) => {
       setCooperativeList(res.records);
+      const list = res.records?.map((item) => {
+        return { title: item.name, key: item.orgId };
+      });
+      setData(list);
     });
     //获取角色列表数据
     getRoleList().then((res) => {
@@ -245,6 +292,7 @@ export default (props) => {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
+      width: 80,
       renderFormItem: () => {
         return (
           <Select placeholder="请选择">
@@ -260,10 +308,11 @@ export default (props) => {
     {
       title: '操作',
       valueType: 'option',
+      width: 240,
       render: (_, record) => [
-        <Button type="link" key={1} onClick={() => handleOK(record)}>
+        <a key={1} onClick={() => handleOK(record)}>
           {record.status === 0 ? '启用' : '禁用'}
-        </Button>,
+        </a>,
         <a key={2} onClick={() => handleEdit(record)}>
           编辑
         </a>,
@@ -285,16 +334,31 @@ export default (props) => {
 
   return (
     <PageHeaderWrapper>
-      <PageTable
-        request={getUserList}
-        // expfunc={exportPersonList}
-        columns={columns}
-        actionRef={actionRef}
-        rowKey="userId"
-        options={false}
-        toolBarRender={actions}
-        scroll={{ x: 1000 }}
-      />
+      <Row gutter={16}>
+        <Col span={6}>
+          <Card title="机构列表">
+            <Tree
+              onSelect={onSelect}
+              className="treeClass"
+              titleRender={(data) => handelNode(data)}
+              treeData={data}
+            />
+          </Card>
+        </Col>
+        <Col span={18}>
+          <PageTable
+            request={getUserList}
+            params={{ org_id: orgId }}
+            // expfunc={exportPersonList}
+            columns={columns}
+            actionRef={actionRef}
+            rowKey="userId"
+            options={false}
+            toolBarRender={actions}
+            scroll={{ x: 1000 }}
+          />
+        </Col>
+      </Row>
       <Modal
         forceRender
         title={userId ? '人员编辑' : '人员新增'}
@@ -371,7 +435,7 @@ export default (props) => {
       </Modal>
       <Modal
         forceRender
-        title="角色授权"
+        title="授权角色"
         visible={editRoleModal}
         onCancel={onRoleCancel}
         keyboard={false}
@@ -384,6 +448,20 @@ export default (props) => {
           style={{ width: '100%' }}
           value={currentCheckbox}
           onChange={handleCheckboxChange}
+        >
+          <List
+            dataSource={roleList}
+            renderItem={(item) => (
+              <List.Item>
+                <Checkbox value={item.roleId}>{item.name}</Checkbox>
+              </List.Item>
+            )}
+          />
+        </Checkbox.Group>
+        {/* <Checkbox.Group
+          style={{ width: '100%' }}
+          value={currentCheckbox}
+          onChange={handleCheckboxChange}
         >
           {roleList.map((item) => {
             return (
@@ -393,7 +471,7 @@ export default (props) => {
               </div>
             );
           })}
-        </Checkbox.Group>
+        </Checkbox.Group> */}
       </Modal>
     </PageHeaderWrapper>
   );

src/pages/SystemManagement/Administrator/index.less

@@ -0,0 +1,15 @@
+@import (reference) '~antd/es/style/themes/index';
+
+.treeClass {
+  .ant-tree-list {
+    & div {
+      width: 100% !important;
+      .ant-tree-switcher-noop {
+        display: none !important;
+      }
+      span:nth-child(3) {
+        width: 100%;
+      }
+    }
+  }
+}

src/pages/SystemManagement/Cooperative/index.jsx

@@ -62,12 +62,11 @@ export default (props) => {
       });
   };
   // 动态生成树
-
   const handelNode = (item) => {
     let node = (
       <div
         key={item.orgId}
-        style={{ justifyContent: 'space-between', display: 'flex', width: '100%' }}
+        style={{ justifyContent: 'space-between', display: 'flex', padding: '8px 0' }}
         onClick={() => handleslect(item.key)}
       >
         <span>{item.title}</span>

src/pages/SystemManagement/Region/index.jsx

@@ -85,10 +85,12 @@ export default (props) => {
       key: 'createDate',
       render: formatterTime,
       search: false,
+      width: 240,
     },
     {
       title: '操作',
       valueType: 'option',
+      width: 160,
       render: (_, record) => [
         <a key={1} onClick={() => handelEdit(record)}>
           编辑

src/pages/SystemManagement/UserRights/index.jsx

@@ -336,10 +336,12 @@ export default (props) => {
       dataIndex: 'createDate',
       key: 'createDate',
       render: formatterTime,
+      width: 240,
     },
     {
       title: '操作',
       valueType: 'option',
+      width: 240,
       render: (_, record) => [
         <a key={1} onClick={() => handelEdit(record)}>
           编辑
@@ -354,7 +356,7 @@ export default (props) => {
           <a href="#">删除</a>
         </Popconfirm>,
         <a key={3} onClick={() => handelEmpower(record)}>
-          角色授权
+          授权菜单
         </a>,
       ],
     },
@@ -402,7 +404,7 @@ export default (props) => {
         </Form>
       </Modal>
       <Modal
-        title="角色授权"
+        title="授权菜单"
         visible={showModal}
         onCancel={onEmpowerCancel}
         keyboard={false}