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 | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/authority/users/index.vue b/src/views/authority/users/index.vue
index 80c265d..068e9b5 100644
--- a/src/views/authority/users/index.vue
+++ b/src/views/authority/users/index.vue
@@ -168,7 +168,7 @@
<a-form-item field="psw" label="瀵嗙爜">
<a-input v-model="editform.psw" />
</a-form-item>
- </a-coladmin
+ </a-col>
<a-col :span="10">
<a-form-item
required
@@ -177,6 +177,7 @@
:rules="[{ required: true, message: '瑙掕壊蹇呴��' }]"
>
<a-select
+ multiple
v-model="editform.role"
:options="roles"
:field-names="fieldNames"
@@ -354,7 +355,7 @@
loginName: '',
userName: '',
psw: '',
- role: '',
+ role: [],
});
let size = ref<SizeProps>('medium');
@@ -498,11 +499,13 @@
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 = () => {
@@ -540,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;
@@ -547,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