From 0108df13340210bebd5ad6c693fc1a6bd1b061ff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 05 三月 2024 22:57:51 +0800
Subject: [PATCH] !88 合并flowable工作流功能 * merge 合并dev * add 添加抄送查询 * add 添加我的已办 * add 添加抄送 * add 添加附件下载 * update 优化类型 * Merge remote-tracking branch 'origin/future/flowable' into future/flowable * fix 修复 流程设计器打包部署报错问题 * add 添加审批附件上传 * update 修复固定值未在xml显示问题 * update 修复跳转条件回显Object问题 * update 优化面板文件名称 * update 调整key * remove 移除旧设计器，添加xml保存 * update 增加任务面板提示 * update 优化xml预览和svg预览 * update 优化xml预览和svg预览 * update 优化模型设计 * update 优化设计器 * update 优化设计器 * update 优化设计器 * update 删除旧设计器 * update 删除console.log * add 添加模型接口 * update 优化预览xml和svg样式被修改问题 * update 优化属性面板，增加展开动画 * update 去除开发模式 * update 优化任务栏样式 * update 优化图标渲染样式 * update 增加BpmnFactory类型 * update 增加BpmnFactory * update 移除users和group * update 移除无用类型 * update 优化页面类型 * update 去除多余属性 * update 完善流程线 * update 增加复杂网关 * update 完善流程 * update 完善网关 * update 优化网关汉化 * update 优化过期时间选择 * update 支持多实例 * update 增加类容提示 * update 支持选择组 * update 新增角色api * update 优化roleSelect 选中未确定，再次打开还保留选中的问题 * update 优化userSelect 选中未确定，再次打开还保留选中的问题 * update 优化userSelect 选中未确定，再次打开还保留选中的问题 * update 去掉modeler store多余属性 bpmnModel * update 优化属性面板，当面板未选中时默认展示流程面板 * update 优化TaskPanel类型，去掉roles属性 * update 优化用户api * update 优化用户选择器 * update 优化执行监听器 * update 优化任务监听器 * update 优化usePanel方法 * update 选人优化 * update 增加扩展节点信息 * update 增加usePanel默认方法 * update 去除处理事件 * update 扩展flowable userinfo属性 * update 全局modeler 改为非响应式 * update 增加hooks方法 * update 修改命名 * update 修改面板formData来源 * update 重写用户任务面板选择逻辑 * update 重写用户任务面板选择逻辑 * update 修改用户选择组件获取数据逻辑 * update 修改枚举类型 * update 修改默认配置列 * update 增加修改节点方法 * update 调整预览窗口大小 * update 优化用户选择组件 返回值 * update 优化用户选择组件 * update 新增通过ids 获取用户信息 * update 重写task面板选人 未完成 * update 升级用户选择 支持多选配置 * update 升级bpmnjs依赖版本 * update 增加useDialog类型 * update 调整全局样式 * update 代码高亮设置 * update 优化领用，归还加载 * update 增加选择角色 * update 新增角色选择组件 * update 新增过期时间选择组件 * update 调整任务面板样式 * update 调整全局dialog header 增加分割线 * update 代码高亮设置 * update 调整面板位置 * update 封装用户选择组件 * update 移除所有的节点描述 * update 删除分类 * update 调整面板位置 * update 修改命名，增加自定义渲染 * update 修改命名，增加自定义渲染 * update 增加 Element类型定义 * update 调整样式 * update 移除bpmn panel依赖，升级bpmn.js依赖到最新，修改汉化包 * update 调整类型声明文件 * update 调整类型声明文件 * update 优化面板工具 * update 优化面板工具 * Merge remote-tracking branch 'origin/future/flowable' into future/flowable * update 优化面板工具 * Merge branch 'future/flowable' of https://gitee.com/JavaLionLi/plus-ui… * add 添加修改办理人 * update 优化面板工具 * update 初始化流程数据 * Merge remote-tracking branch 'origin/future/flowable' into future/flowable * add 流程设计面板 * update 调整初始化xml * add 任务面板 * add 新增bpmn.js * update 优化request请求类判断请求头方式 * update 流程定义预览 优化 * update 流程定义预览 优化 * update 去掉console.log * update 优化工作流代码 * fix 修复待办任务 重置查询条件失效问题 * add 增加待办任务 接口类型，优化页面 * add 增加vite 启动预编译css * fix 修复i18n无感刷新问题 * Merge branch 'dev' into future/flowable * update 调整选择请假事件 * Merge branch 'dev' into future/flowable * 同步dev代码 * Merge branch 'dev' into future/flowable * 合并dev * remove 设计器无用代码 调整请假查询 * update 调整请假申请 * update 移动请假表单包结构，调整设计器选择引用表单请求错误 * remove 移除动态表单 * update 调整流程办理 * Merge branch 'dev' into future/flowable * Merge branch 'dev' into future/flowable * Merge branch 'dev' into future/flowable * Merge branch 'dev' into future/flowable * 合并 * update 调整请假申请流程提交 * update 修改业务单据流程提交 * update 调整业务单据流程提交 * 优化代码 * 优化工作流代码缩进 * 项目格式化配置修改 * 调整代码缩进 * Merge branch 'ts' into future/flowable * add 添加动态表单提交流程 * add 添加动态表单单据 * add 新增流程定义与表单关联 * update 调整点击左侧部门查询人员，部门刷新问题 * update 调整按钮图标 * 调整错别字 * update 调整流程定义图片预览 * add 添加流程实例迁移版本 * fix 修复我的单据无法提交问题 * Merge branch 'ts' into future/flowable * remove 还原代码后端解决 * update 流程设计器中分配发起人变量错误，先移除 * fix 修复设计器无法编辑问题 * update 调整设计器请求头 * Merge branch 'ts' into future/flowable * Merge branch 'ts' into future/flowable * add 添加流程定义历史列表 * update 审批记录v2改为v3 * update 调整请假必填项 * add 添加请假申请示例，添加流程定义文件部署 * update 移除流程表单 formConfig 属性，表单配置信息都放一起便于使用。 * add 添加任务加签，减签 * update 调整流程作废 * update 优化流程状态 * add 添加任务驳回 * add 添加查询当前租户所有待办，已办任务 * add 增加审批意见 * add 添加流程办理弹窗确认组件 * add 添加任务作废理由 * update 调整流程实例，流程定义检索 * add 添加我的单据页面 * add 添加任务归还认领 * add 添加流程实例，流程定义分类查询 * add 添加模型分类查询 * add 添加流程分类 * Merge remote-tracking branch 'origin/future/flowable' into future/flowable * add 添加流程表单管理页面 * add 集成vForm动态表单组件 * update xml调整超出滚动 * add 添加已办列表 * add 添加单据状态 * update 优化流程实例删除 * fix 修复流程实例查询挂起状态错误 * update 调整流程实例挂起激活状态 * add 添加流程实例列表 * update 调整流程定义弹窗提示 * add 添加流程定义列表，添加流程图，xml预览，添加简单流程启动，办理 * 调整审批记录悬浮逻辑 * 删除无用代码 * add 添加节点悬浮信息 * 调整流程预览 * 调整流程追踪 * add 添加审批记录 * add 模型设计的types * update 修改排版 * add lang=ts * update 修改ele的废弃api * fix调整审批记录图片不显示问题 * add 添加任务待办,流程图 * 调整设计器关闭 * add 添加待办 * remove 删除无用代码 * update types * 添加模型token验证 * 隐藏设计器验证按钮，隐藏表单，案例，应用程序等 * 添加模型部署 * 添加画图接口token，优化画图接口 * 添加工作流模型新增，修改，查询，删除,画图工具
---
src/views/system/user/index.vue | 312 +++++++++++++++++++++++++++++-----------------------
1 files changed, 174 insertions(+), 138 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 284d941..dfbd789 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -6,8 +6,8 @@
<el-card shadow="hover">
<el-input v-model="deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" prefix-icon="Search" clearable />
<el-tree
- class="mt-2"
ref="deptTreeRef"
+ class="mt-2"
node-key="id"
:data="deptOptions"
:props="{ label: 'label', children: 'children' }"
@@ -21,7 +21,7 @@
</el-col>
<el-col :lg="20" :xs="24">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div class="mb-[10px]" v-show="showSearch">
+ <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
@@ -42,7 +42,7 @@
<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-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
value-format="YYYY-MM-DD"
@@ -53,8 +53,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="handleQuery" icon="Search">鎼滅储</el-button>
- <el-button @click="resetQuery" icon="Refresh">閲嶇疆</el-button>
+ <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>
@@ -65,15 +65,15 @@
<template #header>
<el-row :gutter="10">
<el-col :span="1.5">
- <el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:user:add']" icon="Plus">鏂板</el-button>
+ <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="success" plain @click="handleUpdate()" :disabled="single" v-has-permi="['system:user:add']" icon="Edit">
+ <el-button v-has-permi="['system:user:add']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
淇敼
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain @click="handleDelete()" :disabled="multiple" v-has-permi="['system:user:delete']" icon="Delete">
+ <el-button v-has-permi="['system:user:delete']" type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()">
鍒犻櫎
</el-button>
</el-col>
@@ -85,38 +85,31 @@
></el-button>
<template #dropdown>
<el-dropdown-menu>
- <el-dropdown-item @click="importTemplate" icon="Download">涓嬭浇妯℃澘</el-dropdown-item>
- <el-dropdown-item @click="handleImport" icon="Top"> 瀵煎叆鏁版嵁</el-dropdown-item>
- <el-dropdown-item @click="handleExport" icon="Download"> 瀵煎嚭鏁版嵁</el-dropdown-item>
+ <el-dropdown-item icon="Download" @click="importTemplate">涓嬭浇妯℃澘</el-dropdown-item>
+ <el-dropdown-item icon="Top" @click="handleImport"> 瀵煎叆鏁版嵁</el-dropdown-item>
+ <el-dropdown-item icon="Download" @click="handleExport"> 瀵煎嚭鏁版嵁</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true"></right-toolbar>
+ <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
- <el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
- <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
- <el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
- <el-table-column
- label="閮ㄩ棬"
- align="center"
- key="deptName"
- prop="dept.deptName"
- v-if="columns[3].visible"
- :show-overflow-tooltip="true"
- />
- <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
- <el-table-column label="鐘舵��" align="center" key="status" v-if="columns[5].visible">
+ <el-table-column v-if="columns[0].visible" key="userId" label="鐢ㄦ埛缂栧彿" align="center" prop="userId" />
+ <el-table-column v-if="columns[1].visible" key="userName" label="鐢ㄦ埛鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" />
+ <el-table-column v-if="columns[2].visible" key="nickName" label="鐢ㄦ埛鏄电О" align="center" prop="nickName" :show-overflow-tooltip="true" />
+ <el-table-column v-if="columns[3].visible" key="deptName" label="閮ㄩ棬" align="center" prop="deptName" :show-overflow-tooltip="true" />
+ <el-table-column v-if="columns[4].visible" key="phonenumber" label="鎵嬫満鍙风爜" align="center" prop="phonenumber" width="120" />
+ <el-table-column v-if="columns[5].visible" key="status" label="鐘舵��" align="center">
<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" v-if="columns[6].visible" width="160">
+ <el-table-column v-if="columns[6].visible" label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="160">
<template #default="scope">
<span>{{ scope.row.createTime }}</span>
</template>
@@ -124,19 +117,19 @@
<el-table-column label="鎿嶄綔" fixed="right" width="180" class-name="small-padding fixed-width">
<template #default="scope">
- <el-tooltip content="淇敼" placement="top" v-if="scope.row.userId !== 1">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+ <el-tooltip v-if="scope.row.userId !== 1" content="淇敼" placement="top">
+ <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
</el-tooltip>
- <el-tooltip content="鍒犻櫎" placement="top" v-if="scope.row.userId !== 1">
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+ <el-tooltip v-if="scope.row.userId !== 1" content="鍒犻櫎" placement="top">
+ <el-button v-hasPermi="['system:user:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
</el-tooltip>
- <el-tooltip content="閲嶇疆瀵嗙爜" placement="top" v-if="scope.row.userId !== 1">
- <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
+ <el-tooltip v-if="scope.row.userId !== 1" content="閲嶇疆瀵嗙爜" placement="top">
+ <el-button v-hasPermi="['system:user:resetPwd']" link type="primary" icon="Key" @click="handleResetPwd(scope.row)"></el-button>
</el-tooltip>
- <el-tooltip content="鍒嗛厤瑙掕壊" placement="top" v-if="scope.row.userId !== 1">
- <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+ <el-tooltip v-if="scope.row.userId !== 1" content="鍒嗛厤瑙掕壊" placement="top">
+ <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"></el-button>
</el-tooltip>
</template>
</el-table-column>
@@ -144,9 +137,9 @@
<pagination
v-show="total > 0"
- :total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
+ :total="total"
@pagination="getList"
/>
</el-card>
@@ -154,8 +147,8 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
- <el-dialog ref="formDialogRef" :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body @close="closeDialog">
- <el-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
+ <el-dialog ref="formDialogRef" v-model="dialog.visible" :title="dialog.title" width="600px" append-to-body @close="closeDialog">
+ <el-form ref="userFormRef" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
@@ -210,8 +203,7 @@
<el-col :span="12">
<el-form-item label="鐘舵��">
<el-radio-group v-model="form.status">
- <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
- dict.label }}</el-radio>
+ <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -261,7 +253,7 @@
</el-dialog>
<!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
- <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+ <el-dialog v-model="upload.open" :title="upload.title" width="400px" append-to-body>
<el-upload
ref="uploadRef"
:limit="1"
@@ -282,7 +274,7 @@
<div class="text-center el-upload__tip">
<div class="el-upload__tip"><el-checkbox v-model="upload.updateSupport" />鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�</div>
<span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
- <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">涓嬭浇妯℃澘</el-link>
+ <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">涓嬭浇妯℃澘</el-link>
</div>
</template>
</el-upload>
@@ -297,22 +289,21 @@
</template>
<script setup name="User" lang="ts">
-import api from "@/api/system/user"
+import api from '@/api/system/user';
import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
-import { treeselect } from "@/api/system/dept";
-import { DeptVO } from "@/api/system/dept/types";
-import { RoleVO } from "@/api/system/role/types";
-import { PostVO } from "@/api/system/post/types";
-import { to } from "await-to-js";
-import { globalHeaders } from "@/utils/request";
+import { DeptVO } from '@/api/system/dept/types';
+import { RoleVO } from '@/api/system/role/types';
+import { PostVO } from '@/api/system/post/types';
+import { treeselect } from '@/api/system/dept';
+import { globalHeaders } from '@/utils/request';
+import { to } from 'await-to-js';
const router = useRouter();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
-
const userList = ref<UserVO[]>();
const loading = ref(true);
-const showSearch = ref(true)
+const showSearch = ref(true);
const ids = ref<Array<number | string>>([]);
const single = ref(true);
const multiple = ref(true);
@@ -320,7 +311,7 @@
const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
const deptName = ref('');
const deptOptions = ref<DeptVO[]>([]);
-const initPassword = ref('123456');
+const initPassword = ref<string>('');
const postOptions = ref<PostVO[]>([]);
const roleOptions = ref<RoleVO[]>([]);
/*** 鐢ㄦ埛瀵煎叆鍙傛暟 */
@@ -328,7 +319,7 @@
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
open: false,
// 寮瑰嚭灞傛爣棰橈紙鐢ㄦ埛瀵煎叆锛�
- title: "",
+ title: '',
// 鏄惁绂佺敤涓婁紶
isUploading: false,
// 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
@@ -336,19 +327,18 @@
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
headers: globalHeaders(),
// 涓婁紶鐨勫湴鍧�
- url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
-})
+ url: import.meta.env.VITE_APP_BASE_API + '/system/user/importData'
+});
// 鍒楁樉闅愪俊鎭�
const columns = ref<FieldOption[]>([
- { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: false,children: [] },
- { key: 1, label: `鐢ㄦ埛鍚嶇О`, visible: true,children: [] },
- { key: 2, label: `鐢ㄦ埛鏄电О`, visible: true,children: [] },
- { key: 3, label: `閮ㄩ棬`, visible: true,children: [] },
- { key: 4, label: `鎵嬫満鍙风爜`, visible: true,children: [] },
- { key: 5, label: `鐘舵�乣, visible: true,children: [] },
- { key: 6, label: `鍒涘缓鏃堕棿`, visible: true,children: [] }
-])
-
+ { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: false, children: [] },
+ { key: 1, label: `鐢ㄦ埛鍚嶇О`, visible: true, children: [] },
+ { key: 2, label: `鐢ㄦ埛鏄电О`, visible: true, children: [] },
+ { key: 3, label: `閮ㄩ棬`, visible: true, children: [] },
+ { key: 4, label: `鎵嬫満鍙风爜`, visible: true, children: [] },
+ { key: 5, label: `鐘舵�乣, visible: true, children: [] },
+ { key: 6, label: `鍒涘缓鏃堕棿`, visible: true, children: [] }
+]);
const deptTreeRef = ref<ElTreeInstance>();
const queryFormRef = ref<ElFormInstance>();
@@ -370,12 +360,13 @@
phonenumber: undefined,
email: undefined,
sex: undefined,
- status: "0",
+ status: '0',
remark: '',
postIds: [],
roleIds: []
-}
-const data = reactive<PageData<UserForm, UserQuery>>({
+};
+
+const initData: PageData<UserForm, UserQuery> = {
form: { ...initFormData },
queryParams: {
pageNum: 1,
@@ -383,27 +374,60 @@
userName: '',
phonenumber: '',
status: '',
- deptId: ''
+ deptId: '',
+ roleId: ''
},
rules: {
- userName: [{ required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }, { min: 2, max: 20, message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿", trigger: "blur" }],
- nickName: [{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }],
- password: [{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, { min: 5, max: 20, message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", trigger: "blur" }],
- email: [{ type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
- phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" }]
+ userName: [
+ { required: true, message: '鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' },
+ {
+ min: 2,
+ max: 20,
+ message: '鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿',
+ trigger: 'blur'
+ }
+ ],
+ nickName: [{ required: true, message: '鐢ㄦ埛鏄电О涓嶈兘涓虹┖', trigger: 'blur' }],
+ password: [
+ { required: true, message: '鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖', trigger: 'blur' },
+ {
+ min: 5,
+ max: 20,
+ message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿',
+ trigger: 'blur'
+ },
+ { pattern: /^[^<>"'|\\]+$/, message: "涓嶈兘鍖呭惈闈炴硶瀛楃锛�< > \" ' \\\ |", trigger: "blur" }
+ ],
+ email: [
+ {
+ type: 'email',
+ message: '璇疯緭鍏ユ纭殑閭鍦板潃',
+ trigger: ['blur', 'change']
+ }
+ ],
+ phonenumber: [
+ {
+ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+ message: '璇疯緭鍏ユ纭殑鎵嬫満鍙风爜',
+ trigger: 'blur'
+ }
+ ]
}
-})
+};
+const data = reactive<PageData<UserForm, UserQuery>>(initData);
-const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data)
+const { queryParams, form, rules } = toRefs<PageData<UserForm, UserQuery>>(data);
/** 閫氳繃鏉′欢杩囨护鑺傜偣 */
const filterNode = (value: string, data: any) => {
- if (!value) return true
- return data.label.indexOf(value) !== -1
-}
+ if (!value) return true;
+ return data.label.indexOf(value) !== -1;
+};
/** 鏍规嵁鍚嶇О绛涢�夐儴闂ㄦ爲 */
watchEffect(
- () => { deptTreeRef.value?.filter(deptName.value); },
+ () => {
+ deptTreeRef.value?.filter(deptName.value);
+ },
{
flush: 'post' // watchEffect浼氬湪DOM鎸傝浇鎴栬�呮洿鏂颁箣鍓嶅氨浼氳Е鍙戯紝姝ゅ睘鎬ф帶鍒跺湪DOM鍏冪礌鏇存柊鍚庤繍琛�
}
@@ -422,29 +446,28 @@
loading.value = false;
userList.value = res.rows;
total.value = res.total;
-}
+};
/** 鑺傜偣鍗曞嚮浜嬩欢 */
const handleNodeClick = (data: DeptVO) => {
queryParams.value.deptId = data.id;
- handleQuery()
-}
-
+ handleQuery();
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1
- getList()
-}
+ queryParams.value.pageNum = 1;
+ getList();
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- dateRange.value = ['', '']
+ dateRange.value = ['', ''];
queryFormRef.value?.resetFields();
queryParams.value.pageNum = 1;
queryParams.value.deptId = undefined;
deptTreeRef.value?.setCurrentKey(undefined);
handleQuery();
-}
+};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: UserVO) => {
@@ -453,78 +476,90 @@
if (!err) {
await api.delUser(userIds);
await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
}
-}
+};
/** 鐢ㄦ埛鐘舵�佷慨鏀� */
const handleStatusChange = async (row: UserVO) => {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤"
+ let text = row.status === '0' ? '鍚敤' : '鍋滅敤';
try {
await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚�?');
await api.changeUserStatus(row.userId, row.status);
- proxy?.$modal.msgSuccess(text + "鎴愬姛");
+ proxy?.$modal.msgSuccess(text + '鎴愬姛');
} catch (err) {
- row.status = row.status === "0" ? "1" : "0";
+ row.status = row.status === '0' ? '1' : '0';
}
-}
+};
/** 璺宠浆瑙掕壊鍒嗛厤 */
const handleAuthRole = (row: UserVO) => {
const userId = row.userId;
- router.push("/system/user-auth/role/" + userId);
-}
+ router.push('/system/user-auth/role/' + userId);
+};
/** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
const handleResetPwd = async (row: UserVO) => {
- const [err, res] = await to(ElMessageBox.prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- closeOnClickModal: false,
- inputPattern: /^.{5,20}$/,
- inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
- }))
- if (!err) {
+ const [err, res] = await to(
+ ElMessageBox.prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ closeOnClickModal: false,
+ inputPattern: /^.{5,20}$/,
+ inputErrorMessage: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿',
+ inputValidator: (value) => {
+ if (/<|>|"|'|\||\\/.test(value)) {
+ return "涓嶈兘鍖呭惈闈炴硶瀛楃锛�< > \" ' \\\ |"
+ }
+ }
+ })
+ );
+ if (!err && res) {
await api.resetUserPwd(row.userId, res.value);
- proxy?.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + res.value);
+ proxy?.$modal.msgSuccess('淇敼鎴愬姛锛屾柊瀵嗙爜鏄細' + res.value);
}
-}
+};
/** 閫夋嫨鏉℃暟 */
const handleSelectionChange = (selection: UserVO[]) => {
ids.value = selection.map((item) => item.userId);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
/** 瀵煎叆鎸夐挳鎿嶄綔 */
const handleImport = () => {
- upload.title = "鐢ㄦ埛瀵煎叆";
+ upload.title = '鐢ㄦ埛瀵煎叆';
upload.open = true;
-}
+};
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("system/user/export", {
- ...queryParams.value,
- }, `user_${new Date().getTime()}.xlsx`);
+ proxy?.download(
+ 'system/user/export',
+ {
+ ...queryParams.value
+ },
+ `user_${new Date().getTime()}.xlsx`
+ );
};
/** 涓嬭浇妯℃澘鎿嶄綔 */
const importTemplate = () => {
- proxy?.download("system/user/importTemplate", {
- }, `user_template_${new Date().getTime()}.xlsx`);
-}
+ proxy?.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`);
+};
/**鏂囦欢涓婁紶涓鐞� */
const handleFileUploadProgress = () => {
upload.isUploading = true;
-}
+};
/** 鏂囦欢涓婁紶鎴愬姛澶勭悊 */
const handleFileSuccess = (response: any, file: UploadFile) => {
upload.open = false;
upload.isUploading = false;
uploadRef.value?.handleRemove(file);
- ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
+ ElMessageBox.alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '瀵煎叆缁撴灉', {
+ dangerouslyUseHTMLString: true
+ });
getList();
-}
+};
/** 鎻愪氦涓婁紶鏂囦欢 */
function submitFileForm() {
@@ -538,59 +573,57 @@
const { data } = await treeselect();
deptOptions.value = data;
}
-}
-
+};
/** 閲嶇疆鎿嶄綔琛ㄥ崟 */
const reset = () => {
form.value = { ...initFormData };
userFormRef.value?.resetFields();
-}
+};
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
dialog.visible = false;
reset();
-}
+};
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = async () => {
reset();
const { data } = await api.getUser();
dialog.visible = true;
- dialog.title = "鏂板鐢ㄦ埛";
+ dialog.title = '鏂板鐢ㄦ埛';
await initTreeData();
postOptions.value = data.posts;
roleOptions.value = data.roles;
- form.value.password = initPassword.value;
-}
+ form.value.password = initPassword.value.toString();
+};
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = async (row?: UserForm) => {
reset();
- const userId = row?.userId || ids.value[0]
- const { data } = await api.getUser(userId)
+ const userId = row?.userId || ids.value[0];
+ const { data } = await api.getUser(userId);
dialog.visible = true;
- dialog.title = "淇敼鐢ㄦ埛";
+ dialog.title = '淇敼鐢ㄦ埛';
await initTreeData();
Object.assign(form.value, data.user);
postOptions.value = data.posts;
roleOptions.value = data.roles;
form.value.postIds = data.postIds;
form.value.roleIds = data.roleIds;
- form.value.password = "";
-}
+ form.value.password = '';
+};
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
userFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
dialog.visible = false;
await getList();
}
- })
-}
-
+ });
+};
/**
* 鍏抽棴鐢ㄦ埛寮圭獥
@@ -598,7 +631,7 @@
const closeDialog = () => {
dialog.visible = false;
resetForm();
-}
+};
/**
* 閲嶇疆琛ㄥ崟
@@ -609,10 +642,13 @@
form.value.id = undefined;
form.value.status = '1';
-}
+};
onMounted(() => {
- getTreeSelect() // 鍒濆鍖栭儴闂ㄦ暟鎹�
- getList() // 鍒濆鍖栧垪琛ㄦ暟鎹�
+ getTreeSelect(); // 鍒濆鍖栭儴闂ㄦ暟鎹�
+ getList(); // 鍒濆鍖栧垪琛ㄦ暟鎹�
+ proxy?.getConfigKey('sys.user.initPassword').then((response) => {
+ initPassword.value = response.data;
+ });
});
</script>
--
Gitblit v1.9.3