From 53dc2455a66591fa5b5e04661caeb1c4dcad2fd7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 28 十月 2024 15:42:21 +0800
Subject: [PATCH] 最多显示5个标签,支持一键关闭所有标签 保险方案、投保企业、下拉筛选增加搜索功能

---
 platform/src/views/system/role.vue |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/platform/src/views/system/role.vue b/platform/src/views/system/role.vue
index 779e53f..45cab31 100644
--- a/platform/src/views/system/role.vue
+++ b/platform/src/views/system/role.vue
@@ -45,12 +45,8 @@
           min-width="270"
           fixed="right"
         >
-<<<<<<< HEAD
 <!--          v-if="isAdmin || (row.code !== adminCode && userInfo.roles.findIndex(code => code === row.code) === -1)"-->
           <template slot-scope="{row}">
-=======
-          <template v-if="isAdmin || (row.code !== adminCode && userInfo.roles.findIndex(code => code === row.code) === -1)" slot-scope="{row}">
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
             <el-button type="text" @click="$refs.operaRoleWindow.open('缂栬緫瑙掕壊', row)" icon="el-icon-edit" v-permissions="['system:role:update']">缂栬緫</el-button>
             <el-button type="text" @click="$refs.permissionConfigWindow.open(row)" v-permissions="['system:role:createRolePermission']">閰嶇疆鏉冮檺</el-button>
             <el-button type="text" @click="$refs.menuConfigWindow.open(row)" icon="el-icon-menu" v-permissions="['system:role:createRoleMenu']">鎺堟潈鑿滃崟</el-button>

--
Gitblit v1.9.3