From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/views/system/role/authUser.vue | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 7ad8a5a..98beb1b 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -1,8 +1,8 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div class="search" v-show="showSearch">
- <el-form :model="queryParams" ref="queryFormRef" :inline="true">
+ <div v-show="showSearch" class="search">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
<el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
</el-form-item>
@@ -20,17 +20,17 @@
<template #header>
<el-row :gutter="10">
<el-col :span="1.5">
- <el-button type="primary" plain icon="Plus" @click="openSelectUser" v-hasPermi="['system:role:add']">娣诲姞鐢ㄦ埛</el-button>
+ <el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="openSelectUser">娣诲姞鐢ㄦ埛</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain icon="CircleClose" :disabled="multiple" @click="cancelAuthUserAll" v-hasPermi="['system:role:remove']">
+ <el-button v-hasPermi="['system:role:remove']" type="danger" plain icon="CircleClose" :disabled="multiple" @click="cancelAuthUserAll">
鎵归噺鍙栨秷鎺堟潈
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Close" @click="handleClose">鍏抽棴</el-button>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :search="true"></right-toolbar>
+ <right-toolbar v-model:showSearch="showSearch" :search="true" @query-table="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
@@ -52,28 +52,27 @@
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="鍙栨秷鎺堟潈" placement="top">
- <el-button link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)" v-hasPermi="['system:role:remove']"> </el-button>
+ <el-button v-hasPermi="['system:role:remove']" link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)"> </el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
- <select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
+ <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
+ <select-user ref="selectRef" :role-id="queryParams.roleId" @ok="handleQuery" />
</el-card>
</div>
</template>
<script setup name="AuthUser" lang="ts">
-import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";
-import { UserQuery } from "@/api/system/user/types";
-import { UserVO } from "@/api/system/user/types";
-import SelectUser from "./selectUser.vue";
-
+import { allocatedUserList, authUserCancel, authUserCancelAll } from '@/api/system/role';
+import { UserQuery } from '@/api/system/user/types';
+import { UserVO } from '@/api/system/user/types';
+import SelectUser from './selectUser.vue';
const route = useRoute();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"));
+const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
const userList = ref<UserVO[]>([]);
const loading = ref(true);
@@ -90,7 +89,7 @@
pageSize: 10,
roleId: route.params.roleId as string,
userName: undefined,
- phonenumber: undefined,
+ phonenumber: undefined
});
/** 鏌ヨ鎺堟潈鐢ㄦ埛鍒楄〃 */
@@ -100,47 +99,47 @@
userList.value = res.rows;
total.value = res.total;
loading.value = false;
-}
+};
// 杩斿洖鎸夐挳
const handleClose = () => {
- const obj = { path: "/system/role" };
+ const obj = { path: '/system/role' };
proxy?.$tab.closeOpenPage(obj);
-}
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
queryParams.pageNum = 1;
getList();
-}
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
-}
+};
// 澶氶�夋閫変腑鏁版嵁
const handleSelectionChange = (selection: UserVO[]) => {
- userIds.value = selection.map(item => item.userId);
+ userIds.value = selection.map((item) => item.userId);
multiple.value = !selection.length;
-}
+};
/** 鎵撳紑鎺堟潈鐢ㄦ埛琛ㄥ脊绐� */
const openSelectUser = () => {
selectRef.value?.show();
-}
+};
/** 鍙栨秷鎺堟潈鎸夐挳鎿嶄綔 */
const cancelAuthUser = async (row: UserVO) => {
await proxy?.$modal.confirm('纭瑕佸彇娑堣鐢ㄦ埛"' + row.userName + '"瑙掕壊鍚楋紵');
await authUserCancel({ userId: row.userId, roleId: queryParams.roleId });
await getList();
- proxy?.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
-}
+ proxy?.$modal.msgSuccess('鍙栨秷鎺堟潈鎴愬姛');
+};
/** 鎵归噺鍙栨秷鎺堟潈鎸夐挳鎿嶄綔 */
const cancelAuthUserAll = async () => {
const roleId = queryParams.roleId;
- const uIds = userIds.value.join(",");
- await proxy?.$modal.confirm("鏄惁鍙栨秷閫変腑鐢ㄦ埛鎺堟潈鏁版嵁椤�?");
+ const uIds = userIds.value.join(',');
+ await proxy?.$modal.confirm('鏄惁鍙栨秷閫変腑鐢ㄦ埛鎺堟潈鏁版嵁椤�?');
await authUserCancelAll({ roleId: roleId, userIds: uIds });
await getList();
- proxy?.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛");
-}
+ proxy?.$modal.msgSuccess('鍙栨秷鎺堟潈鎴愬姛');
+};
onMounted(() => {
getList();
--
Gitblit v1.9.3