zhangdan 4 rokov pred
rodič
commit
02027f9940

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

@@ -2068,7 +2068,7 @@ export const asyncRouterMap = [
             meta: {
               title: '数据字典管理',
               icon: 'database',
-              permission: 'M_dataDictionary'
+              permission: 'M_dataD_lookup'
             }
           },
           // {

+ 4 - 0
src/views/basicData/transferTypeManagement/list.vue

@@ -7,6 +7,7 @@
           id="transferTypeManagementList-add"
           type="primary"
           class="button-error"
+          v-if="$hasPermissions('B_transferTypeManagement_add')"
           @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
@@ -25,13 +26,16 @@
             type="link"
             class="button-info"
             @click="handleEdit(record)"
+            v-if="$hasPermissions('B_transferTypeManagement_edit')"
             id="transferTypeManagementList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
+            v-if="$hasPermissions('B_transferTypeManagement_del')"
             id="transferTypeManagementList-del-btn">删除</a-button>
+          <span v-if="!$hasPermissions('B_transferTypeManagement_del') &&!$hasPermissions('B_transferTypeManagement_edit')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 5 - 3
src/views/basicData/warehouse/list.vue

@@ -19,7 +19,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="warehouseList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button v-if="$hasPermissions('B_warehouse_add')" id="warehouseList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -38,21 +38,23 @@
             type="link"
             class="button-warning"
             @click="goStoringLocation(record)"
+            v-if="$hasPermissions('B_warehouse_add')"
             id="warehouseList-storingLocation-btn">仓位管理</a-button>
           <a-button
             size="small"
             type="link"
             class="button-info"
-            v-if="record.defaultFlag!='1'"
+            v-if="record.defaultFlag!='1' &&$hasPermissions('B_warehouse_edit') "
             @click="handleEdit(record)"
             id="warehouseList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
-            v-if="record.defaultFlag!='1'"
+            v-if="record.defaultFlag!='1' &&$hasPermissions('B_warehouse_del')"
             @click="handleDel(record)"
             id="warehouseList-del-btn">删除</a-button>
+          <span v-if="record.defaultFlag=='0' && !$hasPermissions('B_warehouse_edit') && !$hasPermissions('B_warehouse_del')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 4 - 4
src/views/power/menu/menu.vue

@@ -1,9 +1,9 @@
 <template>
   <a-card :bordered="false">
     <a-row :gutter="24">
-      <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addChild">添加子菜单</a-button>
-      <a-button style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTitle">添加顶部菜单</a-button>
-      <a-button style="margin-right: 10px;background-color: red;color: #fff;" type="" icon="delete" @click="delect()">删除</a-button>
+      <a-button v-if="$hasPermissions('B_power_menu_child_add')" style="margin-right: 10px;" type="primary" icon="plus" @click="addChild">添加子菜单</a-button>
+      <a-button v-if="$hasPermissions('B_power_menu_top_add')" style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTitle">添加顶部菜单</a-button>
+      <a-button v-if="$hasPermissions('B_power_menu_del')" style="margin-right: 10px;background-color: red;color: #fff;" type="" icon="delete" @click="delect()">删除</a-button>
 
     </a-row>
     <a-row :gutter="24">
@@ -172,7 +172,7 @@
           </a-form-item>
 
           <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-            <a-button type="primary" @click="handleSubmit()">
+            <a-button type="primary" @click="handleSubmit()" v-if="$hasPermissions('B_power_menu_edit')">
               保存
             </a-button>
             <a-button :style="{ marginLeft: '8px' }" @click="clear">

+ 7 - 4
src/views/power/role/roleList.vue

@@ -29,7 +29,7 @@
       </div>
       <div class="table-operator">
         <!-- <a-button v-if="$hasPermissions('B_powerMD_role_add')" type="primary" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button> -->
-        <a-button type="primary" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button>
+        <a-button type="primary" v-if="$hasPermissions('B_power_role_add')" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button>
       </div>
 
       <s-table
@@ -55,7 +55,9 @@
             unCheckedChildren="禁用"
             id="roleList-isEnable"
             v-model="record.isEnable"
+            v-if="$hasPermissions('B_power_role_enable')"
             @change="changeFlagHandle(text, record)" />
+          <span v-else>--</span>
         </span>
         <!-- 角色描述 -->
         <template slot="remarks" slot-scope="text, record">
@@ -71,14 +73,15 @@
             :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
             v-if="!record.isEnable && $hasPermissions('B_powerMD_role_del')"
             @click="delect(record)" /> -->
-          <a-icon type="setting" title="菜单权限" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="openMenuModal(record)" />
-          <a-icon type="edit" title="编辑" :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}" @click="handleEdit(record)" />
+          <a-icon type="setting" title="菜单权限" v-if="$hasPermissions('M_power_role_menu')" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="openMenuModal(record)" />
+          <a-icon type="edit" title="编辑" v-if="$hasPermissions('B_power_role_edit')" :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}" @click="handleEdit(record)" />
           <a-icon
             type="delete"
             title="删除"
             :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
-            v-if="!record.isEnable"
+            v-if="!record.isEnable && $hasPermissions('B_power_role_del')"
             @click="delect(record)" />
+          <span v-if="!$hasPermissions('M_power_role_menu') && !$hasPermissions('B_power_role_edit') && (record.isEnable && !$hasPermissions('B_power_role_del'))">--</span>
         </span>
       </s-table>
     </a-spin>

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

@@ -28,7 +28,7 @@
       </div>
       <div class="table-operator">
         <!-- <a-button v-if="$hasPermissions('B_powerMD_user_add')" type="primary" class="button-error" @click="openModal">新增</a-button> -->
-        <a-button type="primary" class="button-error" @click="openModal">新增</a-button>
+        <a-button type="primary" v-if="$hasPermissions('B_power_user_add')" class="button-error" @click="openModal">新增</a-button>
       </div>
       <s-table
         ref="table"
@@ -44,8 +44,8 @@
           <!-- <a-switch v-if="$hasPermissions('B_powerMD_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
           <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span> -->
           <!-- 超级管理员不可删除不可编辑不可启禁用 -->
-          <a-switch v-if="record.superAdmin!=1" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
-          <span v-if="record.superAdmin==1">{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
+          <a-switch v-if="record.superAdmin!=1 && $hasPermissions('B_power_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+          <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
         </span>
         <span slot="action" slot-scope="text, record">
           <!-- <a-icon
@@ -70,25 +70,26 @@
           <a-icon
             type="edit"
             title="编辑"
-            v-if="record.superAdmin!=1"
+            v-if="record.superAdmin!=1 &&$hasPermissions('B_power_user_edit')"
             :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}"
             @click="handleEdit(record)"
           />
           <a-icon
             type="unlock"
             title="重置密码"
-            v-if="record.loginFlag==1 && record.superAdmin!=1"
+            v-if="record.loginFlag==1 && record.superAdmin!=1 &&$hasPermissions('B_power_user_resetPsd')"
             :style="{fontSize: '20px',color:' #ffaa00',padding: '0 10px'}"
             @click="resetPassword(record)" />
           <a-icon
             type="delete"
             title="删除"
             :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
-            v-if="record.loginFlag==0 && record.superAdmin!=1"
+            v-if="record.loginFlag==0 && record.superAdmin!=1 &&$hasPermissions('B_power_user_del')"
             @click="delect(record)"/>
           <a-icon
             type="setting"
             title="分区设置"
+            v-if="$hasPermissions('B_power_user_set')"
             :style="{fontSize: '20px',color:' #00aa00',padding: '0 10px'}"
             @click="handleSetting(record)" />
         </span>