From 9aa68cc2a20edf2749e0f40fd88d7db592e84cad Mon Sep 17 00:00:00 2001
From: ailanyin <ailanyin4j@163.com>
Date: Thu, 11 May 2023 15:33:57 +0800
Subject: [PATCH] update by fq

---
 src/api/system/role.js               | 15 ++-------
 src/views/system/role/authUser.vue   | 47 +++++++++++-----------------
 src/views/system/role/index.vue      |  2 +-
 src/views/system/role/selectUser.vue | 31 +++++++++---------
 4 files changed, 38 insertions(+), 57 deletions(-)

diff --git a/src/api/system/role.js b/src/api/system/role.js
index f13e6f4..fdb2718 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -83,28 +83,19 @@ export function unallocatedUserList(query) {
   })
 }
 
-// 取消用户授权角色
+// 批量取消用户授权角色
 export function authUserCancel(data) {
   return request({
     url: '/system/role/authUser/cancel',
     method: 'put',
-    data: data
-  })
-}
-
-// 批量取消用户授权角色
-export function authUserCancelAll(data) {
-  return request({
-    url: '/system/role/authUser/cancelAll',
-    method: 'put',
     params: data
   })
 }
 
 // 授权用户选择
-export function authUserSelectAll(data) {
+export function insertAuthUser(data) {
   return request({
-    url: '/system/role/authUser/selectAll',
+    url: '/system/role/authUser/insert',
     method: 'put',
     params: data
   })
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 66b5f5e..5d6e55d 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -2,18 +2,18 @@
 <template>
    <div class="app-container">
       <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
-         <el-form-item label="用户名称" prop="userName">
+         <el-form-item label="用户名称" prop="username">
             <el-input
-               v-model="queryParams.userName"
+               v-model="queryParams.username"
                placeholder="请输入用户名称"
                clearable
                style="width: 240px"
                @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"
@@ -42,9 +42,9 @@
                plain
                icon="CircleClose"
                :disabled="multiple"
-               @click="cancelAuthUserAll"
+               @click="cancelAuthUser"
                v-hasPermi="['system:role:remove']"
-            >批量取消授权</el-button>
+            >取消授权</el-button>
          </el-col>
          <el-col :span="1.5">
             <el-button 
@@ -59,10 +59,11 @@
 
       <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="username" :show-overflow-tooltip="true" />
+         <el-table-column label="姓名" prop="nickname" :show-overflow-tooltip="true" />
+         <el-table-column label="部门" prop="deptName" :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="手机" prop="phone" :show-overflow-tooltip="true" />
          <el-table-column label="状态" align="center" prop="status">
             <template #default="scope">
                <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -73,11 +74,6 @@
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
          </el-table-column>
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)" v-hasPermi="['system:role:remove']">取消授权</el-button>
-            </template>
-         </el-table-column>
       </el-table>
 
       <pagination
@@ -93,11 +89,11 @@
 
 <script setup name="AuthUser">
 import selectUser from "./selectUser";
-import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";
+import { allocatedUserList, authUserCancel } from "@/api/system/role";
+import {sys_normal_disable} from "@/constant/dict";
 
 const route = useRoute();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
 const userList = ref([]);
 const loading = ref(true);
@@ -109,9 +105,10 @@ const userIds = ref([]);
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
+  isDelete: "0",
   roleId: route.params.roleId,
-  userName: undefined,
-  phonenumber: undefined,
+  username: undefined,
+  phone: undefined,
 });
 
 /** 查询授权用户列表 */
@@ -147,21 +144,13 @@ function handleSelectionChange(selection) {
 function openSelectUser() {
   proxy.$refs["selectRef"].show();
 }
-/** 取消授权按钮操作 */
-function cancelAuthUser(row) {
-  proxy.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function () {
-    return authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("取消授权成功");
-  }).catch(() => {});
-}
+
 /** 批量取消授权按钮操作 */
-function cancelAuthUserAll(row) {
+function cancelAuthUser(row) {
   const roleId = queryParams.roleId;
   const uIds = userIds.value.join(",");
   proxy.$modal.confirm("是否取消选中用户授权数据项?").then(function () {
-    return authUserCancelAll({ roleId: roleId, userIds: uIds });
+    return authUserCancel({ roleId: roleId, userIds: uIds });
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("取消授权成功");
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index e6954fd..48e4897 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -274,10 +274,10 @@ import {
     updateRole
 } from "@/api/system/role";
 import {roleMenuTreeselect, treeSelect as menuTreeSelect} from "@/api/system/menu";
+import {sys_normal_disable} from "@/constant/dict";
 
 const router = useRouter();
 const {proxy} = getCurrentInstance();
-const {sys_normal_disable} = proxy.useDict("sys_normal_disable");
 const deptCheckStrictly = ref(true)/*部门父子联动*/
 const menuCheckStrictly = ref(true) /*菜单父子联动*/
 const roleList = ref([]);
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 9be1ec9..86e9db1 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -1,19 +1,19 @@
 <template>
    <!-- 授权用户 -->
-   <el-dialog title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body>
+   <el-dialog @open="resetQuery" title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body>
       <el-form :model="queryParams" ref="queryRef" :inline="true">
-         <el-form-item label="用户名称" prop="userName">
+         <el-form-item label="登录账号" prop="username">
             <el-input
-               v-model="queryParams.userName"
-               placeholder="请输入用户名称"
+               v-model="queryParams.username"
+               placeholder="请输入登录账号"
                clearable
                style="width: 200px"
                @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: 200px"
@@ -28,10 +28,10 @@
       <el-row>
          <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="email" :show-overflow-tooltip="true" />
-            <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+            <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="deptName" :show-overflow-tooltip="true" />
+            <el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
             <el-table-column label="状态" align="center" prop="status">
                <template #default="scope">
                   <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -61,7 +61,8 @@
 </template>
 
 <script setup name="SelectUser">
-import { authUserSelectAll, unallocatedUserList } from "@/api/system/role";
+import { insertAuthUser, unallocatedUserList } from "@/api/system/role";
+import {sys_normal_disable} from "@/constant/dict";
 
 const props = defineProps({
   roleId: {
@@ -70,7 +71,6 @@ const props = defineProps({
 });
 
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 
 const userList = ref([]);
 const visible = ref(false);
@@ -80,9 +80,10 @@ const userIds = ref([]);
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
+  isDelete: '0',
   roleId: undefined,
-  userName: undefined,
-  phonenumber: undefined
+  username: undefined,
+  phone: undefined
 });
 
 // 显示弹框
@@ -125,7 +126,7 @@ function handleSelectUser() {
     proxy.$modal.msgError("请选择要分配的用户");
     return;
   }
-  authUserSelectAll({ roleId: roleId, userIds: uIds }).then(res => {
+  insertAuthUser({ roleId: roleId, userIds: uIds }).then(res => {
     proxy.$modal.msgSuccess(res.msg);
     if (res.code === 200) {
       visible.value = false;