From ba5b8c77c3071722d00f9d1e1878cb8a4efd06d7 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 28 十月 2022 20:35:50 +0800
Subject: [PATCH] 定时任务支持在线生成cron表达式
---
src/views/system/user/index.vue | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index da3a501..9d12a17 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -19,6 +19,7 @@
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="deptTreeRef"
+ node-key="id"
highlight-current
default-expand-all
@node-click="handleNodeClick"
@@ -350,8 +351,7 @@
<script setup name="User">
import { getToken } from "@/utils/auth";
-import { treeselect } from "@/api/system/dept";
-import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser } from "@/api/system/user";
+import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
const router = useRouter();
const { proxy } = getCurrentInstance();
@@ -429,8 +429,8 @@
proxy.$refs["deptTreeRef"].filter(val);
});
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
-function getTreeselect() {
- treeselect().then(response => {
+function getDeptTree() {
+ deptTreeSelect().then(response => {
deptOptions.value = response.data;
});
};
@@ -457,6 +457,8 @@
function resetQuery() {
dateRange.value = [];
proxy.resetForm("queryRef");
+ queryParams.value.deptId = undefined;
+ proxy.$refs.tree.setCurrentKey(null);
handleQuery();
};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
@@ -550,15 +552,6 @@
function submitFileForm() {
proxy.$refs["uploadRef"].submit();
};
-/** 鍒濆鍖栭儴闂ㄦ暟鎹� */
-function initTreeData() {
- // 鍒ゆ柇閮ㄩ棬鐨勬暟鎹槸鍚﹀瓨鍦紝瀛樺湪涓嶈幏鍙栵紝涓嶅瓨鍦ㄥ垯鑾峰彇
- if (deptOptions.value === undefined) {
- treeselect().then(response => {
- deptOptions.value = response.data;
- });
- }
-};
/** 閲嶇疆鎿嶄綔琛ㄥ崟 */
function reset() {
form.value = {
@@ -585,7 +578,6 @@
/** 鏂板鎸夐挳鎿嶄綔 */
function handleAdd() {
reset();
- initTreeData();
getUser().then(response => {
postOptions.value = response.posts;
roleOptions.value = response.roles;
@@ -597,7 +589,6 @@
/** 淇敼鎸夐挳鎿嶄綔 */
function handleUpdate(row) {
reset();
- initTreeData();
const userId = row.userId || ids.value;
getUser(userId).then(response => {
form.value = response.data;
@@ -631,6 +622,6 @@
});
};
-getTreeselect();
+getDeptTree();
getList();
</script>
--
Gitblit v1.9.3