From 432d47bd7fa2eac4f084f7f1dfdef452de760ae8 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期一, 02 九月 2024 10:21:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/views/authority/users/index.vue | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/views/authority/users/index.vue b/src/views/authority/users/index.vue
index 55d397e..068e9b5 100644
--- a/src/views/authority/users/index.vue
+++ b/src/views/authority/users/index.vue
@@ -177,6 +177,7 @@
:rules="[{ required: true, message: '瑙掕壊蹇呴��' }]"
>
<a-select
+ multiple
v-model="editform.role"
:options="roles"
:field-names="fieldNames"
@@ -328,7 +329,6 @@
let checkStrictlyAgent = ref([]);
let formRef = ref();
-
let menuTips = ref(['鏉冮檺绠＄悊', '璐﹀彿']);
type SizeProps = 'mini' | 'small' | 'medium' | 'large';
const account = ref(null);
@@ -355,7 +355,7 @@
loginName: '',
userName: '',
psw: '',
- role: '',
+ role: [],
});
let size = ref<SizeProps>('medium');
@@ -448,13 +448,12 @@
const statusChange = async (value, record) => {
if (record?.dept) {
- await Userstatus(record.userId, value).then((res) => {
- });
+ await Userstatus(record.userId, value).then((res) => {});
} else {
- record.status = "0";
+ record.status = '0';
Modal.warning({
title: '鎻愮ず',
- content: '濡傛兂鍚敤鐢ㄦ埛锛岄渶杩涜閮ㄩ棬閰嶇疆.'
+ content: '濡傛兂鍚敤鐢ㄦ埛锛岄渶杩涜閮ㄩ棬閰嶇疆.',
});
}
};
@@ -490,21 +489,23 @@
...editform.value,
} as unknown as User).then((res) => {
fetchData();
- uuu=res.data;
+ uuu = res.data;
});
} else {
await UserAdd({
...editform.value,
} as unknown as User).then((res) => {
fetchData();
- uuu=res.data;
+ uuu = res.data;
});
}
- deptvisible.value = true;
- checkedKeys.value = [];
- expandKdys.value = [];
- checkStrictly.value = [];
- selectUser.value = uuu;
+ if (uuu.dept?false:true) {
+ deptvisible.value = true;
+ checkedKeys.value = [];
+ expandKdys.value = [];
+ checkStrictly.value = [];
+ selectUser.value = uuu;
+ }
}
};
const editHandleOk = () => {
@@ -542,6 +543,7 @@
if (t == 2) {
visible.value = true;
formRef.value?.resetFields();
+ editform.value.role=[];
save.value = '缂栬緫';
editform.value.userId = record.userId;
editform.value.userName = record.userName;
@@ -549,7 +551,10 @@
editform.value.email = record.email;
editform.value.phoneNumber = record.phoneNumber;
if (record.roles?.length > 0) {
- editform.value.role = record.roles[0].roleId;
+ //閬嶅巻record.roles
+ record.roles.forEach((val) => {
+ editform.value.role.push(val.roleId);
+ })
}
}
//鍒犻櫎
--
Gitblit v1.8.0