From ae5807029edabde0b1e1488c090bd830fccf75a7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 九月 2023 16:13:07 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS-WEB/src/views/authority/role.vue | 69 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/authority/role.vue b/Source/UBCS-WEB/src/views/authority/role.vue
index 14b2e79..bece5ed 100644
--- a/Source/UBCS-WEB/src/views/authority/role.vue
+++ b/Source/UBCS-WEB/src/views/authority/role.vue
@@ -1,23 +1,24 @@
<template>
<basic-container>
<avue-crud :option="option"
- :table-loading="loading"
- :data="data"
- ref="crud"
- v-model="form"
- :permission="permissionList"
- :before-open="beforeOpen"
- @row-del="rowDel"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-click="clickRowChange"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad">
+ :table-loading="loading"
+ :data="data"
+ ref="crud"
+ :page.sync="page"
+ v-model="form"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ @row-del="rowDel"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-click="clickRowChange"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
<template slot="menuLeft">
<el-button type="danger"
size="small"
@@ -35,10 +36,11 @@
</template>
</avue-crud>
<el-dialog title="瑙掕壊鏉冮檺閰嶇疆"
- append-to-body
- :visible.sync="box"
- width="345px">
- <el-tabs type="border-card">
+ append-to-body
+ :visible.sync="box"
+ width="350px"
+ style="height: 115vh; margin-top: -13vh; overflow: hidden">
+ <el-tabs type="border-card" style="overflow-y: auto; height: 72vh">
<el-tab-pane label="鑿滃崟鏉冮檺">
<el-tree :data="menuGrantList"
show-checkbox
@@ -79,9 +81,10 @@
</template>
<script>
- import {add, getList, getRole, getRoleTreeById, grant, grantTree, remove, update} from "@/api/system/role";
+ import {add, getPage, getRole, getRoleTreeById, grant, grantTree, remove, update} from "@/api/system/role";
import {mapGetters} from "vuex";
import website from '@/config/website';
+ import {setStore, getStore} from '@/util/store'
export default {
data() {
@@ -110,7 +113,7 @@
option: {
height: "auto",
tip: false,
- simplePage: true,
+ // simplePage: true,
searchShow: true,
searchMenuSpan: 6,
tree: true,
@@ -140,8 +143,8 @@
prop: "tenantId",
type: "tree",
dicUrl: "/api/ubcs-system/tenant/select",
- addDisplay: false,
- editDisplay: false,
+ addDisplay: website.tenantId === getStore({name: 'tenantId'}),
+ editDisplay: website.tenantId === getStore({name: 'tenantId'}),
viewDisplay: website.tenantMode,
span: 24,
props: {
@@ -152,7 +155,7 @@
search: website.tenantMode,
rules: [{
required: true,
- message: "璇疯緭鍏ユ墍灞炵鎴�",
+ message: "璇烽�夋嫨鎵�灞炵鎴�",
trigger: "click"
}]
},
@@ -307,6 +310,13 @@
},
selectionChange(list) {
this.selectionList = list;
+ this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
+ },
+ clickRowChange(row){
+ this.selectionList = row;
+ this.$refs.crud.toggleSelection();
+ this.$refs.crud.setCurrentRow(row);
+ this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
},
selectionClear() {
this.selectionList = [];
@@ -363,6 +373,7 @@
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
+
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
@@ -372,8 +383,10 @@
},
onLoad(page, params = {}) {
this.loading = true;
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
- this.data = res.data.data;
+ getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data;
+ this.data = data.records;
+ this.page.total = data.total;
this.loading = false;
this.selectionClear();
});
--
Gitblit v1.9.3