feat:添加角色授权用户

Yi.RuoYi.Vue3/src/api/system/role.js

@@ -63,18 +63,18 @@ export function delRole(roleId) {
 }
 
 // 查询角色已授权用户列表
-export function allocatedUserList(query) {
+export function allocatedUserList(roleId,query) {
   return request({
-    url: '/system/role/authUser/allocatedList',
+    url: `/role/auth-user/${roleId}/true`,
     method: 'get',
     params: query
   })
 }
 
 // 查询角色未授权用户列表
-export function unallocatedUserList(query) {
+export function unallocatedUserList(roleId,query) {
   return request({
-    url: '/system/role/authUser/unallocatedList',
+    url: `/role/auth-user/${roleId}/false`,
     method: 'get',
     params: query
   })
@@ -83,8 +83,8 @@ export function unallocatedUserList(query) {
 // 取消用户授权角色
 export function authUserCancel(data) {
   return request({
-    url: '/system/role/authUser/cancel',
-    method: 'put',
+    url: '/role/auth-user',
+    method: 'delete',
     data: data
   })
 }
@@ -92,18 +92,18 @@ export function authUserCancel(data) {
 // 批量取消用户授权角色
 export function authUserCancelAll(data) {
   return request({
-    url: '/system/role/authUser/cancelAll',
-    method: 'put',
-    params: data
+    url: '/role/auth-user',
+    method: 'delete',
+    data: data
   })
 }
 
 // 授权用户选择
 export function authUserSelectAll(data) {
   return request({
-    url: '/system/role/authUser/selectAll',
-    method: 'put',
-    params: data
+    url: '/role/auth-user',
+    method: 'post',
+    data: data
   })
 }
 

Yi.RuoYi.Vue3/src/store/modules/permission.js

@@ -346,7 +346,6 @@ const usePermissionStore = defineStore(
 //       }
 //   }
 // ];
-console.log(response.data,"response.data")
      const res=response.data;
 
 const sdata = JSON.parse(JSON.stringify(res))

Yi.RuoYi.Vue3/src/views/system/role/authUser.vue

@@ -11,9 +11,9 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="手机号码" prop="phonenumber">
+         <el-form-item label="手机号码" prop="phone">
             <el-input
-               v-model="queryParams.phonenumber"
+               v-model="queryParams.phone"
                placeholder="请输入手机号码"
                clearable
                style="width: 240px"
@@ -60,17 +60,17 @@
       <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+         <el-table-column label="用户昵称" prop="nick" :show-overflow-tooltip="true" />
          <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
-         <el-table-column label="状态" align="center" prop="status">
+         <el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
+         <el-table-column label="状态" align="center" prop="state">
             <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+               <dict-tag :options="sys_normal_disable" :value="scope.row.state" />
             </template>
          </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+         <el-table-column label="创建时间" align="center" prop="creationTime" width="180">
             <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+               <span>{{ parseTime(scope.row.creationTime) }}</span>
             </template>
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -116,15 +116,15 @@ const queryParams = reactive({
   pageSize: 10,
   roleId: route.params.roleId,
   userName: undefined,
-  phonenumber: undefined,
+  phone: undefined,
 });
 
 /** 查询授权用户列表 */
 function getList() {
   loading.value = true;
-  allocatedUserList(queryParams).then(response => {
-    userList.value = response.rows;
-    total.value = response.total;
+  allocatedUserList(queryParams.roleId,queryParams).then(response => {
+    userList.value = response.data.items;
+    total.value = response.data.total;
     loading.value = false;
   });
 }
@@ -155,7 +155,7 @@ function openSelectUser() {
 /** 取消授权按钮操作 */
 function cancelAuthUser(row) {
   proxy.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function () {
-    return authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
+    return authUserCancel({ userIds: [row.id], roleId: queryParams.roleId });
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("取消授权成功");

Yi.RuoYi.Vue3/src/views/system/role/index.vue

@@ -325,7 +325,7 @@ function handleCommand(command, row) {
 }
 /** 分配用户 */
 function handleAuthUser(row) {
-  router.push("/system/role-auth/user/" + row.roleId);
+  router.push("/system/role-auth/user/" + row.id);
 }
 /** 查询菜单树结构 */
 function getMenuTreeselect() {

Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue

@@ -10,9 +10,9 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="手机号码" prop="phonenumber">
+         <el-form-item label="手机号码" prop="phone">
             <el-input
-               v-model="queryParams.phonenumber"
+               v-model="queryParams.phone"
                placeholder="请输入手机号码"
                clearable
                @keyup.enter="handleQuery"
@@ -27,17 +27,17 @@
          <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="260px">
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-            <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+            <el-table-column label="用户昵称" prop="nick" :show-overflow-tooltip="true" />
             <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-            <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
-            <el-table-column label="状态" align="center" prop="status">
+            <el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
+            <el-table-column label="状态" align="center" prop="state">
                <template #default="scope">
-                  <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+                  <dict-tag :options="sys_normal_disable" :value="scope.row.state" />
                </template>
             </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+            <el-table-column label="创建时间" align="center" prop="creationTime" width="180">
                <template #default="scope">
-                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                  <span>{{ parseTime(scope.row.creationTime) }}</span>
                </template>
             </el-table-column>
          </el-table>
@@ -80,7 +80,7 @@ const queryParams = reactive({
   pageSize: 10,
   roleId: undefined,
   userName: undefined,
-  phonenumber: undefined
+  phone: undefined
 });
 
 // 显示弹框
@@ -95,13 +95,13 @@ function clickRow(row) {
 }
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  userIds.value = selection.map(item => item.userId);
+  userIds.value = selection.map(item => item.id);
 }
 // 查询表数据
 function getList() {
-  unallocatedUserList(queryParams).then(res => {
-    userList.value = res.rows;
-    total.value = res.total;
+  unallocatedUserList(queryParams.roleId,queryParams).then(res => {
+    userList.value = res.data.items;
+    total.value = res.data.total;
   });
 }
 /** 搜索按钮操作 */
@@ -123,8 +123,8 @@ function handleSelectUser() {
     proxy.$modal.msgError("请选择要分配的用户");
     return;
   }
-  authUserSelectAll({ roleId: roleId, userIds: uIds }).then(res => {
-    proxy.$modal.msgSuccess(res.msg);
+  authUserSelectAll({ roleId: roleId, userIds: [uIds] }).then(res => {
+    proxy.$modal.msgSuccess("成功");
     if (res.code === 200) {
       visible.value = false;
       emit("ok");

Yi.RuoYi.Vue3/src/views/system/user/index.vue

@@ -100,10 +100,10 @@
                         <el-button type="text" icon="Key" @click="handleResetPwd(scope.row)"
                            v-hasPermi="['system:user:resetPwd']"></el-button>
                      </el-tooltip>
-                     <el-tooltip content="分配角色" placement="top" v-if="scope.row.userName != 'cc'">
+                     <!-- <el-tooltip content="分配角色" placement="top" v-if="scope.row.userName != 'cc'">
                         <el-button type="text" icon="CircleCheck" @click="handleAuthRole(scope.row)"
                            v-hasPermi="['system:user:edit']"></el-button>
-                     </el-tooltip>
+                     </el-tooltip> -->
                   </template>
                </el-table-column>
             </el-table>