From ec7f3f3675efc96b59caa40c5ada96600eb60650 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 26 十月 2023 17:17:01 +0800
Subject: [PATCH] 前端按钮权限功能增加: 接口权限界面、应用管理界面、编码规则管理界面、数据权限界面、菜单权限界面、岗位管理界面、角色权限管理界面、租户管理界面、顶部菜单界面

---
 Source/UBCS-WEB/src/views/system/tenant.vue       |   27 +++---
 Source/UBCS-WEB/src/views/authority/datascope.vue |   16 ++-
 Source/UBCS-WEB/src/views/system/client.vue       |   12 +-
 Source/UBCS-WEB/src/views/system/topmenu.vue      |   25 +++--
 Source/UBCS-WEB/src/views/authority/role.vue      |   25 +++--
 Source/UBCS-WEB/src/page/login/userlogin.vue      |    1 
 Source/UBCS-WEB/src/views/code/code.vue           |   89 +++++++++++----------
 Source/UBCS-WEB/src/views/system/menu.vue         |   10 +-
 Source/UBCS-WEB/src/views/authority/apiscope.vue  |   16 ++-
 Source/UBCS-WEB/src/views/system/post.vue         |   18 ++--
 10 files changed, 129 insertions(+), 110 deletions(-)

diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 2bb86b9..e9bc45f 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -264,7 +264,6 @@
     //     "client_view": true
     //   }, "datetime": 1678352291697
     // }))
