zhangdan 4 yıl önce
ebeveyn
işleme
b317d4c774

+ 12 - 12
src/config/router.config.js

@@ -307,8 +307,8 @@ export const asyncRouterMap = [{
         '@/views/equipmentManage/exchangeSetting/ExchangeSetting.vue'),
       meta: {
         title: '兑换规则设置',
-        icon: 'build'
-        // permission: 'M_tenants_list'
+        icon: 'build',
+        permission: 'M_exchangeSetting_list'
       }
     },
     {
@@ -317,8 +317,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "equipmentManage" */ '@/views/equipmentManage/openTimeSetting/OpenTimeSetting.vue'),
       meta: {
         title: '投放时间设置',
-        icon: 'dashboard'
-        // permission: 'M_tenants_list'
+        icon: 'dashboard',
+        permission: 'M_openTimeSetting_list'
       }
     }
     ]
@@ -384,8 +384,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '权限管理',
-      icon: 'lock'
-      // permission: 'M_auth_0'
+      icon: 'lock',
+      permission: 'M_auth_0'
     },
     children: [
       {
@@ -394,8 +394,8 @@ export const asyncRouterMap = [{
         component: () => import(/* webpackChunkName: "auth" */ '@/views/power/user/userList.vue'),
         meta: {
           title: '用户管理',
-          icon: 'user'
-        // permission: 'M_auth_userList'
+          icon: 'user',
+          permission: 'M_power_user_list'
         }
       },
       {
@@ -404,8 +404,8 @@ export const asyncRouterMap = [{
         component: () => import(/* webpackChunkName: "auth" */ '@/views/power/role/roleList.vue'),
         meta: {
           title: '角色管理',
-          icon: 'solution'
-        // permission: 'M_auth_roleList'
+          icon: 'solution',
+          permission: 'M_power_role_list'
         }
       },
       {
@@ -447,8 +447,8 @@ export const asyncRouterMap = [{
         '@/views/power/OperateJournal/OperateJournal.vue'),
       meta: {
         title: '操作日志',
-        icon: 'read'
-        // permission: 'M_operateJournal'
+        icon: 'read',
+        permission: 'M_OperateJournal'
       }
     }
     ]

+ 2 - 0
src/views/businessManage/partnerManage/partnerManage.vue

@@ -53,6 +53,7 @@
           @click="handleEdit(record)" />
 
         <a-icon type="qrcode" title="查看小程序码" @click="getQrCode(record)" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" v-hasPermission="'B_partnerManage_QRcode'" />
+        <span v-if="!$hasPermissions('B_partnerManage_edit') && (!$hasPermissions('B_partnerManage_QRcode') && record.state==0)">--</span>
       </span>
       <span slot="state" slot-scope="text, record">
         <a-switch
@@ -63,6 +64,7 @@
           :checked="record.state == 1 ? true : false"
           @change="changeFlagHandle(text, record)"
         />
+        <span v-if="!$hasPermissions('B_partnerManage_enable')">--</span>
       </span>
     </s-table>
     <!-- 新增编辑弹窗 -->

+ 6 - 4
src/views/businessManage/userManage/userManage.vue

@@ -72,33 +72,35 @@
       bordered>
       <span slot="status" slot-scope="text, record">
         <a-switch
-			v-hasPermission="'B_userManage_enable'"
+          v-hasPermission="'B_userManage_enable'"
           checkedChildren="启用"
           unCheckedChildren="禁用"
           v-model="record.loginFlag"
           @change="changeFlagHandle(text, record)"
           id="userList-changeFlagHandle" />
+        <span v-if="$hasPermissions('B_userManage_enable')">--</span>
       </span>
       <span slot="action" slot-scope="text, record">
         <a-icon
-			v-if="$hasPermissions('B_userManage_resetPwd') && record.loginFlag==1"
+          v-if="$hasPermissions('B_userManage_resetPwd') && record.loginFlag==1"
           type="unlock"
           title="重置密码"
           class="actionBtn icon-orange"
           @click="resetPassword(record)" />
         <a-icon
-			v-hasPermission="'B_userManage_edit'"
+          v-hasPermission="'B_userManage_edit'"
           type="edit"
           title="编辑"
           class="actionBtn icon-blues"
           @click="handleEdit(record)"
         />
         <a-icon
-		v-if="$hasPermissions('B_userManage_del') && record.loginFlag==0"
+          v-if="$hasPermissions('B_userManage_del') && record.loginFlag==0"
           type="delete"
           title="删除"
           class="actionBtn icon-red"
           @click="delect(record)"/>
+        <span v-if="!$hasPermissions('B_userManage_edit') && (!$hasPermissions('B_userManage_resetPwd') && record.loginFlag==1) && (!$hasPermissions('B_userManage_del') && record.loginFlag==0) ">--</span>
       </span>
     </s-table>
     <userModal :visible="showModal" @refresh="$refs.table.refresh(true)" :itemId="itemId" @close="cancel"></userModal>

+ 1 - 1
src/views/equipmentManage/boxSetting/boxSetting.vue

@@ -29,7 +29,7 @@
       <template slot="action" slot-scope="text, record">
         <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_boxSetting_edit'" />
         <a-icon type="delete" title="删除" class="actionBtn icon-red" @click="delect(record)" v-if="$hasPermissions('B_boxSetting_del') && !record.isEnable"/>
-        <span v-if="!$hasPermissions('B_boxSetting_del') && (!$hasPermissions('B_boxSetting_del') && !record.isEnable)">--</span>
+        <span v-if="!$hasPermissions('B_boxSetting_edit') && (!$hasPermissions('B_boxSetting_del') && !record.isEnable)">--</span>
       </template>
     </s-table>
     <!-- 新增/编辑 弹窗 -->

+ 4 - 3
src/views/equipmentManage/exchangeSetting/ExchangeSetting.vue

@@ -16,7 +16,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal">新增</a-button>
+      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal" v-hasPermission="'B_exchangeSetting_add'">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -27,8 +27,9 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" />
-        <a-icon type="delete" title="删除" class="actionBtn icon-red" v-if="!record.isEnable" @click="delect(record)" />
+        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_exchangeSetting_edit'"/>
+        <a-icon type="delete" title="删除" class="actionBtn icon-red" v-if="$hasPermissions('B_exchangeSetting_del') && !record.isEnable" @click="delect(record)" />
+        <span v-if="!$hasPermissions('B_exchangeSetting_edit') && (!$hasPermissions('B_exchangeSetting_del') && !record.isEnable)">--</span>
       </template>
     </s-table>
     <!-- 新增/编辑 弹窗 -->

+ 4 - 3
src/views/equipmentManage/openTimeSetting/OpenTimeSetting.vue

@@ -16,17 +16,18 @@
       </template>
       <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" />
+        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_openTimeSetting_edit'"/>
         <a-icon
           type="delete"
           title="删除"
           class="actionBtn icon-red"
-          v-if="!record.isEnable"
+          v-if="$hasPermissions('B_openTimeSetting_del') && !record.isEnable"
           @click="delect(record)" />
+        <span v-if="!$hasPermissions('B_openTimeSetting_edit') && (!$hasPermissions('B_openTimeSetting_del') && !record.isEnable)">--</span>
       </span>
     </s-table>
     <!-- 新增/编辑 弹窗 -->
-    <add-time-modal :visible="showModal" :id="itemId" @refresh="refreshTable" @close="showModal = false"></add-time-modal>
+    <add-time-modal :visible="showModal" :id="itemId" @refresh="refreshTable" @close="showModal = false" v-hasPermission="'B_openTimeSetting_add'"></add-time-modal>
   </a-card>
 </template>
 

+ 14 - 5
src/views/power/role/roleList.vue

@@ -29,7 +29,7 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal">新增</a-button>
+      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal" v-hasPermission="'B_power_role_add'">新增</a-button>
     </div>
 
     <s-table
@@ -41,7 +41,14 @@
       bordered>
       <!-- 启用禁用 -->
       <span slot="status" slot-scope="text, record">
-        <a-switch checkedChildren="启用" unCheckedChildren="禁用" id="roleList-isEnable" v-model="record.isEnable" @change="changeFlagHandle(text, record)" />
+        <a-switch
+          checkedChildren="启用"
+          unCheckedChildren="禁用"
+          id="roleList-isEnable"
+          v-model="record.isEnable"
+          v-hasPermission="'B_power_role_enable'"
+          @change="changeFlagHandle(text, record)" />
+        <span v-if="!$hasPermissions('B_power_role_enable')">--</span>
       </span>
       <!-- 角色描述 -->
       <template slot="remarks" slot-scope="text, record">
@@ -49,14 +56,16 @@
       </template>
       <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
-        <a-icon type="setting" title="菜单权限" class="actionBtn icon-orange" @click="openMenuModal(record)" />
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" />
+        <a-icon type="setting" title="菜单权限" class="actionBtn icon-orange" @click="openMenuModal(record)" v-hasPermission="'M_power_role_menu'"/>
+        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_power_role_edit'" />
         <a-icon
           type="delete"
           title="删除"
           class="actionBtn icon-red"
-          v-if="!record.isEnable"
+          v-if="$hasPermissions('B_power_role_del') && !record.isEnable"
           @click="delect(record)" />
+        <span v-if="!$hasPermissions('M_power_role_menu') && !$hasPermissions('B_power_role_edit') && (!$hasPermissions('B_power_role_del') && !record.isEnable)">--</span>
+      </span>
       </span>
     </s-table>
     <roleModal :visible="showModal" :data="itemData" @refresh="refreshTable" @close="showModal = false"></roleModal>

+ 6 - 3
src/views/power/user/userList.vue

@@ -41,7 +41,7 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="userList-openModal">新增</a-button>
+      <a-button type="primary" icon="plus" @click="openModal" id="userList-openModal" v-hasPermission="'B_power_user_add'">新增</a-button>
     </div>
 
     <s-table
@@ -53,20 +53,23 @@
       bordered>
       <span slot="status" slot-scope="text, record">
         <a-switch
+          v-hasPermission="'B_power_user_enable'"
           checkedChildren="启用"
           unCheckedChildren="禁用"
           v-model="record.loginFlag"
           @change="changeFlagHandle(text, record)"
           id="userList-changeFlagHandle" />
+        <span v-if="!$hasPermissions('B_power_user_enable')">--</span>
       </span>
       <span slot="action" slot-scope="text, record">
         <a-icon
           type="unlock"
           title="重置密码"
-          v-if="record.loginFlag==1"
+          v-if="$hasPermissions('B_power_user_resetPsd') && record.loginFlag==1"
           class="actionBtn icon-orange"
           @click="resetPassword(record)" />
         <a-icon
+          v-hasPermission="'B_power_user_edit'"
           type="edit"
           title="编辑"
           class="actionBtn icon-blues"
@@ -76,7 +79,7 @@
           type="delete"
           title="删除"
           class="actionBtn icon-red"
-          v-if="record.loginFlag==0"
+          v-if="$hasPermissions('B_power_user_del') && record.loginFlag==0"
           @click="delect(record)"/>
       </span>
     </s-table>

+ 1 - 0
src/views/shopSetting/goodsClass.vue

@@ -51,6 +51,7 @@
           id="goodsClass-changeFlagHandle"
           :checked="record.state == 1 ? true : false"
           @change="changeFlagHandle(text, record)" />
+        <span v-if="!$hasPermissions('B_goodsClass_enable')">--</span>
       </span>
       </span></s-table>
     <add-goodsClass-modal

+ 1 - 0
src/views/shopSetting/supplier.vue

@@ -48,6 +48,7 @@
           :checked="record.state == 1 ? true : false"
           @change="changeFlagHandle(text, record)"
         />
+        <span v-if="!$hasPermissions('B_supplier_enable')">--</span>
       </span>
     </s-table>
     <!-- 新增编辑弹窗 -->