From c7ff3b73e5a42e6adc923c72b118b3134daf58ed Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期四, 29 八月 2024 09:34:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/views/authority/users/index.vue | 11 ++++++++---
src/components/navbar/index.vue | 2 +-
src/api/authority.ts | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/api/authority.ts b/src/api/authority.ts
index 59856c8..8f445ae 100644
--- a/src/api/authority.ts
+++ b/src/api/authority.ts
@@ -13,7 +13,7 @@
createTime: string;
status: string;
psw: string;
- role: string;
+ role: string[];
roleName: string;
}
diff --git a/src/components/navbar/index.vue b/src/components/navbar/index.vue
index bb5982e..f817edc 100644
--- a/src/components/navbar/index.vue
+++ b/src/components/navbar/index.vue
@@ -186,7 +186,7 @@
</a-dropdown>
</li>
<li style="padding: 0">
- <a-dropdown trigger="click" @select="changeLocale as any">
+ <a-dropdown trigger="click">
<div> {{ name }}</div>
<template #content>
<a-doption>
diff --git a/src/views/authority/users/index.vue b/src/views/authority/users/index.vue
index 80c265d..2dbda97 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');
@@ -540,6 +541,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 +549,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