-  
   },
   mounted() {
     this.$axios.get('/api/ubcs-system/tenant/tenant-map').then(res => {
diff --git a/Source/UBCS-WEB/src/views/authority/apiscope.vue b/Source/UBCS-WEB/src/views/authority/apiscope.vue
index 431957b..b30547a 100644
--- a/Source/UBCS-WEB/src/views/authority/apiscope.vue
+++ b/Source/UBCS-WEB/src/views/authority/apiscope.vue
@@ -21,10 +21,10 @@
       @on-load="onLoad"
       @tree-load="treeLoad">
       <template slot-scope="{row}" slot="menu">
-        <el-button type="text"
+        <el-button v-if="permissionList.settingBtn"
+                   type="text"
                    icon="el-icon-setting"
                    size="small"
-                   v-if="permission.api_scope_setting"
                    plain
                    style="border: 0;background-color: transparent !important;"
                    @click.stop="handleDataScope(row)">鏉冮檺閰嶇疆
@@ -58,7 +58,8 @@
                    @size-change="sizeChangeScope"
                    @on-load="onLoadScope">
           <template slot="menuLeft">
-            <el-button type="danger"
+            <el-button v-if="permissionList.delBtn"
+                       type="danger"
                        size="small"
                        icon="el-icon-delete"
                        plain
@@ -383,10 +384,11 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.menu_add, false),
-          viewBtn: this.vaildData(this.permission.menu_view, false),
-          delBtn: this.vaildData(this.permission.menu_delete, false),
-          editBtn: this.vaildData(this.permission.menu_edit, false)
+          addBtn: this.vaildData(this.permission.api_scope.api_scope_add, false),
+          viewBtn: this.vaildData(this.permission.api_scope.api_scope_view, false),
+          delBtn: this.vaildData(this.permission.api_scope.api_scope_delete, false),
+          editBtn: this.vaildData(this.permission.api_scope.mapi_scope_edit, false),
+          settingBtn: this.vaildData(this.permission.api_scope.api_scope_setting,false),
         };
       },
       ids() {
diff --git a/Source/UBCS-WEB/src/views/authority/datascope.vue b/Source/UBCS-WEB/src/views/authority/datascope.vue
index 8734524..8d585a9 100644
--- a/Source/UBCS-WEB/src/views/authority/datascope.vue
+++ b/Source/UBCS-WEB/src/views/authority/datascope.vue
@@ -22,10 +22,10 @@
                @on-load="onLoad"
                @tree-load="treeLoad">
       <template slot-scope="{row}" slot="menu">
-        <el-button type="text"
+        <el-button v-if="permissionList.settingBtn"
+                   type="text"
                    icon="el-icon-setting"
                    size="small"
-                   v-if="permission.data_scope_setting"
                    plain
                    style="border: 0;background-color: transparent !important;"
                    @click.stop="handleDataScope(row)">鏉冮檺閰嶇疆
@@ -59,7 +59,8 @@
                    @size-change="sizeChangeScope"
                    @on-load="onLoadScope">
           <template slot="menuLeft">
-            <el-button type="danger"
+            <el-button v-if="permissionList.delBtn"
+                       type="danger"
                        size="small"
                        icon="el-icon-delete"
                        plain
@@ -426,10 +427,11 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.menu_add, false),
-          viewBtn: this.vaildData(this.permission.menu_view, false),
-          delBtn: this.vaildData(this.permission.menu_delete, false),
-          editBtn: this.vaildData(this.permission.menu_edit, false)
+          addBtn: this.vaildData(this.permission.data_scope.data_scope_add, false),
+          viewBtn: this.vaildData(this.permission.data_scope.data_scope_view, false),
+          delBtn: this.vaildData(this.permission.data_scope.data_scope_delete, false),
+          editBtn: this.vaildData(this.permission.data_scope.data_scope_edit, false),
+          settingBtn: this.vaildData(this.permission.data_scope.data_scope_setting,false),
         };
       },
       ids() {
diff --git a/Source/UBCS-WEB/src/views/authority/role.vue b/Source/UBCS-WEB/src/views/authority/role.vue
index 55bd32a..6ac1858 100644
--- a/Source/UBCS-WEB/src/views/authority/role.vue
+++ b/Source/UBCS-WEB/src/views/authority/role.vue
@@ -20,15 +20,17 @@
       @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>
         <!-- v-if="userInfo.role_name.includes('admin')" -->
-        <el-button size="small"
+        <el-button v-if="permissionList.authSettingBtn" 
+          size="small"
           icon="el-icon-setting"
           @click="handleRole"
           plain>鏉冮檺璁剧疆
@@ -213,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() {
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 119c8be..2c81867 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -36,8 +36,7 @@
       >
         <!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
         <template slot="menu" slot-scope="scope">
-          <el-button
-            v-show="scope.row.lcStatus == 'Editing' ? true : false"
+          <el-button v-if="permissionList.editBtn && (scope.row.lcStatus == 'Editing' ? true : false)"
             icon="el-icon-edit"
             plain
             size="small"
@@ -45,8 +44,7 @@
             @click="openEdit(scope.row)"
             >缂� 杈�
           </el-button>
-          <el-button
-            v-show="scope.row.lcStatus == 'Editing' ? true : false"
+          <el-button v-if="permissionList.releaseBtn && (scope.row.lcStatus == 'Editing' ? true : false)"
             :loading="releadDisabled"
             icon="el-icon-position"
             plain
@@ -55,8 +53,7 @@
             @click="enableOrDeactivatse(scope.row.oid, 'release')"
             >鍙� 甯�
           </el-button>
-          <el-button
-            v-show="scope.row.lcStatus == 'Released' ? true : false"
+          <el-button v-if="permissionList.deactivateBtn && (scope.row.lcStatus == 'Released' ? true : false)"
             icon="el-icon-video-pause"
             plain
             size="small"
@@ -64,8 +61,7 @@
             @click="enableOrDeactivatse(scope.row.oid, 'disable')"
             >鍋� 鐢�
           </el-button>
-          <el-button
-            v-show="scope.row.lcStatus == 'Disabled' ? true : false"
+          <el-button v-if="permissionList.enableBtn && (scope.row.lcStatus == 'Disabled' ? true : false)"
             icon="el-icon-video-play"
             plain
             size="small"
@@ -76,7 +72,7 @@
         </template>
         <!-- 琛ㄦ牸涓婃柟鎸夐挳鍖哄煙 -->
         <template slot="menuLeft" slot-scope="scope">
-          <el-button
+          <el-button v-if="permissionList.delBtn"
             icon="el-icon-delete"
             plain
             size="small"
@@ -85,16 +81,15 @@
           >
             鍒� 闄�
           </el-button>
-          <el-button
+          <el-button v-if="permissionList.advancedQueryBtn"
             icon="el-icon-search"
             plain
             size="small"
             type="primary"
-            @click="openAdvancedQuery('codeRule')"
-          >
+            @click="openAdvancedQuery('codeRule')">
             楂樼骇鏌ヨ
           </el-button>
-          <el-button
+          <el-button v-if="permissionList.cloneBtn"
             icon="icon-kelong"
             plain
             size="small"
@@ -102,7 +97,7 @@
           >
             鍏� 闅�
           </el-button>
-          <el-button
+          <el-button v-if="permissionList.otherCloneBtn"
             icon="icon-lianjiekelong"
             plain
             size="small"
@@ -111,7 +106,7 @@
           >
             浠庡叾浠栬鍒欎腑鍏嬮殕鐮佹
           </el-button>
-          <el-button
+          <el-button v-if="permissionList.usescopeBtn"
             icon="el-icon-s-help"
             plain
             size="small"
@@ -119,7 +114,7 @@
           >
             浣跨敤鑼冨洿
           </el-button>
-          <el-button
+          <el-button v-if="permissionList.clearBtn"
             icon="icon-qingkong"
             plain
             size="small"
@@ -127,7 +122,7 @@
           >
             娓呯┖鐮佸��
           </el-button>
-          <el-button
+          <el-button  v-if="permissionList.escapeOwnerBtn"
             icon="el-icon-guide"
             plain
             size="small"
@@ -135,7 +130,7 @@
           >
             杞Щ鎵�鏈夎��
           </el-button>
-          <el-button
+          <el-button  v-if="permissionList.maxSerialnumBtn"
             icon="el-icon-data-analysis"
             plain
             size="small"
@@ -223,14 +218,11 @@
     <!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
     <basic-container class="code-basicsec-container">
       <p
-        style="
-          margin-top: -5px;
+        style="margin-top: -5px;
           margin-bottom: 4px;
           font-weight: 570;
           font-size: 19px;
-          color: #0e2d5f;
-        "
-      >
+          color: #0e2d5f;">
         鐮佹绠$悊
       </p>
       <avue-crud
@@ -248,8 +240,7 @@
       >
         <!-- 鍩虹鐮佹琛ㄦ牸鍐呮搷浣滄寜閽� -->
         <template slot="menu" slot-scope="scope">
-          <el-button
-            v-show="currentRuleLcStatus != 'Editing'"
+          <el-button v-if="permissionList.basicViewBtn && (currentRuleLcStatus != 'Editing')"
             icon="el-icon-view"
             plain
             size="small"
@@ -257,8 +248,7 @@
             @click="openBasicDialog('view', scope.row)"
             >鏌ョ湅
           </el-button>
-          <el-button
-            v-show="currentRuleLcStatus === 'Editing'"
+          <el-button v-if="permissionList.basicEditBtn && (currentRuleLcStatus === 'Editing')"
             icon="el-icon-edit"
             plain
             size="small"
@@ -266,11 +256,7 @@
             @click="openBasicDialog('edit', scope.row)"
             >缂栬緫
           </el-button>
-          <el-button
-            v-show="
-              scope.row.secType === 'codeclassifysec' ||
-              scope.row.secType == 'codefixedsec'
-            "
+          <el-button v-if="permissionList.basicMgrBtn && (scope.row.secType === 'codeclassifysec' || scope.row.secType == 'codefixedsec')"
             icon="el-icon-setting"
             plain
             size="small"
@@ -278,8 +264,7 @@
             @click="openBasicSecCodeValueMgr(scope.row)"
             >鐮佸�肩鐞�
           </el-button>
-          <el-button
-            v-show="scope.row.orderNum > 1"
+          <el-button v-if="permissionList.basicMoveupBtn && (scope.row.orderNum > 1)"
             icon="el-icon-arrow-up"
             plain
             size="small"
@@ -287,7 +272,7 @@
             @click="upOrderNum(scope.row)"
             >涓婄Щ
           </el-button>
-          <el-button
+          <el-button v-if="permissionList.basicDownBtn"
             icon="el-icon-arrow-down"
             plain
             size="small"
@@ -299,7 +284,7 @@
 
         <!-- 鍩虹鐮佹琛ㄦ牸宸︿笂鏂规寜閽尯鍩� -->
         <template slot="menuLeft" slot-scope="scope">
-          <el-button
+          <el-button v-if="permissionList.basicAddBtn"
             :disabled="selectionList.length <= 0"
             icon="el-icon-plus"
             size="small"
@@ -308,7 +293,7 @@
           >
             鏂� 澧�
           </el-button>
-          <el-button
+          <el-button v-if="permissionList.basicDeleteBtn"
             :disabled="selectionList.length <= 0"
             icon="el-icon-delete"
             plain
@@ -318,7 +303,7 @@
           >
             鍒� 闄�
           </el-button>
-          <el-button
+          <el-button  v-if="permissionList.basicAdvancedQueryBtn"
             :disabled="selectionList.length <= 0"
             icon="el-icon-search"
             plain
@@ -1587,10 +1572,30 @@
     ...mapGetters(["permission"]),
     permissionList() {
       return {
-        addBtn: this.vaildData(this.permission.codeRule_add, true),
-        viewBtn: this.vaildData(this.permission.codeRule_view, false),
-        delBtn: this.vaildData(this.permission.plCodeRule_delete, false),
-        editBtn: this.vaildData(this.permission.codeRule_edit, true),
+        // 缂栫爜瑙勫垯鐩稿叧鎸夐挳
+        addBtn: this.vaildData(this.permission.code_rule.code_rule_add, false),
+        viewBtn: this.vaildData(this.permission.code_rule.code_rule_view, false),
+        delBtn: this.vaildData(this.permission.code_rule.code_rule_delete, false),
+        editBtn: this.vaildData(this.permission.code_rule.code_rule_edit, false),
+        deactivateBtn: this.vaildData(this.permission.code_rule.code_rule_deactivate, false),
+        enableBtn: this.vaildData(this.permission.code_rule.code_rule_enable, false),
+        releaseBtn: this.vaildData(this.permission.code_rule.	code_rule_release, false),
+        advancedQueryBtn: this.vaildData(this.permission.code_rule.code_rule_advanced_query, false),
+        cloneBtn: this.vaildData(this.permission.code_rule.code_rule_clone, false),
+        otherCloneBtn: this.vaildData(this.permission.code_rule.code_rule_other_clone, false),
+        usescopeBtn: this.vaildData(this.permission.code_rule.code_rule_usescope, false),
+        clearBtn: this.vaildData(this.permission.code_rule.code_rule_clear, false),
+        escapeOwnerBtn: this.vaildData(this.permission.code_rule.code_rule_escape_owner, false),
+        maxSerialnumBtn: this.vaildData(this.permission.code_rule.code_rule_max_serialnum, false),
+        // 鍩虹鐮佹鐩稿叧鎸夐挳
+        basicAddBtn: this.vaildData(this.permission.code_rule.code_basic_add, false),
+        basicDeleteBtn: this.vaildData(this.permission.code_rule.code_basic_delete, false),
+        basicAdvancedQueryBtn: this.vaildData(this.permission.code_rule.code_basic_advanced_query, false),
+        basicMgrBtn: this.vaildData(this.permission.code_rule.code_basic_mgr, false),
+        basicEditBtn: this.vaildData(this.permission.code_rule.code_basic_edit, false),
+        basicViewBtn: this.vaildData(this.permission.code_rule.	code_basic_view, false),
+        basicMoveupBtn: this.vaildData(this.permission.code_rule.code_basic_moveup, false),
+        basicDownBtn: this.vaildData(this.permission.code_rule.code_basic_down, false),
       };
     },
   },
diff --git a/Source/UBCS-WEB/src/views/system/client.vue b/Source/UBCS-WEB/src/views/system/client.vue
index 91292b0..50b482f 100644
--- a/Source/UBCS-WEB/src/views/system/client.vue
+++ b/Source/UBCS-WEB/src/views/system/client.vue
@@ -20,11 +20,11 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <el-button v-if="permissionList.delBtn"
+                   type="danger"
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.client_delete"
                    @click="handleDelete">鍒� 闄�
         </el-button>
       </template>
@@ -204,10 +204,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.client_add),
-          viewBtn: this.vaildData(this.permission.client_view),
-          delBtn: this.vaildData(this.permission.client_delete),
-          editBtn: this.vaildData(this.permission.client_edit)
+          addBtn: this.vaildData(this.permission.client.client_add),
+          viewBtn: this.vaildData(this.permission.client.client_view),
+          delBtn: this.vaildData(this.permission.client.client_delete),
+          editBtn: this.vaildData(this.permission.client.client_edit)
         };
       },
       ids() {
diff --git a/Source/UBCS-WEB/src/views/system/menu.vue b/Source/UBCS-WEB/src/views/system/menu.vue
index 6c8f412..899a6f3 100644
--- a/Source/UBCS-WEB/src/views/system/menu.vue
+++ b/Source/UBCS-WEB/src/views/system/menu.vue
@@ -21,14 +21,14 @@
                @on-load="onLoad"
                @tree-load="treeLoad">
       <template slot="menuLeft">
-        <el-button v-if="this.permission.menu.menu_delete"
+        <el-button v-if="permissionList.delBtn"
                    icon="el-icon-delete"
                    plain
                    size="small"
                    type="danger"
                    @click="handleDelete">鍒� 闄�
         </el-button>
-        <el-button v-if="this.permission.menu.menu_clone"
+        <el-button v-if="permissionList.cloneBtn"
                    icon="el-icon-connection"
                    plain
                    size="small"
@@ -38,7 +38,7 @@
       </template>
       <template slot="menu" slot-scope="scope">
         <el-button
-          v-if="userInfo.role_name.includes('admin') && scope.row.category === 1"
+          v-if="permissionList.addChildBtn && scope.row.category === 1"
           icon="el-icon-circle-plus-outline"
           size="small"
           type="text"
@@ -441,7 +441,9 @@
         addBtn: this.vaildData(this.permission.menu.menu_add, false),
         viewBtn: this.vaildData(this.permission.menu.menu_view, false),
         delBtn: this.vaildData(this.permission.menu.menu_delete, false),
-        editBtn: this.vaildData(this.permission.menu.menu_edit, false)
+        editBtn: this.vaildData(this.permission.menu.menu_edit, false),
+        cloneBtn: this.vaildData(this.permission.menu.menu_clone,false),
+        addChildBtn: this.vaildData(this.permission.menu.menu_add_child,false),
       };
 
     },
