From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/role-manage.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/components/view/role-manage.vue b/src/components/view/role-manage.vue
index 5c05314..1d52a49 100644
--- a/src/components/view/role-manage.vue
+++ b/src/components/view/role-manage.vue
@@ -40,7 +40,7 @@
<div class="role_manage">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">瑙掕壊绠＄悊</el-col>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">瑙掕壊绠＄悊</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板瑙掕壊</el-button>
</el-col>
@@ -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=='鏌ヨ'">
@@ -150,7 +150,8 @@
select: []
}
},
- selectField: {}
+ selectField: {},
+ needSort: ['createTime', 'updateTime', 'name'],
},
entityCopy: {},
upIndex: 0,
@@ -177,8 +178,8 @@
this.getPower()
},
methods: {
- refreshTable() {
- this.$refs['ValueTable'].selectList()
+ refreshTable(e) {
+ this.$refs['ValueTable'].selectList(e)
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
@@ -202,13 +203,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() {
@@ -263,7 +266,7 @@
}
this.addLoad = false
this.addDia = false
- this.refreshTable()
+ this.refreshTable('page')
}).catch(e => {
this.addLoad = false
})
--
Gitblit v1.9.3