合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -96,4 +96,16 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "用户成员列表", notes = "用户成员列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName：手机号,userName：姓名" )
+    })
+    @RequestMapping(value = "/user/addUser", method = RequestMethod.POST)
+    public ResponseBean addUser(@RequestBody String parameter,HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = iToUserService.addUser(parameter,userElement.getId());
+        return responseBean;
+    }
+
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToUserService.java

@@ -29,4 +29,12 @@ public interface IToUserService {
      * @return
      */
     ResponseBean userList(String parameter);
+
+    /**
+     * 添加成员角色
+     * @param parameter
+     * @param UserID
+     * @return
+     */
+    ResponseBean addUser(String parameter,Integer UserID);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -1,13 +1,16 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.beust.jcommander.internal.Maps;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.dao.ToSysRoleMapper;
+import com.community.huiju.dao.ToSysUserRoleMapper;
 import com.community.huiju.dao.ToUserMapper;
 import com.community.huiju.model.ToSysRole;
+import com.community.huiju.model.ToSysUserRole;
 import com.community.huiju.model.ToUser;
 import com.community.huiju.service.IToUserService;
 import com.community.huiju.vo.ToUserVO;
@@ -19,6 +22,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.security.auth.callback.TextOutputCallback;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +37,9 @@ public class ToUserServerImpl implements IToUserService {
     @Autowired
     private ToSysRoleMapper toSysRoleMapper;
 
+    @Autowired
+    private ToSysUserRoleMapper toSysUserRoleMapper;
+
     @Override
     public ResponseBean login(String loginName, String code) {
 
@@ -120,4 +128,35 @@ public class ToUserServerImpl implements IToUserService {
         response.addSuccess(map);
         return response;
     }
+
+    @Override
+    public ResponseBean addUser(String parameter,Integer userID) {
+        ResponseBean response= new ResponseBean<>();
+        JSONObject object= JSONObject.parseObject(parameter);
+        ToUser toUser= new ToUser();
+
+        String loginName= object.getString("loginName");
+        String userName = object.getString("userName");
+        JSONArray contentImg = object.getJSONArray("roleName");
+        Integer[] roleIDArray = contentImg.toArray(new Integer[]{});
+        String remark = object.getString("remark");
+
+        toUser.setUserName(userName);
+        toUser.setLoginName(loginName);
+        toUser.setRemark(remark);
+        toUser.setStatus("1");;
+        toUser.setCreateUser(userID);
+        toUser.setCreateDate(new Date());
+        toUserMapper.insert(toUser);
+
+        //会对应多个角色
+        for (Integer roleID:roleIDArray  ){
+           ToSysUserRole toSysUserRole= new ToSysUserRole();
+            toSysUserRole.setUserId(toUser.getId());
+            toSysUserRole.setRoleId(roleID);
+            toSysUserRoleMapper.insert(toSysUserRole);
+        }
+         response.addSuccess("成功");
+        return response;
+    }
 }

CODE/smart-community/operate-api/src/main/resources/mapper/ToUserMapper.xml

@@ -30,7 +30,7 @@
     delete from to_user
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.ToUser" >
+  <insert id="insert" parameterType="com.community.huiju.model.ToUser" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
     insert into to_user (id, user_name, login_name, 
       login_password, email, head_portrait, 
       remark, status, create_user, 

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/RoleController.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.SysMenu;
+import com.community.huiju.model.SysRole;
 import com.community.huiju.service.RoleServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -11,6 +13,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -47,4 +50,18 @@ public class RoleController extends BaseController {
 		responseBean = roleService.getRoleList(roleName,userElement,pageNum,pageSize);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "添加角色", notes = "添加角色")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
+	})
+	@RequestMapping(value = "/role/add", method = RequestMethod.POST)
+	public ResponseBean addRole(@RequestBody SysRole sysRole, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = roleService.addRole(sysRole, userElement);
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/SysMenuController.java

@@ -4,6 +4,7 @@ package com.community.huiju.controller;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.SysMenu;
 import com.community.huiju.service.ISysMenuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -11,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -37,6 +39,8 @@ public class SysMenuController extends BaseController {
 	
 	@ApiOperation(value = "根据搜索条件获取菜单列表", notes = "根据搜索条件获取菜单列表")
 	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
 	})
 	@RequestMapping(value = "/menus",method = RequestMethod.GET)
 	public ResponseBean getInfo(HttpSession session) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/SysRoleMenuMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.SysRoleMenu;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业端角色可查看的菜单 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-18
+ */
+public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
+	
+	int insertList(List<SysRoleMenu> sysRoleMenuList);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/SysMenu.java

@@ -1,5 +1,6 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -68,5 +69,6 @@ public class SysMenu implements Serializable {
     /**
      * 子节点
      */
+    @TableField(exist = false)
     private List<SysMenu> children;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/SysRole.java

@@ -1,5 +1,6 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -7,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -24,6 +26,7 @@ public class SysRole implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private Integer id;
     /**
      * 小区id
      */
@@ -68,4 +71,10 @@ public class SysRole implements Serializable {
      * 更新人
      */
     private String updateName;
+    
+    /**
+     * 前端的menuId
+     */
+    @TableField(exist = false)
+    private List<Integer> menuArray;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/SysRoleMenu.java

@@ -0,0 +1,39 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 物业端角色可查看的菜单
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-01-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_sys_role_menu")
+public class SysRoleMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer communityId;
+
+    /**
+     * 角色ID
+     */
+    private Integer roleId;
+
+    /**
+     * 菜单ID
+     */
+    private Integer menuId;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/RoleServiceI.java

@@ -16,4 +16,12 @@ public interface RoleServiceI extends IService<SysRole> {
 	 * @return
 	 */
 	ResponseBean getRoleList(String roleName, UserElement userElement, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 添加角色
+	 * @param sysRole
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean addRole(SysRole sysRole, UserElement userElement);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/RoleServiceImpl.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.RoleMapper;
+import com.community.huiju.dao.SysRoleMenuMapper;
 import com.community.huiju.model.SysRole;
+import com.community.huiju.model.SysRoleMenu;
 import com.community.huiju.model.TpTransaction;
 import com.community.huiju.service.RoleServiceI;
 import com.google.common.collect.Maps;
@@ -14,6 +16,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -27,6 +31,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	
 	@Autowired
 	private RoleMapper roleMapper;
+	
+	@Autowired
+	private SysRoleMenuMapper sysRoleMenuMapper;
 	/**
 	 * 获取角色列表
 	 *
@@ -51,4 +58,47 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
+	
+	/**
+	 * 添加角色
+	 *
+	 * @param sysRole
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean addRole(SysRole sysRole, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		//接收数据
+		sysRole.setCommunityId(userElement.getCommunityId());
+		Integer userId = userElement.getId();
+		LocalDateTime dateTime = LocalDateTime.now();
+		sysRole.setCreateUser(userId);
+		sysRole.setCreateDate(dateTime);
+		sysRole.setUpdateUser(userId);
+		sysRole.setUpdateDate(dateTime);
+		//插入角色表
+		int size = roleMapper.insert(sysRole);
+		if (size < 1){
+			responseBean.addError("插入失败");
+			return responseBean;
+		}
+		//维护角色与menu的关系表
+		List<SysRoleMenu> sysRoleMenuList = new ArrayList<SysRoleMenu>();
+		List<Integer> menuIdList = sysRole.getMenuArray();
+		menuIdList.stream().forEach(menuId -> {
+			SysRoleMenu sysRoleMenu = new SysRoleMenu();
+			sysRoleMenu.setCommunityId(userElement.getCommunityId());
+			sysRoleMenu.setRoleId(sysRole.getId());
+			sysRoleMenu.setMenuId(menuId);
+			sysRoleMenuList.add(sysRoleMenu);
+		});
+		int count = sysRoleMenuMapper.insertList(sysRoleMenuList);
+		if (count < 1){
+			responseBean.addError("插入失败");
+			return responseBean;
+		}
+		responseBean.addSuccess(size);
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/SysMenuServiceImpl.java

@@ -9,6 +9,7 @@ import com.community.huiju.model.SysMenu;
 import com.community.huiju.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,6 +23,7 @@ import java.util.List;
  * @since 2019-01-17
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
 	
 	@Autowired
@@ -39,7 +41,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 		List<SysMenu> menuList = new ArrayList<SysMenu>();
 		sysMenuList.stream().forEach(sysMenu -> {
 			//父节点是0的，为根节点。
-			if(sysMenu.getParentId().equals("0")){
+			if(sysMenu.getParentId().equals(0)){
 				menuList.add(sysMenu);
 			}
 		});

CODE/smart-community/property-api/src/main/resources/mapper/SysRoleMenuMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.SysRoleMenuMapper">
+
+    <insert id="insertList" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
+        insert into tp_sys_role_menu(community_id,role_id,menu_id)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.communityId},#{item.roleId},#{item.menuId})
+        </foreach>
+    </insert>
+</mapper>

VUECODE/smart-operate-manage/src/api/user.js

@@ -13,4 +13,16 @@ export function employeesList(data) {
     }
   })
 }
+// 获取角色暂定写死
+export function userRoleById(data) {
+  return request({
+    url: '/role/list',
+    method: 'post',
+    data: {
+      pageNum: data.pageNum,
+      pageSize: data.pageSize,
+      roleName: data.roleName
+    }
+  })
+}
 

VUECODE/smart-operate-manage/src/router/index.js

@@ -141,6 +141,13 @@ export const constantRouterMap = [
         name: 'role-info',
         hidden: true,
         meta: { title: '角色详情', icon: 'table' }
+      },
+      {
+        path: '/account/user/addUser',
+        component: () => import('@/views/account/user/addUser'),
+        name: 'user-addUser',
+        hidden: true,
+        meta: { title: '添加成员', icon: 'table' }
       }
     ]
   },

VUECODE/smart-operate-manage/src/store/modules/user.js

@@ -1,6 +1,6 @@
 import { login, logOut, getInfo, sendCode } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
-import { employeesList } from '@/api/user'
+import { employeesList, userRoleById } from '@/api/user'
 
 const user = {
   state: {
@@ -110,6 +110,16 @@ const user = {
           reject(error)
         })
       })
+    },
+    // 查询角色 UserRoleById
+    UserRoleById({ commit, state }, data) { // 查询活动详情
+      return new Promise((resolve, reject) => {
+        userRoleById(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-operate-manage/src/views/account/user/addUser.vue

@@ -0,0 +1,127 @@
+<template>
+  <div id="root">
+    <el-form ref="listQuery" :model="listQuery" :rules="rules" label-width="100px" class="demo-listQuery">
+      <el-form-item label="姓名:" prop="roleName">
+        <el-input v-model="listQuery.roleName"/>
+      </el-form-item>
+      <el-form-item label="手机号:" prop="description">
+        <el-input v-model="listQuery.description"/>
+      </el-form-item>
+      <el-transfer
+    filterable
+    :titles="['所有角色', '已选角色']"
+    :left-default-checked="[2, 3]"
+    :filter-method="filterMethod"
+    filter-placeholder="请输角色名称"
+    v-model="value2"
+    :data="dataList"/>
+      <el-form-item label="备注:" prop="description">
+        <el-input v-model="listQuery.description"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary">立即创建</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { mapActions } from 'vuex'
+export default {
+  data() {
+    return {
+      listQuery: {
+        id: '',  
+        roleName: '',
+        description: '',
+        menuArray: [], // 已选中的权限资源
+        pageNum: 1,
+        pageSize:100
+      },
+       va3:[], 
+       value2:[1,4],
+       dataList:[],
+       citiesList:['上海', '北京', '广州', '深圳', '南京', '西安'],
+       pinyinList:['上海', '北京', '广州', '深圳', '南京', '西安', '成都'],
+      rules: {
+        roleName: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        description: [
+          { required: true, message: '请输入手机号', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  mounted() {
+      this.getById()
+    //    this.roleBox()
+  },
+  methods: {
+     getById() { // 根据ID获取活动信息
+    //   this.ruleForm.id = this.$route.params.id
+      this.$store.dispatch('UserRoleById', this.listQuery).then((res) => {
+            console.log('1111',res.data.list)
+             const iss= res.data.list
+
+    for (let i = 0; i < iss.length;i++) {
+          this.va3.push(iss[i].id)
+          console.log('this.va3',this.va3)
+        }
+      })
+    },
+    roleBox(){
+        const generateData2 = _ => {
+        const data = this.dataList;
+        const cities = this.citiesList
+        const pinyin = this.pinyinList
+        cities.forEach((city, index) => {
+          data.push({
+            label: city,
+            key: index,
+            pinyin: pinyin[index]
+          });
+        });
+         console.log('data:',data)
+        return data;
+        this.filterMethod(query,item)
+      };
+      return {
+        data2: generateData2(),
+        }
+        this.filterMethod
+      },
+      filterMethod(query, item) {
+        //  console.log('item:',item)
+        const s = item.pinyin.indexOf(query) > -1;
+        //  console.log('this.value2:++',this.value2)
+        // console.log('this.value2:++',this.citiesList[2])
+        // console.log('this.value2:++',this.citiesList[4])
+        return s
+        },
+        // ss4(){
+        //   console.log('11111111111111111111')
+        //    console.log('this.checked:',this.checked)
+        // let value = this.value2
+        // for(let i=0;i < value.length;i++){
+        //      const va= this.value2[i]
+        //    console.log('根据下标遍历每一条数据',this.citiesList[va])
+        // }
+
+        // }
+  }    
+}
+</script>
+
+<style scoped>
+.demo-listQuery {
+  width: 500px;
+  margin-top: 20px;
+  margin-left: auto;
+  margin-right: auto;
+}
+#button-checked{
+     float:right;
+     margin-right: 50px; 
+}
+</style>

VUECODE/smart-operate-manage/src/views/account/user/index.vue

@@ -13,7 +13,7 @@
       </el-form-item>
     </el-form>
     <div class="button">
-      <el-button type="primary">添加</el-button>
+      <el-button type="primary" @click="addUser">添加</el-button>
       <el-button type="warning" >修改</el-button>
     </div>
     <el-table
@@ -37,7 +37,6 @@
       <el-table-column prop="updateDate" label="修改时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
       <el-table-column prop="id" label="操作" align="center">
           <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
-
       <!-- <a><template slot-scope="scope">
           <span v-if="scope.row.status==1">{{ '停用账号' }}</span>
           <span v-if="scope.row.status==0">{{ '启用账号' }}</span>
@@ -169,6 +168,9 @@ export default {
       var month = value.getMonth() + 1
       var day = value.getDate()
       return year + '-' + month + '-' + day
+    },
+    addUser(){
+    this.$router.push({ name: 'user-addUser' })
     }
   }
 }

VUECODE/smart-property-manage/src/api/role.js

@@ -14,3 +14,16 @@ export function fetchMenuList() {
     method: 'get'
   })
 }
+
+export function addMenuInfo(data) {
+  return request({
+    url: '/role/add',
+    method: 'post',
+    data: {
+      roleName: data.roleName,
+      description: data.description,
+      menuArray: data.menuArray
+    }
+  })
+}
+

VUECODE/smart-property-manage/src/store/modules/role.js

@@ -1,4 +1,4 @@
-import { fetchList, fetchMenuList } from '@/api/role'
+import { fetchList, fetchMenuList, addMenuInfo } from '@/api/role'
 
 const transaction = {
   namespaced: true,
@@ -33,19 +33,27 @@ const transaction = {
           reject(error)
         })
       })
-    }
-  },
-  FetchMenuList({ commit }) {
-    console.log(1)
-    return new Promise((resolve, reject) => {
-      fetchMenuList().then(response => {
-        const data = response.data
-        commit('SET_MENU_LIST', data)
-        resolve()
-      }).catch(error => {
-        reject(error)
+    },
+    FetchMenuList({ commit }) {
+      return new Promise((resolve, reject) => {
+        fetchMenuList().then(response => {
+          const data = response.data
+          commit('SET_MENU_LIST', data)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    AddMenuInfo({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        addMenuInfo(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
       })
-    })
+    }
   }
 }
 

VUECODE/smart-property-manage/src/views/account/add/role-add.vue

@@ -1,18 +1,21 @@
 <template>
   <div class="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
-      <el-form-item label="角色名称" prop="phase">
-        <el-input v-model="ruleForm.phase"/>
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input v-model="ruleForm.roleName"/>
       </el-form-item>
-      <el-form-item label="角色描述" prop="building">
-        <el-input v-model="ruleForm.building"/>
+      <el-form-item label="角色描述" prop="description">
+        <el-input v-model="ruleForm.description"/>
       </el-form-item>
-      <el-tree
-        :data="menuList"
-        show-checkbox
-        node-key="id"
-        :props="defaultProps">
-      </el-tree>
+      <el-form-item label="资源权限" prop="menuArray">
+        <el-tree
+          ref="tree"
+          :data="menuList"
+          show-checkbox
+          node-key="id"
+          :props="defaultProps">
+        </el-tree>
+      </el-form-item> 
       <el-form-item>
         <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
         <el-button @click="resetForm('ruleForm')">重置</el-button>
@@ -35,17 +38,16 @@ export default {
   data() {
     return {
       ruleForm: {
-        phase: '',
-        building: '',
-        unit: '',
-        level: '',
-        roomNo: '',
-        ownerName: '',
-        ownerTel: ''
+        roleName: '',
+        description: '',
+        menuArray: []
       },
       rules: {
-        phase: [
+        roleName: [
           { required: true, message: '请输入角色名称', trigger: 'blur' }
+        ],
+        menuArray: [
+          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
         ]
       },
       defaultProps: {
@@ -61,12 +63,16 @@ export default {
     ...mapMutations('role', {
     }),
     ...mapActions('role', [
-      'FetchMenuList'
+      'FetchMenuList',
+      'AddMenuInfo'
     ]),
     submitForm(formName) { // 提交
+      // 获取选中的树形节点 key
+      this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
+      console.log(this.ruleForm.menuArray)
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.addBuilding()
+          this.addRole()
         } else {
           console.log('error submit!!')
           return false
@@ -82,7 +88,7 @@ export default {
     resetForm(formName) { // 重置
       this.$refs[formName].resetFields()
     },
-    addBuilding() {
+    addRole() {
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -90,13 +96,13 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      this.$store.dispatch('AddBuilding', this.ruleForm).then((res) => {
+      this.AddMenuInfo(this.ruleForm).then((res) => {
         if (res.code === '0') {
           this.$message({
             message: res.message,
             type: 'success'
           })
-          this.$router.push({ name: 'building-index' })
+          this.$router.push({ name: 'role-index' })
           loading.close()
           return
         }
@@ -104,7 +110,7 @@ export default {
         loading.close()
       }).catch(() => {
         loading.close()
-        console.log('error AddBuilding')
+        console.log('error addRole')
       })
     }
   }