diff --git a/Source/UBCS-WEB/src/views/system/post.vue b/Source/UBCS-WEB/src/views/system/post.vue
index 0c22c51..94d7b46 100644
--- a/Source/UBCS-WEB/src/views/system/post.vue
+++ b/Source/UBCS-WEB/src/views/system/post.vue
@@ -21,11 +21,11 @@
                @on-load="onLoad">
       <template slot="menuLeft">
         <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.post_delete"
-                   @click="handleDelete">鍒� 闄�
+          size="small"
+          icon="el-icon-delete"
+          plain
+          v-if="permissionList.delBtn"
+          @click="handleDelete">鍒� 闄�
         </el-button>
       </template>
       <template slot-scope="{row}"
@@ -152,10 +152,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.post_add, false),
-          viewBtn: this.vaildData(this.permission.post_view, false),
-          delBtn: this.vaildData(this.permission.post_delete, false),
-          editBtn: this.vaildData(this.permission.post_edit, false)
+          addBtn: this.vaildData(this.permission.post.post_add, false),
+          viewBtn: this.vaildData(this.permission.post.post_view, false),
+          delBtn: this.vaildData(this.permission.post.post_delete, false),
+          editBtn: this.vaildData(this.permission.post.post_edit, false)
         };
       },
       ids() {
diff --git a/Source/UBCS-WEB/src/views/system/tenant.vue b/Source/UBCS-WEB/src/views/system/tenant.vue
index 5effe12..b740917 100644
--- a/Source/UBCS-WEB/src/views/system/tenant.vue
+++ b/Source/UBCS-WEB/src/views/system/tenant.vue
@@ -23,30 +23,30 @@
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
-                   v-if="permission.tenant_delete"
+                   v-if="permissionList.delBtn"
                    plain
                    @click="handleDelete">鍒� 闄�
         </el-button>
         <el-tooltip class="item" effect="dark" content="缁欑鎴烽厤缃嫭绔嬫暟鎹簮浠ュ疄鐜版暟鎹簱闅旂" placement="top">
-          <el-button size="small"
+          <el-button v-if="permissionList.dsSettingBtn"
+                     size="small"
                      plain
-                     v-if="userInfo.role_name.includes('administrator')"
                      icon="el-icon-coin"
                      @click="handleDatasource">鏁版嵁婧愰厤缃�
           </el-button>
         </el-tooltip>
         <el-tooltip class="item" effect="dark" content="灏嗚彍鍗曚骇鍝佸寘涓庣鎴烽厤缃粦瀹�" placement="top">
-          <el-button size="small"
+          <el-button v-if="permissionList.packageSettingBtn"
+                     size="small"
                      plain
-                     v-if="userInfo.role_name.includes('administrator')"
                      icon="el-icon-notebook-1"
                      @click="handlePackage">浜у搧鍖呴厤缃�
           </el-button>
         </el-tooltip>
         <el-tooltip class="item" effect="dark" content="灏嗚嚜瀹氫箟鐨勮彍鍗曢泦鍚堝畾鍒朵负绉熸埛缁戝畾鐨勮彍鍗曚骇鍝佸寘" placement="top">
-          <el-button size="small"
+          <el-button v-if="permissionList.packageMgrBtn"
+                     size="small"
                      plain
-                     v-if="userInfo.role_name.includes('administrator')"
                      icon="el-icon-notebook-2"
                      @click="handlePackageSetting">浜у搧鍖呯鐞�
           </el-button>
@@ -208,10 +208,13 @@
     ...mapGetters(["userInfo", "permission"]),
     permissionList() {
       return {
-        addBtn: this.vaildData(this.permission.tenant_add, false),
-        viewBtn: this.vaildData(this.permission.tenant_view, false),
-        delBtn: this.vaildData(this.permission.tenant_delete, false),
-        editBtn: this.vaildData(this.permission.tenant_edit, false)
+        addBtn: this.vaildData(this.permission.tenant.tenant_add, false),
+        viewBtn: this.vaildData(this.permission.tenant.tenant_view, false),
+        delBtn: this.vaildData(this.permission.tenant.tenant_delete, false),
+        editBtn: this.vaildData(this.permission.tenant.tenant_edit, false),
+        dsSettingBtn: this.vaildData(this.permission.tenant.tenant_ds_setting, false),
+        packageSettingBtn: this.vaildData(this.permission.tenant.tenant_package_setting,false),
+        packageMgrBtn: this.vaildData(this.permission.tenant.tenant_package_mgr,false),
       };
     },
     ids() {
@@ -307,7 +310,7 @@
               type: 'radio',
               width: 100,
               value:0,
-              disabled:this.BooleanFlag ,
+              disabled: this.BooleanFlag ,
               hide:true,
               dicData: [{
                 label: '寮�鍚�',
diff --git a/Source/UBCS-WEB/src/views/system/topmenu.vue b/Source/UBCS-WEB/src/views/system/topmenu.vue
index b55335f..a2509d3 100644
--- a/Source/UBCS-WEB/src/views/system/topmenu.vue
+++ b/Source/UBCS-WEB/src/views/system/topmenu.vue
@@ -20,18 +20,20 @@
                @row-click="clickRowChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <el-button v-if="permissionList.delBtn"
+                   type="danger"
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.topmenu_delete"
-                   @click="handleDelete">鍒� 闄�
+                   @click="handleDelete">
+                   鍒� 闄�
         </el-button>
-        <el-button size="small"
-                   icon="el-icon-delete"
+        <el-button v-if="permissionList.settingBtn"
+                   size="small"
+                   icon="iconfont iconicon_setting"
                    @click="handleMenuSetting"
-                   v-if="permission.topmenu_setting"
-                   plain>鑿滃崟閰嶇疆
+                   plain>
+                   鑿滃崟閰嶇疆
         </el-button>
       </template>
       <template slot-scope="{row}" slot="source">
@@ -159,10 +161,11 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.topmenu_add, false),
-          viewBtn: this.vaildData(this.permission.topmenu_view, false),
-          delBtn: this.vaildData(this.permission.topmenu_delete, false),
-          editBtn: this.vaildData(this.permission.topmenu_edit, false)
+          addBtn: this.vaildData(this.permission.topmenu.topmenu_add, false),
+          viewBtn: this.vaildData(this.permission.topmenu.topmenu_view, false),
+          delBtn: this.vaildData(this.permission.topmenu.topmenu_delete, false),
+          editBtn: this.vaildData(this.permission.topmenu.topmenu_edit, false),
+          settingBtn: this.vaildData(this.permission.topmenu.topmenu_setting,false),
         };
       },
       ids() {

--
Gitblit v1.9.3