From ccf69ee82f77a2e67a565cec02f95e64324a283f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 15 五月 2024 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/deviceRole_f.vue |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/admin/src/views/business/deviceRole_f.vue b/admin/src/views/business/deviceRole_f.vue
index 97f58ab..7b4273f 100644
--- a/admin/src/views/business/deviceRole_f.vue
+++ b/admin/src/views/business/deviceRole_f.vue
@@ -13,7 +13,7 @@
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
             <ul class="toolbar">
-                <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
+                <li><el-button type="primary"  v-permissions="['business:hksync:privilege']" @click="synchronousData">鍚屾</el-button></li>
             </ul>
             <el-table
                 v-loading="isWorking.search"
@@ -30,7 +30,6 @@
                         <span v-if="row.type === '2'">鍐呴儴浜哄憳</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="memberNum" label="浣跨敤浜烘暟" min-width="100px"></el-table-column>
                 <el-table-column prop="isDefault" label="鏄惁榛樿" min-width="100px">
                     <template slot-scope="{row}">
                         <span v-if="row.isDefault === 0">鏄�</span>
@@ -97,7 +96,7 @@
       }).then(() => {
         syncPrivilege({})
           .then(res => {
-            this.$message({ type: 'success', message: '鍚屾鎴愬姛' })
+            this.$message({ type: 'success', message:res || '鍚屾鎴愬姛' })
             this.search()
           })
       }).catch(() => {

--
Gitblit v1.9.3