From 4610953b11aaab9719d195329932fbb195289b19 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 10 四月 2023 18:33:56 +0800
Subject: [PATCH] 优化已选择下拉图标高亮回显
---
src/views/system/role/index.vue | 73 +++++++++++-------------------------
1 files changed, 23 insertions(+), 50 deletions(-)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 7bd432b..e446ded 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,12 +1,11 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
+ <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
<el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
<el-input
v-model="queryParams.roleName"
placeholder="璇疯緭鍏ヨ鑹插悕绉�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -16,7 +15,6 @@
v-model="queryParams.roleKey"
placeholder="璇疯緭鍏ユ潈闄愬瓧绗�"
clearable
- size="small"
style="width: 240px"
@keyup.enter="handleQuery"
/>
@@ -26,7 +24,6 @@
v-model="queryParams.status"
placeholder="瑙掕壊鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -37,11 +34,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
- size="small"
- style="width: 240px"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
@@ -50,8 +45,8 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -60,7 +55,6 @@
type="primary"
plain
icon="Plus"
- size="mini"
@click="handleAdd"
v-hasPermi="['system:role:add']"
>鏂板</el-button>
@@ -70,7 +64,6 @@
type="success"
plain
icon="Edit"
- size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:role:edit']"
@@ -81,7 +74,6 @@
type="danger"
plain
icon="Delete"
- size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:role:remove']"
@@ -92,7 +84,6 @@
type="warning"
plain
icon="Download"
- size="mini"
@click="handleExport"
v-hasPermi="['system:role:export']"
>瀵煎嚭</el-button>
@@ -117,42 +108,25 @@
></el-switch>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
<template #default="scope">
<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
- size="mini"
- v-if="scope.row.roleId !== 1"
- type="text"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- v-if="scope.row.roleId !== 1"
- type="text"
- icon="Delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown size="mini" v-if="scope.row.roleId !== 1" @command="(command) => handleCommand(command, scope.row)">
- <span class="el-dropdown-link" v-hasPermi="['system:role:edit']">
- <el-icon><d-arrow-right /></el-icon>鏇村
- </span>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="handleDataScope" icon="CircleCheck"
- v-hasPermi="['system:role:edit']">鏁版嵁鏉冮檺</el-dropdown-item>
- <el-dropdown-item command="handleAuthUser" icon="User"
- v-hasPermi="['system:role:edit']">鍒嗛厤鐢ㄦ埛</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
+ <el-tooltip content="淇敼" placement="top" v-if="scope.row.roleId !== 1">
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top" v-if="scope.row.roleId !== 1">
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鏁版嵁鏉冮檺" placement="top" v-if="scope.row.roleId !== 1">
+ <el-button link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒嗛厤鐢ㄦ埛" placement="top" v-if="scope.row.roleId !== 1">
+ <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -175,7 +149,7 @@
<template #label>
<span>
<el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
- <i class="el-icon-question"></i>
+ <el-icon><question-filled /></el-icon>
</el-tooltip>
鏉冮檺瀛楃
</span>
@@ -268,9 +242,8 @@
</template>
<script setup name="Role">
-import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole } from "@/api/system/role";
+import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from "@/api/system/role";
import { roleMenuTreeselect, treeselect as menuTreeselect } from "@/api/system/menu";
-import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
const router = useRouter();
const { proxy } = getCurrentInstance();
@@ -468,8 +441,8 @@
});
}
/** 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戠粨鏋� */
-function getRoleDeptTreeselect(roleId) {
- return roleDeptTreeselect(roleId).then(response => {
+function getDeptTree(roleId) {
+ return deptTreeSelect(roleId).then(response => {
deptOptions.value = response.depts;
return response;
});
@@ -549,12 +522,12 @@
/** 鍒嗛厤鏁版嵁鏉冮檺鎿嶄綔 */
function handleDataScope(row) {
reset();
- const roleDeptTreeselect = getRoleDeptTreeselect(row.roleId);
+ const deptTreeSelect = getDeptTree(row.roleId);
getRole(row.roleId).then(response => {
form.value = response.data;
openDataScope.value = true;
nextTick(() => {
- roleDeptTreeselect.then(res => {
+ deptTreeSelect.then(res => {
nextTick(() => {
if (deptRef.value) {
deptRef.value.setCheckedKeys(res.checkedKeys);
--
Gitblit v1.9.3