From 79d7a61569f750719370b83f208d069be7718b2a Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期日, 19 六月 2022 14:28:56 +0800
Subject: [PATCH] 1.用户清单关联角色2.角色清单查询
---
src/views/jcsz/yhqd.vue | 403 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 379 insertions(+), 24 deletions(-)
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index d2bcd76..a237927 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -176,6 +176,7 @@
width="50%"
top="15vh"
@closed="handleClose"
+ @close="handleClose"
>
<el-form ref="dialogForm" :rules="dialogFormRules" inline :model="dialogForm" label-width="80px">
<el-form-item label="鐢ㄦ埛缂栫爜" prop="UserCode">
@@ -248,8 +249,11 @@
:visible.sync="dialogVisibleRoles"
width="50%"
top="15vh"
+ class="dialogVisibleRoles"
@closed="handleCloseRoles"
+ @close="handleCloseRoles"
>
+ <!-- @opened="handleOpenedRoles"-->
<div>
<i class="el-icon-s-comment" style="color:#42b983;" /> 鐢ㄦ埛鍚嶇О锛歿{ dialogFormRoles.username }}
@@ -259,15 +263,26 @@
<div style="margin-bottom:20px">
<i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊绫诲瀷闆嗗悎锛�
</div>
- <el-checkbox-group v-model="dialogFormRoles.rolesArrSelectedArr" @change="dialogCheckboxChange">
- <el-checkbox
+ <div class="myCheckboxGroup">
+ <div
v-for="item in dialogFormRoles.rolesArr"
:key="item.code"
- :label="item.name"
- border
- size="medium"
- />
- </el-checkbox-group>
+ :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ class="myCheckbox"
+ @click="myCheckboxClick(item)"
+ >
+ <input
+ class="myCheckboxInput"
+ type="checkbox"
+ :value="item.code"
+ :name="item.name"
+ :style="{color:item.isSelected2?'#42b983':'#fff'}"
+ @click="myCheckboxInputClick(item)"
+ >{{ item.name }}
+ <!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
+ <!-- onClick="event.cancelBubble = true"-->
+ </div>
+ </div>
</div>
<el-divider />
<div>
@@ -281,7 +296,10 @@
node-key="code"
default-expand-all
:props="defaultPropsOfRoleTree"
+ @check="checkBoxClick"
/>
+ <!-- @check-change="checkChange"-->
+
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -297,11 +315,12 @@
import Pagination from '@/components/Pagination'
import {
AddUpdateUser,
- DeleteUser, UserAssociationRole,
+ DeleteUser, SaveUserAssoctRole, UserAssociationRole,
UserOrganization,
UserSearch
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
+import $ from 'jquery'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -387,17 +406,16 @@
{ required: true, message: '璇烽�夋嫨宸ヨ祫绫诲瀷', trigger: ['blur', 'change'] }
]
},
- // cascaderKey: 0, // 绾ц仈閫夋嫨鍣╧ey
dialogVisibleRoles: false,
dialogFormRoles: {
username: '', // 鐢ㄦ埛鍚嶇О
+ usercode: '', // 鐢ㄦ埛缂栫爜
rolesArrSelectedArr: [], // 瑙掕壊绫诲瀷鏁扮粍閫変腑
- rolesArrSelected: [], // 瑙掕壊绫诲瀷閫変腑
rolesArr: [], // 瑙掕壊绫诲瀷闆嗗悎
roleTree: [], // 瑙掕壊鏍�
- rolesAll: []// 瑙掕壊鎵�鏈�
+ roleTreeSelectedArr: [] // 瑙掕壊鏍戦�変腑
},
-
+ rolesAll: [], // 瑙掕壊鎵�鏈�
defaultPropsOfRoleTree: {
value: 'code',
label: 'name',
@@ -534,7 +552,7 @@
Password: this.dialogForm.Password,
Enable: this.dialogForm.Enable,
// StuOrg: this.dialogForm.StuOrg,
- StuOrg: this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1].length === 4 ? this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1] : this.$refs.dialogCascader.checkedValue,
+ StuOrg: Array.isArray(this.$refs.dialogCascader.checkedValue) ? this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1] : this.$refs.dialogCascader.checkedValue,
Mobile: this.dialogForm.Mobile,
Email: this.dialogForm.Email,
wagetype: this.dialogForm.wagetype,
@@ -562,32 +580,285 @@
},
// 鍏宠仈瑙掕壊鐐瑰嚮浜嬩欢
async roleClick({ row }) {
+ this.dialogFormRoles.rolesArrSelectedArr = []
this.dialogFormRoles.rolesArr = []
+ this.dialogFormRoles.roleTreeSelectedArr = []
this.dialogVisibleRoles = true
this.dialogFormRoles.username = row.username
+ this.dialogFormRoles.usercode = row.usercode
const { data: res } = await UserAssociationRole({ usercode: row.usercode })
this.rolesAll = res
- res.forEach(item => {
- this.dialogFormRoles.rolesArr.push({ code: item.code, name: item.name, flag: item.flag })
+
+ const nodeKey = []// 鏍戝舰鍥炴樉key
+ res.forEach((item, index) => {
+ this.dialogFormRoles.rolesArr.push({
+ code: item.code,
+ name: item.name,
+ flag: item.flag,
+ isSelected1: false,
+ isSelected2: false
+ })
+ if (item.flag === 'Y') {
+ this.dialogFormRoles.rolesArr[index].isSelected2 = true
+ this.$nextTick(() => {
+ // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ this.dialogFormRoles.rolesArrSelectedArr.push(item.name)
+ if (item.children && item.children.length > 0) {
+ const Data = []
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ nodeKey.push(it.code)
+ Data.push(it.code)
+ }
+ })
+ this.dialogFormRoles.roleTreeSelectedArr.push({ Code: item.code, Name: item.name, Data: Data })
+ }
+ }
})
- },
- dialogCheckboxChange(val, aa) {
- // this.dialogFormRoles.rolesArrSelectedArr = ['绠＄悊浜哄憳']
- this.dialogFormRoles.rolesArrSelected = val[val.length - 1]
- this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.name === this.dialogFormRoles.rolesArrSelected)
+ console.log(this.dialogFormRoles.roleTreeSelectedArr, 11)
+ console.log(this.dialogFormRoles.rolesArr, 888)
+
+ this.dialogFormRoles.rolesArr[0].isSelected1 = true// 榛樿閫変腑绗竴涓�
+ // this.dialogFormRoles.rolesArr[0].name = '鍏ㄩ儴'
+
+ this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.code === this.dialogFormRoles.rolesArr[0].code)
+ this.dialogFormRoles.roleTree[0].name = '鍏ㄩ儴'
+ // this.dialogFormRoles.rolesArr
+ console.log(nodeKey, 1)
+ this.$refs.roleTree.setCheckedKeys(nodeKey)
},
// 澶勭悊鐢ㄦ埛鍏宠仈瀵硅瘽妗嗗叧闂簨浠�
handleCloseRoles() {
-
+ this.$refs.roleTree.setCheckedKeys([])
+ this.dialogFormRoles.rolesArrSelectedArr = []
},
// 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗗彇娑堜簨浠�
rolesDialogVisibleCancel() {
this.dialogVisibleRoles = false
},
// 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗙‘璁や簨浠�
- rolesDialogVisibleConfirm() {
- this.dialogVisibleRoles = false
+ async rolesDialogVisibleConfirm() {
+ console.log(this.dialogFormRoles.roleTreeSelectedArr, 333337)
+ const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode)
+ if (res.code === '200') {
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+ this.dialogVisibleRoles = false
+ }
+ },
+ // 鏍戝舰澶嶉�夋鐐瑰嚮浜嬩欢
+ checkBoxClick(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys }) {
+ // console.log(obj, checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys, 78787878)
+
+ // 鎵惧埌 checkedFatherCode 鐖禼ode鍊�
+ // 褰揾alfCheckedKeys涓嶇瓑绛夐浂鐨勬椂鍊�
+ // let checkedFatherCode = halfCheckedKeys.length !== 0 ? halfCheckedKeys[0] : checkedKeys[0]
+ let checkedFatherCode = '' // 鎵惧埌 checkedFatherCode 鐖禼ode鍊�
+ // if (checkedFatherCode === undefined) {
+ // console.log(this.rolesAll, 66666)
+ this.rolesAll.forEach((item, index) => {
+ if (item.code === obj.code) {
+ checkedFatherCode = item.code
+ }
+ if (item.children && item.children.length > 0) {
+ item.children.forEach((it, ind) => {
+ if (it.code === obj.code) {
+ checkedFatherCode = item.code
+ }
+ })
+ }
+ })
+
+ // }
+ console.log(checkedFatherCode, 8)
+
+ // 1.绗竴绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓嶄负闆� 鍏ㄥ彾 涓嶄负闆�
+ if (halfCheckedKeys.length !== 0 && checkedKeys.length !== 0) {
+ this.dialogFormRoles.rolesArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ console.log('1.绗竴绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓嶄负闆� 鍏ㄥ彾 涓嶄负闆�')
+ this.dialogFormRoles.rolesArr[index].isSelected2 = true
+ this.$nextTick(() => {
+ // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ const temp = this.rolesAll.filter(it => it.code === checkedFatherCode)// 杩囨护鍑烘瘡娆￠�変腑鐨勫ぇ椤�
+ temp.forEach(it => {
+ const a = []
+ it.children.forEach(it => {
+ if (it.code === obj.code) {
+ a.push(it.code)
+ }
+ })
+ // console.log(!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode))
+ if (!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode)) { // 褰撶洿鎺ラ�夌埗code鏃舵墽琛�
+ this.dialogFormRoles.roleTreeSelectedArr.push({
+ Code: it.code,
+ Name: it.name,
+ Data: a
+ })
+ } else {
+ this.dialogFormRoles.roleTreeSelectedArr.forEach((i, ind) => { // 褰撻�夊瓙code鏃舵墽琛�
+ if (i.Code === checkedFatherCode) {
+ this.dialogFormRoles.roleTreeSelectedArr[ind].Data.forEach((i1, ind2) => {
+ if (i1 === a[0]) {
+ this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 褰撳瓙code涓庣幇鍦ㄧ殑code鐩稿悓鏃舵墽琛�
+ } else {
+ this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //褰撳瓙code涓庣幇鍦ㄧ殑code涓嶇浉鍚屾椂鎵ц
+ }
+ })
+ // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter((i1, ind2) => i1 !== a[0])// 杩囨护鎺夐�変腑鐩稿悓鐨�
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+
+ console.log(this.dialogFormRoles.roleTreeSelectedArr, 11)
+
+ // 2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂
+ if (halfCheckedKeys.length === 0 && checkedKeys.length === 0) {
+ this.dialogFormRoles.rolesArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ console.log('2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂')
+ this.dialogFormRoles.rolesArr[index].isSelected2 = false
+ this.$nextTick(() => {
+ // console.log($('input:checkbox').eq(1).attr('checked', false), 88888)
+ $('input:checkbox').eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ this.dialogFormRoles.roleTreeSelectedArr.forEach((it, ind) => {
+ if (it.Code === checkedFatherCode) {
+ console.log(it.Code, 9)
+ console.log(this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 7)
+ }
+ })
+ this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
+ if (i === checkedFatherCode) {
+ console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 8)
+ }
+ })
+ }
+ })
+ }
+ console.log(this.dialogFormRoles.roleTreeSelectedArr, 22)
+
+ // 3.绗笁绉嶇鎯呭喌褰撴爲褰� 鍗婂彾 涓洪浂 鍏ㄥ彾 涓嶄负闆�
+ if (halfCheckedKeys.length === 0 && checkedKeys.length !== 0) {
+ // this.dialogFormRoles.roleTreeSelectedArr = []
+ this.dialogFormRoles.rolesArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ console.log(' 3.绗笁绉嶇鎯呭喌褰撴爲褰� 鍗婂彾 涓洪浂 鍏ㄥ彾 涓嶄负闆�')
+ this.dialogFormRoles.rolesArr[index].isSelected2 = true
+ this.$nextTick(() => {
+ // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+
+ const temp = this.rolesAll.filter(it => it.code === checkedFatherCode)// 杩囨护鍑烘瘡娆￠�変腑鐨勫ぇ椤�
+ // console.log(!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode))
+ if (!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode)) { // 褰撶埗绫讳负鍏ㄥ彾鏃�
+ temp.forEach(it => {
+ this.dialogFormRoles.roleTreeSelectedArr.push({
+ Code: it.code,
+ Name: it.name,
+ Data: it.children.map(i => i.code)
+ })
+ })
+ } else { // 褰撶埗绫荤敱鍗婂彾鍙樹负鍏ㄥ彾鏃�
+ this.dialogFormRoles.roleTreeSelectedArr.forEach((i1, ind) => {
+ if (i1.Code === checkedFatherCode) { // i1娌℃壘瀵�
+ console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 8)
+ temp.forEach(it => {
+ this.dialogFormRoles.roleTreeSelectedArr.push({
+ Code: it.code,
+ Name: it.name,
+ Data: it.children.map(i => i.code)
+ })
+ })
+ }
+ })
+ }
+ }
+ },
+ // myCheckBox鐐瑰嚮浜嬩欢 澶х洅瀛愮偣鍑�
+ myCheckboxClick(item) {
+ console.log(this.dialogFormRoles.rolesArr, 7)
+ this.dialogFormRoles.rolesArr.forEach(it => {
+ it.isSelected1 = it.code === item.code
+ })
+ this.dialogFormRoles.roleTree = this.rolesAll.filter(it => it.code === item.code)
+ this.dialogFormRoles.roleTree[0].name = '鍏ㄩ儴'
+ if (this.dialogFormRoles.roleTree[0].children.length < 1) {
+ this.dialogFormRoles.roleTree = ''
+ }
+ const temp = this.dialogFormRoles.roleTreeSelectedArr.filter(it => it.Code === item.code)
+ console.log(temp, 33)
+ if (temp.length > 0) {
+ this.$refs.roleTree.setCheckedKeys(temp[0].Data)// 鏍戝舰閫変腑鍥炴樉
+ } else {
+ this.$refs.roleTree.setCheckedKeys([])// 褰撻暱搴︿负闆舵椂缃┖
+ }
+ },
+ // myCheckBoxInput鐐瑰嚮浜嬩欢 灏忕洅瀛愮偣鍑�(input)
+ myCheckboxInputClick(item) {
+ item.isSelected2 = !item.isSelected2
+ this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// 鏁扮粍鍘婚噸
+ if (item.isSelected2) { // 浠庢病閫変腑鍒伴�変腑
+ console.log('浠庢病閫変腑鍒伴�変腑')
+ this.dialogFormRoles.rolesArr.forEach(it => {
+ if (it.code === item.code && item.isSelected2) {
+ this.dialogFormRoles.rolesArrSelectedArr.push(it.code)
+ }
+ })
+
+ const temp = this.rolesAll.filter(it => it.code === item.code)// 杩囨护鍑烘瘡娆￠�変腑鐨勫ぇ椤�
+
+ temp.forEach(it => {
+ this.dialogFormRoles.roleTreeSelectedArr.push({
+ Code: it.code,
+ Name: it.name,
+ Data: it.children.map(i => i.code)
+ })
+ })
+ }
+
+ if (!item.isSelected2) { // 浠庨�変腑鍒版病閫変腑
+ console.log('浠庨�変腑鍒版病閫変腑')
+ this.dialogFormRoles.rolesArr.forEach((it, ind) => {
+ if (it.code === item.code && !item.isSelected2) {
+ console.log('杩涙潵浜�')
+ console.log(this.dialogFormRoles.rolesArrSelectedArr, 78)
+ this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
+ if (i === it.code) {
+ console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 6664)
+ }
+ })
+ this.dialogFormRoles.roleTreeSelectedArr.forEach((i, i1) => {
+ if (i.Code === it.code) {
+ console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(i1, 1), 6665)
+ }
+ })
+ }
+ })
+ }
+
+ this.$refs.roleTree.setCheckedKeys(this.dialogFormRoles.rolesArrSelectedArr)
+ // this.$refs.roleTree.getCheckedKeys()//鍙兘鑾峰彇鍒扮涓�涓爲褰�
+
+ this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// 鏁扮粍鍘婚噸
+ // 鏁扮粍涓璞＄浉鍚岀殑鍘婚噸
+ // this.dialogFormRoles.roleTreeSelectedArr = this.dialogFormRoles.roleTreeSelectedArr.filter((currentValue, currentIndex, selfArr) => {
+ // return selfArr.findIndex(item => item.code === currentValue.Code) === currentIndex
+ // })
+ console.log(this.dialogFormRoles.rolesArrSelectedArr, 6666)
+ console.log(this.dialogFormRoles.roleTreeSelectedArr, 6777)
}
+
}
}
</script>
@@ -682,16 +953,100 @@
.el-checkbox.is-bordered.is-checked {
border-color: $main_color;
}
+
::v-deep .el-radio__input.is-checked .el-radio__inner {
border-color: $main_color;
background: $main_color;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: $main_color;
background: $main_color;
}
+
::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
color: $main_color !important;
}
+
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+ margin: 10px 30px 0px 0;
+ //cursor: default !important;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+.dialogVisibleRoles {
+ //::v-deep .el-checkbox.is-bordered.el-checkbox--medium{
+ // pointer-events: none;
+ //}
+
+ //::v-deep .el-checkbox__label{
+ // pointer-events: none !important;
+ // color: red;
+ //}
+ .myCheckboxGroup {
+ display: flex;
+ flex-wrap: wrap;
+
+ .myCheckbox {
+ //border: 1px solid $main_color;
+ border: 1px solid #eee;
+ display: flex;
+ min-width: 100px;
+ padding: 10px;
+ margin: 10px 30px 0 0;
+ border-radius: 5px;
+ cursor: default;
+
+ .myCheckboxInput {
+ margin: 1px 5px 0 0;
+ cursor: pointer;
+ }
+
+ }
+
+ //.myCheckbox{
+ // border: 1px solid $main_color;
+ //}
+
+ input[type=checkbox] {
+ cursor: pointer;
+ position: relative;
+ width: 14px;
+ height: 14px;
+ font-size: 14px;
+ }
+
+ input[type=checkbox]::after {
+ position: absolute;
+ top: 0;
+ //color: rgb(130, 35, 35);
+ color: $main_color;
+ width: 14px;
+ height: 14px;
+ display: inline-block;
+ visibility: visible;
+ padding-left: 0px;
+ text-align: center;
+ content: ' ';
+ border-radius: 3px
+ }
+
+ input[type=checkbox]:checked::after {
+ content: "鉁�";
+ //content: "鈭�";
+ color: #fff;
+ font-size: 12px;
+ font-weight: bold;
+ background-color: $main_color;
+ }
+ }
+
+}
</style>
--
Gitblit v1.9.3