From 3240c5848007847c9110c855ce8ed044e767bbec Mon Sep 17 00:00:00 2001
From: "wu.jifen" <wu.jifen@ebiz-digits.com>
Date: Wed, 23 Apr 2025 19:41:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=96=B0=E5=A2=9E=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91:=E8=8E=B7=E5=8F=96=E8=A7=92=E8=89=B2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/role.js                        |  8 ++++
 .../system/user/components/UserDialog.vue     | 40 +++++++++++++++----
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/api/system/role.js b/src/api/system/role.js
index 8fda311..21df324 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -42,3 +42,11 @@ export function getRolePage(data) {
     data
   })
 }
+// 角色列表
+export function getRoleList(data) {
+  return request({
+    url: getUrl('/sysRole/list'),
+    method: 'post',
+    data
+  })
+}
diff --git a/src/views/system/user/components/UserDialog.vue b/src/views/system/user/components/UserDialog.vue
index 68ba45d..eb28b3c 100644
--- a/src/views/system/user/components/UserDialog.vue
+++ b/src/views/system/user/components/UserDialog.vue
@@ -33,9 +33,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="用户角色" prop="userRoles">
-            <el-select v-model="form.userRoles" placeholder="请选择用户角色" clearable size="small" :disabled="isView">
-              <el-option v-for="item in roleOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-form-item label="用户角色" prop="sysUserRoleDTOs">
+            <el-select v-model="selectedRoleIds" multiple placeholder="请选择用户角色" clearable size="small" :disabled="isView" @change="handleRolesChange">
+              <el-option v-for="item in roleListData" :key="item.id" :label="item.roleName" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -53,6 +53,7 @@
 
 <script>
 import { addUser, updateUser } from '@/api/generatedApi/system'
+import { getRoleList } from '@/api/system/role'
 
 export default {
   name: 'UserDialog',
@@ -81,18 +82,15 @@ export default {
   data() {
     return {
       form: {
-        userRoles: '',
         userCode: '',
         userName: '',
-        status: 0,
-        dingtalkId: '',
-        password: '',
         realName: '',
-        jobNo: '',
         mobile: '',
         email: '',
         sysUserRoleDTOs: []
       },
+      roleListData: [],
+      selectedRoleIds: [], // 新增，用于绑定选中的角色ID数组
       rules: {
         userCode: [{ required: true, message: '请输入用户编码', trigger: 'blur' }],
         userName: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
@@ -112,7 +110,29 @@ export default {
       immediate: true
     }
   },
+  created() {
+    this.getRoleListData()
+  },
   methods: {
+    // 获取角色列表
+    getRoleListData() {
+      this.loading = true
+
+      getRoleList({})
+        .then(response => {
+          if (response.code === '0') {
+            this.roleListData = response.content.content || []
+          } else {
+            this.$message.error(response.msg || '获取角色列表失败')
+          }
+        })
+        .catch(error => {
+          this.$message.error('获取角色列表出错', error)
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
     handleClose() {
       this.$refs.form.resetFields()
       this.$emit('update:visible', false)
@@ -150,6 +170,10 @@ export default {
             })
         }
       })
+    },
+    // 处理角色选择变化
+    handleRolesChange(roleIds) {
+      this.form.sysUserRoleDTOs = roleIds.map(id => ({ roleId: id }));
     }
   }
 }