合并

src/config/api.js

@@ -345,6 +345,19 @@ const apis = {
       method: 'delete',
       url: `${commPrefix}/role`
     }
-  }
+  },
+  menu:{
+    list: {
+      method: 'get',
+      url: `${commPrefix}/sysmenu`
+    },
+    add: {
+      method: 'post',
+      url: `${commPrefix}/sysmenuAdd`
+    },
+    
+  },
+  
+
 }
 export default apis

src/store/index.js

@@ -18,6 +18,7 @@ import visitor from './modules/visitor'
 import lobby from './modules/lobby'
 import followup from './modules/followup'
 import sysyrole from './modules/role'
+import sysmenu from './modules/sysmenu'
 
 Vue.use(Vuex)
 
@@ -40,7 +41,8 @@ const store = new Vuex.Store({
     visitor,
     lobby,
     followup,
-    sysyrole
+    sysyrole,
+    sysmenu
   }
 })
 

src/store/modules/role.js

@@ -83,5 +83,16 @@ export default {
 
             })
         },
+        aAddNode({ commit }) {
+            return new Promise((resolve, reject) => {
+                const api = lodash.get(apis, 'menu.add')
+                interact(api).then((data) => {
+                    resolve(data)
+                    commit('setMenus', data)
+                }).catch(() => {
+                    reject()
+                })
+            })
+        },
     }
 }

src/store/modules/sysuser.js

@@ -107,11 +107,11 @@ export default {
         })
       })
     },
