From 0f367e985d44f8470e6b15fa06b8fdf22c37c352 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 14 六月 2024 18:09:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/role-manage.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/view/role-manage.vue b/src/components/view/role-manage.vue
index 5c05314..58f5d88 100644
--- a/src/components/view/role-manage.vue
+++ b/src/components/view/role-manage.vue
@@ -84,8 +84,8 @@
<template slot="title">
<i class="el-icon-circle-plus-outline" style="margin-right: 10px;"></i>{{category}}
</template>
- <div style="padding: 3px 30px;" v-for="(a, ai) in menu" :key="ai" v-if="a.type==category"><el-checkbox
- v-model="a.isClick" :disabled="type=='鏌ョ湅'">{{a.remark}}</el-checkbox></div>
+ <div style="padding: 3px 30px;display: flex;align-items: center;justify-content: space-between;" v-for="(a, ai) in menu" :key="ai" v-if="a.type==category" ><el-checkbox
+ v-model="a.isClick" :disabled="type=='鏌ョ湅'">{{a.remark}}</el-checkbox> <el-checkbox v-model="a.look" v-if="a.remark.includes('鏌ヨ')||a.remark.includes('鑾峰彇')" :disabled="type=='鏌ョ湅'">鍙湅鎴�</el-checkbox></div>
</el-collapse-item>
<!-- <el-collapse-item title="鏌ヨ">
<el-row style="padding: 3px 30px;" v-for="(a, ai) in menu" :key="ai" v-if="a.type=='鏌ヨ'">
@@ -202,13 +202,15 @@
upRole(row) {
this.type = '淇敼'
this.addData.roleName = row.name
- this.addData.category = row.category
+ this.$set(this.addData, 'category', row.category)
+ // this.addData.category = row.category
this.selectPowerByRoleId(row.id)
},
selectRole(row) {
this.type = '鏌ョ湅'
this.addData.roleName = row.name
- this.addData.category = row.category
+ this.$set(this.addData, 'category', row.category)
+ // this.addData.category = row.category
this.selectPowerByRoleId(row.id)
},
openAdd() {
--
Gitblit v1.9.3