角色加上部门分隔

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java

@@ -72,6 +72,11 @@ public class SysRole extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 部门id
+     */
+    private String deptId;
+
     public SysRole(Long roleId) {
         this.roleId = roleId;
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java

@@ -73,6 +73,11 @@ public class SysRoleBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 部门id
+     */
+    private String deptId;
+
     /**
      * 菜单组
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java

@@ -82,6 +82,11 @@ public class SysRoleVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 部门id
+     */
+    private String deptId;
+
     /**
      * 创建时间
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java

@@ -85,6 +85,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
             .like(StringUtils.isNotBlank(bo.getRoleName()), SysRole::getRoleName, bo.getRoleName())
             .eq(StringUtils.isNotBlank(bo.getStatus()), SysRole::getStatus, bo.getStatus())
             .like(StringUtils.isNotBlank(bo.getRoleKey()), SysRole::getRoleKey, bo.getRoleKey())
+            .eq(StringUtils.isNotBlank(bo.getDeptId()), SysRole::getDeptId, bo.getDeptId())
             .between(params.get("beginTime") != null && params.get("endTime") != null,
                 SysRole::getCreateTime, params.get("beginTime"), params.get("endTime"))
             .orderByAsc(SysRole::getRoleSort).orderByAsc(SysRole::getCreateTime);

zdxt-web-client/zdxt-admin-plus-ui/src/api/system/role/types.ts

@@ -29,12 +29,14 @@ export interface RoleVO extends BaseEntity {
   menuIds?: Array<string | number>;
   deptIds?: Array<string | number>;
   admin: boolean;
+  deptId?: string;
 }
 
 export interface RoleQuery extends PageQuery {
   roleName: string;
   roleKey: string;
   status: string;
+  deptId?: string | number;
 }
 
 export interface RoleForm {
@@ -49,4 +51,5 @@ export interface RoleForm {
   roleId: string | undefined;
   menuIds: Array<string | number>;
   deptIds: Array<string | number>;
+  deptId?: string;
 }

zdxt-web-client/zdxt-admin-plus-ui/src/views/system/role/index-dept-separate.vue

@@ -0,0 +1,600 @@
+<template>
+  <div class="p-2">
+    <el-row :gutter="20">
+      <!-- 部门树 -->
+      <el-col :lg="4" :xs="24">
+        <el-card shadow="hover" style="position: sticky; top: 0;">
+          <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable />
+          <div style="max-height: calc(100vh - 180px); overflow-y: auto; overflow-x: hidden;">
+            <el-tree
+              ref="deptTreeRef"
+              class="mt-2"
+              node-key="id"
+              :data="deptOptions"
+              :props="{ label: 'label', children: 'children' } as any"
+              :expand-on-click-node="false"
+              :filter-node-method="filterNode"
+              highlight-current
+              :default-expanded-keys="deptExpandedKeys"
+              @node-click="handleNodeClick"
+            />
+          </div>
+        </el-card>
+      </el-col>
+
+      <!-- 右侧角色管理 -->
+      <el-col :lg="20" :xs="24">
+        <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+          <div v-show="showSearch" class="mb-[10px]">
+            <el-card shadow="hover">
+              <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+                <el-form-item label="角色名称" prop="roleName">
+                  <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="权限字符" prop="roleKey">
+                  <el-input v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                  <el-select v-model="queryParams.status" placeholder="角色状态" clearable>
+                    <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="创建时间" style="width: 308px">
+                  <el-date-picker
+                    v-model="dateRange"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    type="daterange"
+                    range-separator="-"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                  ></el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-form>
+            </el-card>
+          </div>
+        </transition>
+
+        <el-card shadow="hover">
+          <template #header>
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">修改</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button v-hasPermi="['system:role:remove']" type="danger" plain :disabled="ids.length === 0" icon="Delete" @click="handleDelete()">删除</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button v-hasPermi="['system:role:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+              </el-col>
+              <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+            </el-row>
+          </template>
+
+          <el-table ref="roleTableRef" border v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column v-if="false" label="角色编号" prop="roleId" width="120" />
+            <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
+            <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="200" />
+            <el-table-column label="显示顺序" prop="roleSort" width="100" />
+            <el-table-column label="状态" align="center" width="100">
+              <template #default="scope">
+                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+              </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime">
+              <template #default="scope">
+                <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="right" label="操作" width="180">
+              <template #default="scope">
+                <el-tooltip v-if="scope.row.roleId !== 1" content="修改" placement="top">
+                  <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+                </el-tooltip>
+                <el-tooltip v-if="scope.row.roleId !== 1" content="删除" placement="top">
+                  <el-button v-hasPermi="['system:role:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+                </el-tooltip>
+                <el-tooltip v-if="scope.row.roleId !== 1" content="数据权限" placement="top">
+                  <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"></el-button>
+                </el-tooltip>
+                <el-tooltip v-if="scope.row.roleId !== 1" content="分配用户" placement="top">
+                  <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User" @click="handleAuthUser(scope.row)"></el-button>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <pagination
+            v-if="total > 0"
+            v-model:total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改角色对话框 -->
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
+      <el-form ref="roleFormRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="角色名称" prop="roleName">
+          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
+        </el-form-item>
+        <el-form-item prop="roleKey">
+          <template #label>
+            <span>
+              <el-tooltip content="控制器中定义的权限字符，如：@SaCheckRole('admin')" placement="top">
+                <el-icon><question-filled /></el-icon>
+              </el-tooltip>
+              权限字符
+            </span>
+          </template>
+          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+        </el-form-item>
+        <el-form-item label="角色顺序" prop="roleSort">
+          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="菜单权限">
+          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
+          <el-tree
+            ref="menuRef"
+            class="tree-border"
+            :data="menuOptions"
+            show-checkbox
+            node-key="id"
+            :check-strictly="!form.menuCheckStrictly"
+            empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' } as any"
+          ></el-tree>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 分配角色数据权限对话框 -->
+    <el-dialog v-model="openDataScope" :title="dialog.title" width="500px" append-to-body>
+      <el-form ref="dataScopeRef" :model="form" label-width="80px">
+        <el-form-item label="角色名称">
+          <el-input v-model="form.roleName" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="权限字符">
+          <el-input v-model="form.roleKey" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="权限范围">
+          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
+            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-show="form.dataScope === '2'" label="数据权限">
+          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
+          <el-tree
+            ref="deptRef"
+            class="tree-border"
+            :data="dataScopeDeptOptions"
+            show-checkbox
+            default-expand-all
+            node-key="id"
+            :check-strictly="!form.deptCheckStrictly"
+            empty-text="加载中，请稍候"
+            :props="{ label: 'label', children: 'children' } as any"
+          ></el-tree>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitDataScope">确 定</el-button>
+          <el-button @click="cancelDataScope">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="RoleDeptSeparate" lang="ts">
+import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect as roleDeptTreeSelect } from '@/api/system/role';
+import { roleMenuTreeselect, treeselect as menuTreeselect } from '@/api/system/menu/index';
+import { RoleVO, RoleForm, RoleQuery, DeptTreeOption } from '@/api/system/role/types';
+import { MenuTreeOption, RoleMenuTree } from '@/api/system/menu/types';
+import { DeptTreeVO, DeptVO } from '@/api/system/dept/types';
+import { deptTreeSelect } from '@/api/system/user';
+
+const router = useRouter();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
+
+// ========== 左侧部门树相关 ==========
+const deptName = ref('');
+const deptOptions = ref<DeptTreeVO[]>([]);
+const deptTreeRef = ref<ElTreeInstance>();
+const deptExpandedKeys = ref<(string | number)[]>([]);
+const selectedDeptId = ref<string | number>('');
+
+/** 收集前 N 层节点的 id，用于默认展开 */
+const collectExpandKeys = (nodes: DeptTreeVO[], currentLevel: number, maxLevel: number) => {
+  if (currentLevel > maxLevel) return;
+  for (const node of nodes) {
+    deptExpandedKeys.value.push(node.id);
+    if (node.children?.length) {
+      collectExpandKeys(node.children, currentLevel + 1, maxLevel);
+    }
+  }
+};
+
+/** 通过条件过滤节点 */
+const filterNode = (value: string, data: any) => {
+  if (!value) return true;
+  return data.label.indexOf(value) !== -1;
+};
+
+/** 根据名称筛选部门树 */
+watchEffect(
+  () => {
+    deptTreeRef.value?.filter(deptName.value);
+  },
+  { flush: 'post' }
+);
+
+/** 查询部门下拉树结构 */
+const getDeptTree = async () => {
+  const res = await deptTreeSelect();
+  deptOptions.value = res.data;
+  deptExpandedKeys.value = [];
+  collectExpandKeys(res.data, 1, 2);
+};
+
+/** 部门节点单击事件 */
+const handleNodeClick = (data: DeptVO) => {
+  selectedDeptId.value = data.id;
+  queryParams.value.deptId = data.id;
+  handleQuery();
+};
+
+// ========== 右侧角色管理相关 ==========
+const roleList = ref<RoleVO[]>();
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const menuOptions = ref<MenuTreeOption[]>([]);
+const menuExpand = ref(false);
+const menuNodeAll = ref(false);
+const deptExpand = ref(true);
+const deptNodeAll = ref(false);
+const dataScopeDeptOptions = ref<DeptTreeOption[]>([]);
+const openDataScope = ref(false);
+
+/** 数据范围选项 */
+const dataScopeOptions = ref([
+  { value: '1', label: '全部数据权限' },
+  { value: '2', label: '自定数据权限' },
+  { value: '3', label: '本部门数据权限' },
+  { value: '4', label: '本部门及以下数据权限' },
+  { value: '5', label: '仅本人数据权限' },
+  { value: '6', label: '部门及以下或本人数据权限' }
+]);
+
+const queryFormRef = ref<ElFormInstance>();
+const roleFormRef = ref<ElFormInstance>();
+const dataScopeRef = ref<ElFormInstance>();
+const menuRef = ref<ElTreeInstance>();
+const deptRef = ref<ElTreeInstance>();
+
+const initForm: RoleForm = {
+  roleId: undefined,
+  roleSort: 1,
+  status: '0',
+  roleName: '',
+  roleKey: '',
+  menuCheckStrictly: true,
+  deptCheckStrictly: true,
+  remark: '',
+  dataScope: '1',
+  menuIds: [],
+  deptIds: [],
+  deptId: ''
+};
+
+const data = reactive<PageData<RoleForm, RoleQuery>>({
+  form: { ...initForm },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    roleName: '',
+    roleKey: '',
+    status: '',
+    deptId: ''
+  },
+  rules: {
+    roleName: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
+    roleKey: [{ required: true, message: '权限字符不能为空', trigger: 'blur' }],
+    roleSort: [{ required: true, message: '角色顺序不能为空', trigger: 'blur' }]
+  }
+});
+const { form, queryParams, rules } = toRefs(data);
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+/** 查询角色列表 */
+const getList = () => {
+  loading.value = true;
+  listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then((res) => {
+    roleList.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+  });
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置 */
+const resetQuery = () => {
+  dateRange.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  // 保留部门筛选
+  queryParams.value.deptId = selectedDeptId.value;
+  handleQuery();
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: RoleVO) => {
+  const roleids = row?.roleId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除角色编号为' + roleids + '数据项目');
+  await delRole(roleids);
+  getList();
+  proxy?.$modal.msgSuccess('删除成功');
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/role/export',
+    {
+      ...queryParams.value
+    },
+    `role_${new Date().getTime()}.xlsx`
+  );
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: RoleVO[]) => {
+  ids.value = selection.map((item: RoleVO) => item.roleId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 角色状态修改 */
+const handleStatusChange = async (row: RoleVO) => {
+  const text = row.status === '0' ? '启用' : '停用';
+  try {
+    await proxy?.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗?');
+    await changeRoleStatus(row.roleId, row.status);
+    proxy?.$modal.msgSuccess(text + '成功');
+  } catch {
+    row.status = row.status === '0' ? '1' : '0';
+  }
+};
+
+/** 分配用户 */
+const handleAuthUser = (row: RoleVO) => {
+  router.push('/system/role-auth/user/' + row.roleId);
+};
+
+/** 查询菜单树结构 */
+const getMenuTreeselect = async () => {
+  const res = await menuTreeselect();
+  menuOptions.value = res.data;
+};
+
+/** 所有部门节点数据 */
+const getDeptAllCheckedKeys = (): any => {
+  const checkedKeys = deptRef.value?.getCheckedKeys();
+  const halfCheckedKeys = deptRef.value?.getHalfCheckedKeys();
+  if (halfCheckedKeys) {
+    checkedKeys?.unshift(...halfCheckedKeys);
+  }
+  return checkedKeys;
+};
+
+/** 重置新增的表单以及其他数据 */
+const reset = () => {
+  menuRef.value?.setCheckedKeys([]);
+  menuExpand.value = false;
+  menuNodeAll.value = false;
+  deptExpand.value = true;
+  deptNodeAll.value = false;
+  form.value = { ...initForm };
+  roleFormRef.value?.resetFields();
+};
+
+/** 添加角色 */
+const handleAdd = () => {
+  reset();
+  getMenuTreeselect();
+  dialog.visible = true;
+  dialog.title = '添加角色';
+  // 自动关联当前选中部门
+  if (selectedDeptId.value) {
+    form.value.deptId = String(selectedDeptId.value);
+  }
+};
+
+/** 修改角色 */
+const handleUpdate = async (row?: RoleVO) => {
+  reset();
+  const roleId = row?.roleId || ids.value[0];
+  const { data } = await getRole(roleId);
+  Object.assign(form.value, data);
+  form.value.roleSort = Number(form.value.roleSort);
+  const res = await getRoleMenuTreeselect(roleId);
+  dialog.title = '修改角色';
+  dialog.visible = true;
+  res.checkedKeys.forEach((v) => {
+    nextTick(() => {
+      menuRef.value?.setChecked(v, true, false);
+    });
+  });
+};
+
+/** 根据角色ID查询菜单树结构 */
+const getRoleMenuTreeselect = (roleId: string | number) => {
+  return roleMenuTreeselect(roleId).then((res): RoleMenuTree => {
+    menuOptions.value = res.data.menus;
+    return res.data;
+  });
+};
+
+/** 根据角色ID查询部门树结构 */
+const getRoleDeptTreeSelect = async (roleId: string | number) => {
+  const res = await roleDeptTreeSelect(roleId);
+  dataScopeDeptOptions.value = res.data.depts;
+  return res.data;
+};
+
+/** 树权限（展开/折叠） */
+const handleCheckedTreeExpand = (value: boolean, type: string) => {
+  if (type == 'menu') {
+    const treeList = menuOptions.value;
+    for (let i = 0; i < treeList.length; i++) {
+      if (menuRef.value) {
+        menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
+      }
+    }
+  } else if (type == 'dept') {
+    const treeList = dataScopeDeptOptions.value;
+    for (let i = 0; i < treeList.length; i++) {
+      if (deptRef.value) {
+        deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
+      }
+    }
+  }
+};
+
+/** 树权限（全选/全不选） */
+const handleCheckedTreeNodeAll = (value: any, type: string) => {
+  if (type == 'menu') {
+    menuRef.value?.setCheckedNodes(value ? (menuOptions.value as any) : []);
+  } else if (type == 'dept') {
+    deptRef.value?.setCheckedNodes(value ? (dataScopeDeptOptions.value as any) : []);
+  }
+};
+
+/** 树权限（父子联动） */
+const handleCheckedTreeConnect = (value: any, type: string) => {
+  if (type == 'menu') {
+    form.value.menuCheckStrictly = value;
+  } else if (type == 'dept') {
+    form.value.deptCheckStrictly = value;
+  }
+};
+
+/** 所有菜单节点数据 */
+const getMenuAllCheckedKeys = (): any => {
+  const checkedKeys = menuRef.value?.getCheckedKeys();
+  const halfCheckedKeys = menuRef.value?.getHalfCheckedKeys();
+  if (halfCheckedKeys) {
+    checkedKeys?.unshift(...halfCheckedKeys);
+  }
+  return checkedKeys;
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  roleFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      form.value.menuIds = getMenuAllCheckedKeys();
+      // 自动携带当前选中的部门id
+      if (selectedDeptId.value && !form.value.deptId) {
+        form.value.deptId = String(selectedDeptId.value);
+      }
+      form.value.roleId ? await updateRole(form.value) : await addRole(form.value);
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      getList();
+    }
+  });
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 选择角色权限范围触发 */
+const dataScopeSelectChange = (value: string) => {
+  if (value !== '2') {
+    deptRef.value?.setCheckedKeys([]);
+  }
+};
+
+/** 分配数据权限操作 */
+const handleDataScope = async (row: RoleVO) => {
+  const response = await getRole(row.roleId);
+  Object.assign(form.value, response.data);
+  const res = await getRoleDeptTreeSelect(row.roleId);
+  openDataScope.value = true;
+  dialog.title = '分配数据权限';
+  await nextTick(() => {
+    deptRef.value?.setCheckedKeys(res.checkedKeys);
+  });
+};
+
+/** 提交按钮（数据权限） */
+const submitDataScope = async () => {
+  if (form.value.roleId) {
+    form.value.deptIds = getDeptAllCheckedKeys();
+    await dataScope(form.value);
+    proxy?.$modal.msgSuccess('修改成功');
+    openDataScope.value = false;
+    getList();
+  }
+};
+
+/** 取消按钮（数据权限） */
+const cancelDataScope = () => {
+  dataScopeRef.value?.resetFields();
+  form.value = { ...initForm };
+  openDataScope.value = false;
+};
+
+onMounted(() => {
+  getDeptTree();
+  getList();
+});
+</script>

