From 5f5091bfcb94c2971e77e2d260bc4857e4392cee Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 十二月 2023 14:47:12 +0800
Subject: [PATCH] 代码提交

---
 Source/UBCS-WEB/src/views/authority/role.vue |   88 ++++++++++++++++++++++++--------------------
 1 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/authority/role.vue b/Source/UBCS-WEB/src/views/authority/role.vue
index 94180ad..6ac1858 100644
--- a/Source/UBCS-WEB/src/views/authority/role.vue
+++ b/Source/UBCS-WEB/src/views/authority/role.vue
@@ -1,43 +1,46 @@
 <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"
-                   icon="el-icon-delete"
-                   v-if="permission.role_delete"
-                   plain
-                   @click="handleDelete">鍒� 闄�
+        <el-button v-if="permissionList.delBtn"
+          type="danger"
+          size="small"
+          icon="el-icon-delete"
+          plain
+          @click="handleDelete">
+          鍒� 闄�
         </el-button>
-        <el-button size="small"
-                   icon="el-icon-setting"
-                   @click="handleRole"
-                   v-if="userInfo.role_name.includes('admin')"
-                   plain>鏉冮檺璁剧疆
+        <!-- v-if="userInfo.role_name.includes('admin')" -->
+        <el-button v-if="permissionList.authSettingBtn" 
+          size="small"
+          icon="el-icon-setting"
+          @click="handleRole"
+          plain>鏉冮檺璁剧疆
         </el-button>
       </template>
     </avue-crud>
     <el-dialog title="瑙掕壊鏉冮檺閰嶇疆"
       append-to-body
       :visible.sync="box"
-      width="350px" 
+      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="鑿滃崟鏉冮檺">
@@ -80,9 +83,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() {
@@ -111,7 +115,8 @@
         option: {
           height: "auto",
           tip: false,
-          simplePage: true,
+          columnBtn:false,
+          // simplePage: true,
           searchShow: true,
           searchMenuSpan: 6,
           tree: true,
@@ -141,8 +146,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: {
@@ -153,7 +158,7 @@
               search: website.tenantMode,
               rules: [{
                 required: true,
-                message: "璇疯緭鍏ユ墍灞炵鎴�",
+                message: "璇烽�夋嫨鎵�灞炵鎴�",
                 trigger: "click"
               }]
             },
@@ -210,10 +215,11 @@
       ...mapGetters(["userInfo", "permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.role_add, false),
-          viewBtn: this.vaildData(this.permission.role_view, false),
-          delBtn: this.vaildData(this.permission.role_delete, false),
-          editBtn: this.vaildData(this.permission.role_edit, false)
+          addBtn: this.vaildData(this.permission.role.role_add, false),
+          viewBtn: this.vaildData(this.permission.role.role_view, false),
+          delBtn: this.vaildData(this.permission.role.role_delete, false),
+          editBtn: this.vaildData(this.permission.role.role_edit, false),
+          authSettingBtn: this.vaildData(this.permission.role.role_auth_setting,false),
         };
       },
       ids() {
@@ -381,8 +387,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