From ca420bd9c09b51a404ade3e0106257725df727be Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期三, 01 十一月 2023 11:32:28 +0800 Subject: [PATCH] 整合代码 --- Source/UBCS-WEB/src/views/system/tenant.vue | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Source/UBCS-WEB/src/views/system/tenant.vue b/Source/UBCS-WEB/src/views/system/tenant.vue index d384ec9..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() { @@ -227,6 +230,7 @@ option(){ return{ height: 'auto', + columnBtn:false, calcHeight: 30, tip: false, searchShow: true, @@ -306,7 +310,7 @@ type: 'radio', width: 100, value:0, - disabled:this.BooleanFlag , + disabled: this.BooleanFlag , hide:true, dicData: [{ label: '寮�鍚�', -- Gitblit v1.9.3