zhangdan пре 4 година
родитељ
комит
5a30c480dc

+ 7 - 7
src/api/userManage.js

@@ -57,13 +57,13 @@ export const saveUserPower = params => {
 }
 
 // 获取角色列表接口
-export const getRoleList = params => {
-  return axios({
-    url: 'sleler/role/findAll',
-    data: params,
-    method: 'POST'
-  })
-}
+// export const getRoleList = params => {
+//   return axios({
+//     url: 'sleler/role/findAll',
+//     data: params,
+//     method: 'POST'
+//   })
+// }
 
 // 编辑查详情
 export const slelerDetails = (params) => {

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

@@ -190,7 +190,7 @@ export const asyncRouterMap = [{
         meta: {
           title: '用户管理',
           icon: 'profile',
-          permission: 'M_user_userManage'
+          permission: 'M_user_userManage_list'
         },
         hideChildrenInMenu: true,
         children: [{

+ 5 - 3
src/views/businessManage/userManage/userManage.vue

@@ -60,7 +60,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_userManage_add'">新增</a-button>
     </div>
 
     <s-table
@@ -72,6 +72,7 @@
       bordered>
       <span slot="status" slot-scope="text, record">
         <a-switch
+			v-hasPermission="'B_userManage_enable'"
           checkedChildren="启用"
           unCheckedChildren="禁用"
           v-model="record.loginFlag"
@@ -80,22 +81,23 @@
       </span>
       <span slot="action" slot-scope="text, record">
         <a-icon
+			v-if="$hasPermissions('B_userManage_resetPwd') && record.loginFlag==1"
           type="unlock"
           title="重置密码"
-          v-if="record.loginFlag==1"
           class="actionBtn icon-orange"
           @click="resetPassword(record)" />
         <a-icon
+			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"
           type="delete"
           title="删除"
           class="actionBtn icon-red"
-          v-if="record.loginFlag==0"
           @click="delect(record)"/>
       </span>
     </s-table>

+ 2 - 2
src/views/userInfo/userDetails.vue

@@ -9,7 +9,7 @@
       <a-col :span="24" class="item-cont">
         <p class="item-label">手机号码:</p>
         <p class="item-main">{{ page.mobile ? page.mobile : '--' }}</p>
-        <a-icon type="edit" title="修改手机号码" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="editPhone" />
+        <a-icon type="edit" title="修改手机号码" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="editPhone" v-hasPermission="'B_user_userdetails_editPhone'"/>
         <!-- <a style="margin-left: 100px; color: #2D8CF0;" @click="editPhone">修改手机号码</a> -->
       </a-col>
       <a-col :span="24" class="item-cont">
@@ -19,7 +19,7 @@
       <a-col :span="24" class="item-cont">
         <p class="item-label">乐豆余额:</p>
         <p class="item-main">{{ page.currentGold ? page.currentGold : 0 }}</p>
-        <a-icon type="edit" title="修改乐豆余额" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="editLd(page)" />
+        <a-icon type="edit" title="修改乐豆余额" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="editLd(page)" v-hasPermission="'B_user_userDetails_editLdNum'"/>
         <!-- <a style="margin-left: 145px; color: #2D8CF0;" @click="editLd(page)">修改乐豆余额</a> -->
       </a-col>
       <a-col :span="24" class="item-cont">

+ 8 - 5
src/views/userInfo/userManageList.vue

@@ -35,7 +35,7 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button class="export-btn" id="releaseRecordList-btn-export" type="" :loading="loading" @click="handleExport">导出</a-button>
+      <a-button class="export-btn" id="releaseRecordList-btn-export" type="" :loading="loading" @click="handleExport" v-hasPermission="'B_user_userManage_export'">导出</a-button>
     </div>
     <s-table
       ref="table"
@@ -45,18 +45,21 @@
       :data="loadData"
       bordered>
       <!--启用禁用 -->
-      <span slot="state" slot-scope="text, record">
+      <template slot="state" slot-scope="text, record">
         <a-switch
+		v-hasPermission="'B_user_userManage_enable'"
           checkedChildren="启用"
           unCheckedChildren="禁用"
           id="releaseRecordList-changeFlagHandle"
           :checked="record.state == 1 ? true : false"
           @change="changeFlagHandle(text, record)" />
-      </span>
+		  <span v-if="!$hasPermissions('B_user_userManage_enable')"></span>
+      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button id="releaseRecordList-handleUser" type="link" @click="handleUser(record)">用户详情</a-button>
-        <a-button id="releaseRecordList-handleLd" type="link" @click="handleLd(record)">乐豆明细</a-button>
+			 <a-button id="releaseRecordList-handleUser" type="link" @click="handleUser(record)" v-hasPermission="'B_user_userManage_userDetails'">用户详情</a-button>
+			 <a-button id="releaseRecordList-handleLd" type="link" @click="handleLd(record)" v-hasPermission="'B_user_userManage_userDetails'">乐豆明细</a-button> 
+			 <span v-if="!$hasPermissions('B_user_userManage_userDetails') && !$hasPermissions('B_user_userManage_userDetails')">--</span>
       </template>
     </s-table>
   </a-card>