From e423d8afcf5b9666e166565d0509b621ebab17e7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 一月 2025 14:11:00 +0800
Subject: [PATCH] !172 合并 warmflow 功能分支 * update 优化 流程定义页面 点击复制之后跳转到未发布列表 * update 优化 流程定义页面 增加加载loading层 * fix: v-model处理有延迟 需要手动处理 * update 调整流程定义查询 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整可驳回的节点 * update: 调整文案 * update: 激活/挂起改为switch操作 * update 优化 代码删除无用输出 * update 统一抄送人使用昵称展示 * update 调整分类接口 * update 统一业务id参数 * update 删除默认顶节点 * !168 优化流程分类 * update 恢复误删除代码 * update 优化流程分类 * update 修复 路由跳转未改全 * [update] * fix 修复一些问题 * update 重构流程分类表 * update 流程定义增加表单路径与编辑功能 修复一些其他bug * fix 修复 一些问题 * update 变量统一命名 * add 增加示例 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * update 调整办理人 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 增加示例 * update 调整审批记录 添加流程导出 * remove 删除无用代码 * remove 删除无用代码 * [update] * [fix] * 流程干预删除委托 * 增加附件 * 附件修改 * 申请人查询修改 * 1.修改查询条件 * !167 fix 修复 import路径修改不全问题 * fix 修复 import路径修改不全问题 * !166 update 清除 ProcessPreview 引用 * update 清除 ProcessPreview 引用 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * fix 修复 前端路径修改不全问题 * update 优化接口请求路径 * add 添加作废 * add 添加流程干预 * update 调整加签，减签 * update 调整加签，减签 * add 增加流程查看 * update 调整委托，转办 * update 调整流程变量显示 * update 调整办理人修改 * update 调整流程实例状态页面 * update 调整已办页面 * add 添加流程撤销 * update 调整任务，流程实例 ，流程定义页面 * Merge branch 'dev' into warm-flw-future * update 调整流程定义页面 * add 添加流程变量查看 * update 调整设计器路由名称 * update 调整办理人 * update 调整设计器uri * update 调整设计器请求uri 调整待办状态 * update 调整办理 驳回 终止等状态 * add 添加模型新增 * add 添加warm-ui设计器,删除无用代码 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 添加流程设计 * update 调整驳回 * update 调整视图类型错误 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * 添加已办，未办 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整流程实例，待办查询 * add 添加代办人，调整提交按钮校验 * update 调整流程定义查询 * add添加流程定义激活 挂起 * add 添加流程文件部署 调整流程发布 * update 优化 时间搜索组件统一 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * fix 修复 用户管理编辑安全权限错误问题 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 优化 类型报错问题 * update 优化 切换租户后刷新首页 * update 优化 实现表格行选中切换 * update 优化 使用 vueuse 重构 websocket 实现 * update 优化 使用 vueuse 重构 websocket 实现 * fix 修复 登出后重新登录 sse推送报错问题 * reset 回滚 代码修改 采用其他方案 * fix 修复 登出后重新登录 sse推送报错问题 * update 优化 删除无用代码 * update element-plus 2.7.5 => 2.7.8 * reset 回滚 错误修复 * update 优化 代码生成器编辑页禁用缓存 防止同步后页面不更新问题 * fix 修复 代码生成同步点击取消报错问题 * 初始化添加warm-flow
---
src/views/system/user/authRole.vue | 174 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 93 insertions(+), 81 deletions(-)
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 0616f67..070221a 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -1,9 +1,66 @@
+<template>
+ <div class="p-2">
+ <div class="panel">
+ <h4 class="panel-title">鍩烘湰淇℃伅</h4>
+ <el-form :model="form" :inline="true">
+ <el-row :gutter="10">
+ <el-col :span="2.5">
+ <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
+ <el-input v-model="form.nickName" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="2.5">
+ <el-form-item label="鐧诲綍璐﹀彿" prop="userName">
+ <el-input v-model="form.userName" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ <div class="panel">
+ <h4 class="panel-title">瑙掕壊淇℃伅</h4>
+ <div>
+ <el-table
+ ref="tableRef"
+ v-loading="loading"
+ :row-key="getRowKey"
+ :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+ @row-click="clickRow"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column label="搴忓彿" width="55" type="index" align="center">
+ <template #default="scope">
+ <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
+ <el-table-column label="瑙掕壊缂栧彿" align="center" prop="roleId" />
+ <el-table-column label="瑙掕壊鍚嶇О" align="center" prop="roleName" />
+ <el-table-column label="鏉冮檺瀛楃" align="center" prop="roleKey" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <template #default="scope">
+ <span>{{ parseTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination v-show="total > 0" v-model:page="pageNum" v-model:limit="pageSize" :total="total" />
+ <div style="text-align: center; margin-left: -120px; margin-top: 30px">
+ <el-button type="primary" @click="submitForm()">鎻愪氦</el-button>
+ <el-button @click="close()">杩斿洖</el-button>
+ </div>
+ <div></div>
+ </div>
+ </div>
+ </div>
+</template>
+
<script setup name="AuthRole" lang="ts">
import { RoleVO } from '@/api/system/role/types';
import { getAuthRole, updateAuthRole } from '@/api/system/user';
import { UserForm } from '@/api/system/user/types';
-import { ElTable } from "element-plus";
-import { ComponentInternalInstance } from 'vue';
+import { RouteLocationNormalized } from 'vue-router';
+import { parseTime } from '@/utils/ruoyi';
+
const route = useRoute();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -19,15 +76,16 @@
userId: undefined
});
-const tableRef = ref(ElTable)
+const tableRef = ref<ElTableInstance>();
/** 鍗曞嚮閫変腑琛屾暟鎹� */
const clickRow = (row: RoleVO) => {
- tableRef.value.toggleRowSelection(row);
+ row.flag = !row.flag;
+ tableRef.value?.toggleRowSelection(row, row.flag);
};
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: RoleVO[]) => {
- roleIds.value = selection.map(item => item.roleId);
+ roleIds.value = selection.map((item) => item.roleId);
};
/** 淇濆瓨閫変腑鐨勬暟鎹紪鍙� */
const getRowKey = (row: RoleVO): string => {
@@ -35,93 +93,47 @@
};
/** 鍏抽棴鎸夐挳 */
const close = () => {
- const obj = { path: "/system/user" };
+ const obj: RouteLocationNormalized = {
+ fullPath: '',
+ hash: '',
+ matched: [],
+ meta: undefined,
+ name: undefined,
+ params: undefined,
+ query: undefined,
+ redirectedFrom: undefined,
+ path: '/system/user'
+ };
proxy?.$tab.closeOpenPage(obj);
};
/** 鎻愪氦鎸夐挳 */
const submitForm = async () => {
const userId = form.value.userId;
- const rIds = roleIds.value.join(",");
- await updateAuthRole({ userId: userId as string, roleIds: rIds })
- proxy?.$modal.msgSuccess("鎺堟潈鎴愬姛");
- close();
+ const rIds = roleIds.value.join(',');
+ await updateAuthRole({ userId: userId as string, roleIds: rIds });
+ proxy?.$modal.msgSuccess('鎺堟潈鎴愬姛');
+ close();
};
-const getList = async() => {
+const getList = async () => {
const userId = route.params && route.params.userId;
if (userId) {
loading.value = true;
- const res = await getAuthRole(userId as string);
- Object.assign(form.value, res.data.user)
- Object.assign(roles.value, res.data.roles)
- total.value = roles.value.length;
- await nextTick(() => {
- roles.value.forEach(row => {
- if (row?.flag) {
- tableRef.value.toggleRowSelection(row);
- }
- });
- });
- loading.value = false;
+ const res = await getAuthRole(userId as string);
+ Object.assign(form.value, res.data.user);
+ Object.assign(roles.value, res.data.roles);
+ total.value = roles.value.length;
+ await nextTick(() => {
+ roles.value.forEach((row) => {
+ if (row?.flag) {
+ tableRef.value?.toggleRowSelection(row, true);
+ }
+ });
+ });
+ loading.value = false;
}
-}
+};
onMounted(() => {
getList();
-})
+});
</script>
-
-<template>
- <div class="p-2">
- <div class="panel">
- <h4 class="panel-title">鍩烘湰淇℃伅</h4>
- <el-form :model="form" label-width="80px" :inline="true">
- <el-row :gutter="10">
- <el-col :span="2.5">
- <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
- <el-input v-model="form.nickName" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="2.5">
- <el-form-item label="鐧诲綍璐﹀彿" prop="userName">
- <el-input v-model="form.userName" disabled />
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- </div>
- <div class="panel">
- <h4 class="panel-title">瑙掕壊淇℃伅</h4>
- <div>
- <el-table
- v-loading="loading"
- :row-key="getRowKey"
- @row-click="clickRow"
- ref="tableRef"
- @selection-change="handleSelectionChange"
- :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
- >
- <el-table-column label="搴忓彿" width="55" type="index" align="center">
- <template #default="scope">
- <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
- </template>
- </el-table-column>
- <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
- <el-table-column label="瑙掕壊缂栧彿" align="center" prop="roleId" />
- <el-table-column label="瑙掕壊鍚嶇О" align="center" prop="roleName" />
- <el-table-column label="鏉冮檺瀛楃" align="center" prop="roleKey" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
- <template #default="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
- </el-table>
- <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
- <div style="text-align: center;margin-left:-120px;margin-top:30px;">
- <el-button type="primary" @click="submitForm()">鎻愪氦</el-button>
- <el-button @click="close()">杩斿洖</el-button>
- </div>
- <div></div>
- </div>
- </div>
- </div>
-</template>
--
Gitblit v1.9.3