From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 WebService/src/main/resources/components/privilegePackage/privilege-manage/privilege.html |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/WebService/src/main/resources/components/privilegePackage/privilege-manage/privilege.html b/WebService/src/main/resources/components/privilegePackage/privilege-manage/privilege.html
index e9086df..83a6c2f 100644
--- a/WebService/src/main/resources/components/privilegePackage/privilege-manage/privilege.html
+++ b/WebService/src/main/resources/components/privilegePackage/privilege-manage/privilege.html
@@ -29,10 +29,9 @@
                     <tr>
                         <th>鏉冮檺缂栫爜</th>
                         <th>鏉冮檺鍚嶇О</th>
-                        <th>璧勬簮璺緞</th>
                         <th>鏉冮檺鎻忚堪</th>
                         <th>鍒涘缓鏃堕棿</th>
-                        <th>鎿嶄綔</th>
+                        <th class="text-right">鎿嶄綔</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -41,13 +40,12 @@
                         {{privilege.pId}}
                     </td>
                     <td class="mail-ontact">{{privilege.name}}</td>
-                    <td class="mail-ontact">{{privilege.resource}}</td>
                     <td class="mail-subject">{{privilege.description}}</td>
                     <td class="">{{vc.dateFormat(privilege.createTime)}}</td>
-                    <td class="text-right mail-date">
-                        <i  v-if="privilegeInfo._currentStoreId != '9999'"
-                                                         v-on:click="openDeletePrivilegeModel(privilege)"
-                                                         class="glyphicon glyphicon-remove"></i>
+                    <td class="text-right">
+                        <div class="btn-group">
+                            <button class="btn-white btn btn-xs" v-on:click="openDeletePrivilegeModel(privilege)">鍒犻櫎</button>
+                        </div>
                     </td>
                 </tr>
 

--
Gitblit v1.8.0