-    userRoledetails ({ commit }, payload) {
+    userRoledetails (_, payload) {
       return new Promise((resolve, reject) => {
         const api = lodash.get(apis, 'sysuser.userRoledetails')
         interact(api,payload).then((data) => {
-          commit('updateList', data)
+          //commit('updateList', data)
           resolve(data)
         }).catch(() => {
           reject()

src/views/index.js

@@ -40,13 +40,31 @@ const pages = [
           },
         ],
       },
+      // {
+      //   path: 'sysuser/userRole',
+      //   name: 'userRole',
+      //   component: () => import('./sysuser/userRole/list.vue'),
+      //   meta: {
+      //     menuShow: true,
+      //     title: '人员角色',
+      //   },
+      // },
       {
-        path: 'sysuser/userRole',
-        name: 'userRole',
-        component: () => import('./sysuser/userRole/list.vue'),
+        path: 'sysmenu/list',
+        name: 'sysmenu',
+        component: () => import('./sysmenu/list.vue'),
         meta: {
           menuShow: true,
-          title: '人员角色',
+          title: '菜单管理',
+        },
+      },
+      {
+        path: 'sysmenu/add',
+        name: 'sysmenuAdd',
+        component: () => import('./sysmenu/add.vue'),
+        meta: {
+          menuShow: false,
+          title: '添加菜单',
         },
       },
       {

src/views/sysuser/edit.vue

@@ -23,6 +23,17 @@
           <el-option label="启用" :value="1"></el-option>
         </el-select>
       </el-form-item>
+
+      <el-form-item label="角色权限"  required>
+      <el-select v-model="roleId" multiple placeholder="请选择">
+      <el-option
+      v-for="(item, index) in sysRole"
+      :key="index"
+      :label="item.roleName"
+      :value="item.roleId">
+      </el-option>
+      </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit">保存</el-button>
         <el-button @click="onCancel">取消</el-button>
@@ -39,6 +50,15 @@ const {mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUser
 export default {
   data () {
     return {
+      formInline: {
+        userId: '',
+        label: [],
+        value: [],
+        menuArray: []
+        
+      },
+      roleId: [],
+      sysRole:[],
       rules: {
         nickname: [
           { required: true, message: '请输入用户名', trigger: 'blur' }
@@ -49,7 +69,10 @@ export default {
         status: [
           { required: true, message: '请选择状态', trigger: 'change' }
         ],
-      }
+      },
+    
+        value1: [],
+        value2: []
     }
   },
   methods: {
@@ -57,9 +80,12 @@ export default {
       'getDetail',
       'addSysUser',
       'editSysUser',
+      'userRoledetails',
+      'updateUserRolede',
     ]),
     ...mapUserMutations([
       'updateDetail',
+      
     ]),
     onCancel () {
       this.$router.back()
@@ -81,6 +107,10 @@ export default {
           this.editSysUser({...this.detail, isSales: 1}).then(() => {
             this.$notify.success('编辑信息成功')
           })
+          // 保存角色
+          console.log('this.formInline.menuArray',this.formInline.menuArray)
+          this.formInline.menuArray = this.roleId
+          this.updateUserRolede(this.formInline)
         }
 
       })
@@ -102,6 +132,11 @@ export default {
     }),
   },
   created () {
+    this.formInline.userId = this.$route.query.id
+    this.userRoledetails(this.formInline).then((data)=>{
+        this.sysRole = data.sysRole
+        this.roleId = data.arrayList
+    })
     this.init()
   },
 }

src/views/sysuser/list.vue

@@ -2,13 +2,13 @@
 <r-layout>
   <xm-search @submit="search">
     <el-form-item>
-      <el-input v-model="filterData.name" placeholder="用户名" clearable></el-input>
+      <el-input v-model="listQuery.name" placeholder="用户名" clearable></el-input>
     </el-form-item>
     <el-form-item>
-      <el-input v-model="filterData.phone" placeholder="手机号" clearable></el-input>
+      <el-input v-model="listQuery.phone" placeholder="手机号" clearable></el-input>
     </el-form-item>
     <el-form-item>
-        <el-select v-model="filterData.identity" placeholder="请选择">
+        <el-select v-model="listQuery.identity" placeholder="请选择">
           <el-option label="全部"></el-option>
           <el-option
             v-for="item in identityDict"
@@ -55,10 +55,10 @@
       </el-table-column>
       <el-table-column
         fixed="right"
-        label="操作"
-        width="120">
+        label="操作">
         <template slot-scope="scope">
           <el-button type="text" @click="handleEdit(scope.row)" size="small">编辑</el-button>
+           <el-button type="text" @click="addUserRole(scope.row)" size="small">添加权限</el-button>       
         </template>
       </el-table-column>
     </el-table>
@@ -73,6 +73,28 @@
     @current-change="getList"
   >
   </el-pagination>
+
+    <el-dialog title="添加权限" :visible.sync="filterData.dialogFormVisible" :show-close="filterData.close">
+      <el-form :model="filterData">  
+      <el-form-item label="角色权限"  required>
+      <el-select v-model="userRoleId" multiple placeholder="请选择">
+      <el-option
+      v-for="(item, index) in sysRole"
+      :key="index"
+      :label="item.roleName"
+      :value="item.roleId">
+      </el-option>
+      </el-select>
+      </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="TransactionReplyOff">取 消</el-button>
+        <el-button type="primary" @click="TransactionReplyAdd()">确 定</el-button>
+      </div>
+    </el-dialog>
+
+
 </r-layout>
 </template>
 
@@ -89,7 +111,17 @@ export default {
         name: '',
         phone: '',
         identity: undefined,
+        dialogFormVisible: false,
+        close: false,
+        menuArray:[]
       },
+      listQuery: {
+        name: '',
+        phone: '',
+        identity: undefined,
+      },
+      sysRole:[],
+      userRoleId:[],
       pageNavi: {
         page: 1,
         size: 10,
@@ -106,10 +138,20 @@ export default {
   methods: {
     ...mapUserActions([
       'getSysUserList',
+      'userRoledetails',
+      'updateUserRolede',
     ]),
     handleEdit (row) {
       this.$router.push({ name: 'sysuseredit', query: {id: row.userId} })
     },
+    addUserRole (row) {
+      this.filterData.userId = row.userId;
+          this.userRoledetails(this.filterData).then((data)=>{
+          this.sysRole = data.sysRole
+          this.userRoleId = data.arrayList
+      })
+      this.filterData.dialogFormVisible = true
+    },
     addUser () {
       this.$router.push({ name: 'sysuseredit' })
     },
@@ -117,7 +159,7 @@ export default {
       this.getSysUserList({
         pageNum: this.pageNavi.page || 1,
         pageSize: this.pageNavi.size,
-        ...this.filterData,
+        ...this.listQuery,
       }).then((data) => {
         const { current: page, size, total } = data
         this.pageNavi = { page, size, total }
@@ -139,7 +181,21 @@ export default {
     getIdentityName (val) {
       const identity = (this.identityDict || []).filter(x => x.value == val)[0] || {}
       return identity.label || '-'
+    },
+    TransactionReplyOff(){
+      this.filterData.dialogFormVisible = false
+      this.getList()
+    },
+    TransactionReplyAdd(){
+          this.filterData.menuArray = this.userRoleId
+          this.updateUserRolede(this.filterData).then((res)=>{
+            console.log('测试返回值：', res)
+            this.getList()
+          })
+          this.filterData.dialogFormVisible = false 
+          
     }
+    
   },
   created () {
     this.init()

src/views/sysuser/userRole/addUserRole.vue

@@ -1,9 +1,6 @@
 <template>
   <div id="root">
     <el-form ref="formInline" :model="formInline" :rules="rules" label-width="100px" class="demo-formInline">
-      <el-form-item class="filter-item" label="手机号" prop="phone" >
-        <el-input v-model.trim="formInline.phone" placeholder="手机号" />
-      </el-form-item>
       <el-form-item label="角色" prop="menuArray">
         <!-- default-expanded-keys 展示选中的
              default-checked-keys 勾上选中的-->
@@ -14,11 +11,10 @@
           :default-checked-keys="formInline.menuArray"
           :props="defaultProps"
           show-checkbox
-          node-key="id"
-          @check-change="handleCheckChange"/>
+          node-key="id"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm('formInline')">立即创建</el-button>
+        <el-button type="primary" @click="submitForm('formInline')">添加权限</el-button>
       </el-form-item>
     </el-form>
   </div>
@@ -40,7 +36,8 @@ export default {
         pageSize: 10,
         menuArray:[],
         roleId:[],
-         empty:[]
+         empty:[],
+         userId:'',
 
       },
       defaultProps: {
@@ -67,6 +64,7 @@ export default {
     })
   },
   created() {
+    this.formInline.userId = this.$route.query.id
     this.dateQuery()
   },
   methods: {
@@ -116,8 +114,8 @@ export default {
        this.formInline.roleId.push(item.roleId)
        })
        this.addUserRole(this.formInline).then((data)=>{ 
-         if(data.phone === this.formInline.phone){
-             this.$router.push({ name: 'userRole' })
+         if(data.userId === this.formInline.userId){
+             this.$router.push({ name: 'sysuserlist' })
              return
              }
        })}