From d11cd8d5c595660912723d49f7a02881332e6e27 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 25 八月 2023 08:21:16 +0800
Subject: [PATCH] 1.角色分配优化
---
src/views/basicSettings/roleDivider.vue | 18 ++++++++
src/views/basicSettings/personList.vue | 71 +++++++++++++++++++----------------
2 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/src/views/basicSettings/personList.vue b/src/views/basicSettings/personList.vue
index 5bc9d2c..ecfc4c6 100644
--- a/src/views/basicSettings/personList.vue
+++ b/src/views/basicSettings/personList.vue
@@ -55,25 +55,24 @@
<el-form-item label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
<el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="鐢ㄦ埛缂栫爜" style=" display: flex;">
- <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
- <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
-
- <el-form-item v-show="isExpandForm" label="鐢ㄦ埛缂栫爜" style=" display: flex;">
- <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
- <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item v-show="isExpandForm" label="鐢ㄦ埛缂栫爜" style=" display: flex;">
- <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
- <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
+ <!-- <el-form-item label="鐢ㄦ埛缂栫爜" style=" display: flex;">-->
+ <!-- <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">-->
+ <!-- <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item v-show="isExpandForm" label="鐢ㄦ埛缂栫爜" style=" display: flex;">-->
+ <!-- <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">-->
+ <!-- <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item v-show="isExpandForm" label="鐢ㄦ埛缂栫爜" style=" display: flex;">-->
+ <!-- <el-input v-model="form.usercode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item v-show="isExpandForm" label="鐢ㄦ埛鍚嶇О" style=" display: flex;">-->
+ <!-- <el-input v-model="form.username" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
</div>
<div
class="bodySearchReset"
@@ -85,20 +84,21 @@
</el-form>
<div
class="bodyTopFormExpand"
+ style="height: 5px;"
>
- <svg-icon
- v-show="mouseHoverType==='mouseout'"
- style="cursor: pointer"
- :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
- @mouseenter="mouseHoverType=$event.type"
- />
- <svg-icon
- v-show="mouseHoverType==='mouseenter'"
- style="cursor: pointer"
- :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
- @click="isExpandForm=!isExpandForm"
- @mouseout="mouseHoverType=$event.type"
- />
+ <!-- <svg-icon-->
+ <!-- v-show="mouseHoverType==='mouseout'"-->
+ <!-- style="cursor: pointer"-->
+ <!-- :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"-->
+ <!-- @mouseenter="mouseHoverType=$event.type"-->
+ <!-- />-->
+ <!-- <svg-icon-->
+ <!-- v-show="mouseHoverType==='mouseenter'"-->
+ <!-- style="cursor: pointer"-->
+ <!-- :icon-class="!isExpandForm?'doubleDown':'doubleUp'"-->
+ <!-- @click="isExpandForm=!isExpandForm"-->
+ <!-- @mouseout="mouseHoverType=$event.type"-->
+ <!-- />-->
</div>
</div>
@@ -156,6 +156,7 @@
prop="email"
label="閭"
sortable="custom"
+ show-overflow-tooltip
>
<template slot-scope="{row}">
{{ row.email ? row.email : '/' }}
@@ -165,6 +166,7 @@
prop="mobile"
label="鍙风爜"
sortable="custom"
+ show-overflow-tooltip
>
<template slot-scope="{row}">
{{ row.mobile ? row.mobile : '/' }}
@@ -174,6 +176,7 @@
prop="postname"
label="宀椾綅"
sortable="custom"
+ show-overflow-tooltip
>
<template slot-scope="{row}">
{{ row.postname ? row.postname : '/' }}
@@ -183,6 +186,7 @@
prop="rolename"
label="瑙掕壊"
sortable="custom"
+ show-overflow-tooltip
>
<template slot-scope="{row}">
{{ row.rolename ? row.rolename : '/' }}
@@ -192,6 +196,7 @@
prop="group_name"
label="鐝粍"
sortable="custom"
+ show-overflow-tooltip
>
<template slot-scope="{row}">
{{ row.group_name ? row.group_name : '/' }}
@@ -693,7 +698,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 295
+ this.tableHeight = this.mainHeight - 280
this.$refs.tableDataRef.doLayout()
})
}
diff --git a/src/views/basicSettings/roleDivider.vue b/src/views/basicSettings/roleDivider.vue
index 838a67d..3b6c3b9 100644
--- a/src/views/basicSettings/roleDivider.vue
+++ b/src/views/basicSettings/roleDivider.vue
@@ -154,6 +154,7 @@
<el-table-column
prop="rolename"
label="瑙掕壊"
+ show-overflow-tooltip
sortable="custom"
>
<template slot-scope="{row}">
@@ -164,6 +165,7 @@
prop="postname"
label="宀椾綅"
sortable="custom"
+ show-overflow-tooltip
>
<template slot-scope="{row}">
{{ row.postname ? row.postname : '/' }}
@@ -172,6 +174,7 @@
<el-table-column
prop="group_name"
label="鐝粍"
+ show-overflow-tooltip
sortable="custom"
>
<template slot-scope="{row}">
@@ -214,7 +217,7 @@
v-el-drag-dialog
title="鏂板"
:visible.sync="dialogVisible"
- width="800px"
+ width="1200px"
:close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@@ -225,6 +228,8 @@
ref="tableDataDialogRef"
class="tableFixed"
:data="tableDataDialog"
+ row-class-name="custom-row"
+
height="400"
border
:style="{width: 100+'%',height:'400px',}"
@@ -260,6 +265,7 @@
/>
<el-table-column
prop="rolename"
+ show-overflow-tooltip
label="瑙掕壊"
>
<template slot-scope="{row}">
@@ -269,6 +275,7 @@
<el-table-column
prop="postname"
label="宀椾綅"
+ show-overflow-tooltip
>
<template slot-scope="{row}">
{{ row.postname?row.postname:'/' }}
@@ -276,6 +283,7 @@
</el-table-column>
<el-table-column
prop="group_name"
+ show-overflow-tooltip
label="鐝粍"
>
<template slot-scope="{row}">
@@ -393,6 +401,10 @@
methods: {
// 缁勭粐鏋舵瀯澶у垪琛ㄦ煡璇�
async getRoleAssignedUserData() {
+ if (window.location.hash.indexOf('?') !== -1) {
+ this.form.role_code = window.location.hash.split('?')[1].split('=')[1]
+ }
+
if (!this.form.role_code) {
this.form.role_code = this.roleArr[0].rolecode
}
@@ -455,6 +467,10 @@
},
async cancel(code) {
+ // if (!this.form.role_code) {
+ // return this.$message.error('')
+ // }
+
const res = await RoleAssignedUserBatchCancel([code], this.form.role_code)
if (res.code === '200') {
this.$notify.success('鍙栨秷鎺堟潈鎴愬姛锛�')
--
Gitblit v1.9.3