zdxt-web-client/zdxt-admin-plus-ui/src/views/system/user/index.vue

@@ -3,20 +3,22 @@
     <el-row :gutter="20">
       <!-- 部门树 -->
       <el-col :lg="4" :xs="24" style="">
-        <el-card shadow="hover">
+        <el-card shadow="hover" style="position: sticky; top: 0;">
           <el-input v-model="deptName" placeholder="请输入部门名称" prefix-icon="Search" clearable/>
-          <el-tree
+          <div style="max-height: calc(100vh - 180px); overflow-y: auto; overflow-x: hidden;">
-            ref="deptTreeRef"
+            <el-tree
-            class="mt-2"
+              ref="deptTreeRef"
-            node-key="id"
+              class="mt-2"
-            :data="deptOptions"
+              node-key="id"
-            :props="{ label: 'label', children: 'children' } as any"
+              :data="deptOptions"
-            :expand-on-click-node="false"
+              :props="{ label: 'label', children: 'children' } as any"
-            :filter-node-method="filterNode"
+              :expand-on-click-node="false"
-            highlight-current
+              :filter-node-method="filterNode"
-            :default-expanded-keys="deptExpandedKeys"
+              highlight-current
-            @node-click="handleNodeClick"
+              :default-expanded-keys="deptExpandedKeys"
-          />
+              @node-click="handleNodeClick"
+            />
+          </div>
         </el-card>
       </el-col>
       <el-col :lg="20" :xs="24">