Merge branch 'v4' of http://git.ycjcjy.com/welcome/pc-welcome3 into v4

src/config/api.js

@@ -43,6 +43,26 @@ const apis = {
     roleManagementList:{
       method:'get',
       url: `${commPrefix}/user/roleManagementList`
+    },
+    roleAll:{
+      method:'get',
+      url: `${commPrefix}/roleAll`
+    },
+    addUserRole:{
+      method:'post',
+      url: `${commPrefix}/addUserRole`
+    },
+    userRoledetails:{
+      method:'get',
+      url: `${commPrefix}/userRoledetails`
+    },
+    updateUserRolede:{
+      method:'post',
+      url: `${commPrefix}/updateUserRolede`
+    },
+    deleteUserRole:{
+      method:'post',
+      url: `${commPrefix}/deleteUserRole`
     }
   },
   type: {
@@ -300,5 +320,31 @@ const apis = {
       url: `${commPrefix}/customerList`
     }
   },
+  sysRole: {
+    list: {
+      method: 'get',
+      url: `${commPrefix}/role`
+    },
+    getById: {
+      method: 'get',
+      url: `${commPrefix}/roleById`
+    },
+    save: {
+      method: 'post',
+      url: `${commPrefix}/role`
+    },
+    update: {
+      method: 'put',
+      url: `${commPrefix}/role`
+    },
+    menu: {
+      method: 'get',
+      url: `${commPrefix}/menus`
+    },
+    deleteMenu: {
+      method: 'delete',
+      url: `${commPrefix}/role`
+    }
+  }
 }
 export default apis

src/store/index.js

@@ -17,6 +17,7 @@ import management from './modules/management'
 import visitor from './modules/visitor' 
 import lobby from './modules/lobby'
 import followup from './modules/followup'
+import sysyrole from './modules/role'
 
 Vue.use(Vuex)
 
@@ -38,7 +39,8 @@ const store = new Vuex.Store({
     management,
     visitor,
     lobby,
-    followup
+    followup,
+    sysyrole
   }
 })
 

src/store/modules/content.js

@@ -25,7 +25,7 @@ export default {
     },
     addContent ({ commit }, payload) {
       const { onSuccess } = payload
-      const api = lodash.get(apis, 'content.add')
+      const api = lodash.get(apis, 'content.edi.vue')
       interact(api, payload.detail).then((data) => {
         commit('appendList', data)
         if (onSuccess) {

src/store/modules/firstpage.js

@@ -39,7 +39,7 @@ export default {
     },
     addFirstPage ( _, payload) {
       const { onSuccess } = payload
-      const api = lodash.get(apis, 'firstpage.add')
+      const api = lodash.get(apis, 'firstpage.edi.vue')
       interact(api, payload.detail).then((data) => {
         onSuccess(data)
       })

src/store/modules/management.js

@@ -20,7 +20,7 @@ export default {
       })
     },
     addManagement ({ commit }, payload) {
-      const api = replaceApiParams(lodash.get(apis, 'management.add'), payload)
+      const api = replaceApiParams(lodash.get(apis, 'management.edi.vue'), payload)
       interact(api).then((data) => {
         commit('updateManagement', data)
       })

src/store/modules/notice.js

@@ -34,7 +34,7 @@ export default {
     },
     addNotice ( _, payload) {
       const { onSuccess } = payload
-      const api = lodash.get(apis, 'notice.add')
+      const api = lodash.get(apis, 'notice.edi.vue')
       interact(api, payload.detail).then((data) => {
         onSuccess(data)
       })

src/store/modules/person.js

@@ -98,7 +98,7 @@ export default {
     },
     addPerson ( _, payload) {
       const { onSuccess } = payload
-      const api = lodash.get(apis, 'person.add')
+      const api = lodash.get(apis, 'person.edi.vue')
       interact(api, payload.detail).then((data) => {
         onSuccess(data)
       })

src/store/modules/role.js

@@ -0,0 +1,87 @@
+import lodash from 'lodash'
+import { interact, replaceApiParams } from '../../utils'
+import apis from '../../config/api'
+
+export default {
+    namespaced: true,
+    state: {
+        data: [],
+        menus: [],
+    },
+    mutations: {
+        setList(state, payload) {
+            state.data = payload
+        },
+        setMenus(state, payload) {
+            state.menus = payload
+        }
+    },
+    actions: {
+        GetList({ commit }, payload) {
+            return new Promise((resolve, reject) => {
+                const api = lodash.get(apis,'sysRole.list')
+                interact(api, payload).then((data) => {
+                    commit('setList', data)
+                    resolve(data)
+                }).catch(()=>{
+                    reject()
+                })
+
+            })
+        },
+        AddRole( _, payload) {
+            return new Promise((resolve, reject) => {
+                const api = lodash.get(apis,'sysRole.save')
+                interact(api, payload).then((data)=> {
+                    resolve(data)
+                }).catch(()=>{
+                    reject()
+                })
+            })
+        },
+        GetMenus({ commit }) {
+            return new Promise((resolve, reject) => {
+                const api = lodash.get(apis, 'sysRole.menu')
+                interact(api).then((data) => {
+                    resolve(data)
+                    commit('setMenus', data)
+                }).catch(() => {
+                    reject()
+                })
+            })
+        },
+        GetById(_, payload) {
+            return new Promise((resolve, reject) => {
+                const api = lodash.get(apis,'sysRole.getById')
+                interact(api, payload).then((data) => {
+                    resolve(data)
+                }).catch(()=>{
+                    reject()
+                })
+
+            })
+        },
+        UpdateRole(_, payload) {
+            return new Promise((resolve, reject) => {
+                const api = lodash.get(apis,'sysRole.update')
+                interact(api, payload).then((data) => {
+                    resolve(data)
+                }).catch(()=>{
+                    reject()
+                })
+
+            })
+        },
+        DeleteMenu(_, payload) {
+            return new Promise((resolve, reject) => {
+                const api = lodash.get(apis,'sysRole.deleteMenu')
+                interact(api, payload).then((data) => {
+                    resolve(data)
+                }).catch(()=>{
+                    reject()
+                })
+
+            })
+        },
+    }
+}

src/store/modules/sysuser.js

@@ -60,7 +60,7 @@ export default {
     },
     addSysUser ( _, payload) {
       const dtStr = window.JSON.stringify(payload)
-      const api = lodash.get(apis, 'sysuser.add')
+      const api = lodash.get(apis, 'sysuser.edi.vue')
       return interact(api, dtStr)
     },
     editSysUser ( _, payload) {
@@ -84,11 +84,61 @@ export default {
         commit('updateList', data)
       })
     },
-    roleManagementList({ commit }, payload) { // 查询所有
+    roleManagementList({ commit }, payload) { 
       const api = lodash.get(apis, 'sysuser.roleManagementList')
       interact(api, payload).then((data) => {
         commit('updateList', data)
       })
+    },
+    roleAll({ commit }, payload) { 
+      const api = lodash.get(apis, 'sysuser.roleAll')
+      interact(api, payload).then((data) => {
+        commit('updateList', data)
+      })
+    },
+    addUserRole ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        const api = lodash.get(apis, 'sysuser.addUserRole')
+        interact(api,payload).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch(() => {
+          reject()
+        })
+      })
+    },
+    userRoledetails ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        const api = lodash.get(apis, 'sysuser.userRoledetails')
+        interact(api,payload).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch(() => {
+          reject()
+        })
+      })
+    },
+    updateUserRolede ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        const api = lodash.get(apis, 'sysuser.updateUserRolede')
+        interact(api,payload).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch(() => {
+          reject()
+        })
+      })
+    },
+    deleteRole ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        const api = lodash.get(apis, 'sysuser.deleteUserRole')
+        interact(api,payload).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch(() => {
+          reject()
+        })
+      })
     }
   }
 }

src/store/modules/type.js

@@ -41,7 +41,7 @@ export default {
     },
     addType (_, payload) {
       const { onSuccess } = payload
-      const api = lodash.get(apis, 'type.add')
+      const api = lodash.get(apis, 'type.edi.vue')
       interact(api, payload.detail).then((data) => {
         onSuccess(data)
       })

src/store/modules/words.js

@@ -42,7 +42,7 @@ export default {
     },
     addWords ( _, payload) {
       const { onSuccess } = payload
-      const api = lodash.get(apis, 'words.add')
+      const api = lodash.get(apis, 'words.edi.vue')
       interact(api, payload.detail).then((data) => {
         onSuccess(data)
       })

src/views/index.js

@@ -49,6 +49,24 @@ const pages = [
           title: '员工管理',
         },
       },
+      {
+        path: 'sysuser/userRole/addUserRole',
+        name: 'addUserRole',
+        component: () => import('./sysuser/userRole/addUserRole.vue'),
+        meta: {
+          menuShow: false,
+          title: '添加员工权限',
+        },
+      },
+      {
+        path: 'sysuser/userRole/userRoleedit',
+        name: 'userRoleedit',
+        component: () => import('./sysuser/userRole/userRoleedit.vue'),
+        meta: {
+          menuShow: false,
+          title: '修改加员工权限',
+        },
+      },
       {
         path: 'sysuser/role',
         name: 'role',
@@ -58,6 +76,24 @@ const pages = [
           title: '角色管理',
         },
       },
+      {
+        path: 'sysuser/role/add',
+        name: 'role-add',
+        component: () => import('./sysuser/role/add/add.vue'),
+        meta: {
+          menuShow: false,
+          title: '角色添加',
+        },
+      },
+      {
+        path: 'sysuser/role/edi',
+        name: 'role-edi',
+        component: () => import('./sysuser/role/edi/edi.vue'),
+        meta: {
+          menuShow: false,
+          title: '角色修改',
+        },
+      },
       {
         path: 'device',
         name: 'devicelist',

src/views/sysuser/role/add/add.vue

@@ -0,0 +1,76 @@
+<template>
+    <div id="root">
+        <el-form ref="form" :model="form" label-width="80px">
+            <el-form-item label="角色名称">
+                <el-input v-model="form.roleName"></el-input>
+            </el-form-item>
+            <el-form-item label="菜单权限">
+                <el-tree
+                        :data="menus"
+                        show-checkbox
+                        node-key="menuId"
+                        ref="tree"
+                        :props="defaultProps">
+                </el-tree>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="success" @click="onSubmit">提交</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const {mapState: mapSysRoleState, mapActions: mapSysRoleActions } = createNamespacedHelpers('sysyrole')
+
+export default {
+  name: "addRole",
+  data() {
+      return {
+          form: {
+              roleName: '',
+              menuIds: []
+          },
+          defaultProps: {
+              label: 'menuName',
+              children: 'children'
+          }
+      }
+  },
+  computed: {
+      ...mapSysRoleState({
+          menus: x => x.menus
+      })
+  },
+  methods: {
+    ...mapSysRoleActions([
+        'GetMenus',
+        'AddRole'
+    ]),
+    getCheckedNodes() {
+      let idSet = new Set();
+      const checkedNodes = this.$refs.tree.getCheckedNodes();
+      checkedNodes.map((item,index) => {
+          idSet.add(item.menuId)
+          idSet.add(item.menuPid)
+      })
+
+        for (let [value] of idSet.entries()) this.form.menuIds.push(value);
+
+    },
+    onSubmit() {
+        this.getCheckedNodes()
+        this.AddRole(this.form)
+        this.$router.go(-1)
+    }
+  },
+  created() {
+      this.GetMenus()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/sysuser/role/edi/edi.vue

@@ -0,0 +1,98 @@
+<template>
+    <div id="root">
+        <el-form ref="form" :model="form" label-width="80px">
+            <el-form-item label="角色名称">
+                <el-input v-model="form.roleName"></el-input>
+            </el-form-item>
+            <el-form-item label="菜单权限">
+                <el-tree
+                        :data="menus"
+                        show-checkbox
+                        node-key="menuId"
+                        ref="tree"
+                        :default-checked-keys="checkedMenuKeys"
+                        :props="defaultProps">
+                </el-tree>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="success" @click="onSubmit">提交</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const {mapState: mapSysRoleState, mapActions: mapSysRoleActions } = createNamespacedHelpers('sysyrole')
+
+export default {
+  name: "ediRole",
+  data() {
+      return {
+          form: {
+              roleName: '',
+              roleId: '',
+              menuIds: []
+          },
+          defaultProps: {
+              label: 'menuName',
+              children: 'children'
+          },
+          checkedMenuKeys: [] // 默认勾选
+      }
+  },
+  computed: {
+      ...mapSysRoleState({
+          menus: x => x.menus
+      })
+  },
+  methods: {
+    ...mapSysRoleActions([
+        'GetMenus',
+        'AddRole',
+        'GetById',
+        'UpdateRole'
+    ]),
+    getCheckedNodes() {
+      let idSet = new Set();
+      const checkedNodes = this.$refs.tree.getCheckedNodes();
+      checkedNodes.map((item,index) => {
+          idSet.add(item.menuId)
+      })
+
+        for (let [value] of idSet.entries()) this.form.menuIds.push(value);
+
+    },
+    onSubmit() {
+        this.getCheckedNodes()
+        this.UpdateRole(this.form)
+        this.$router.go(-1)
+    },
+    getByRoleId() {
+        this.GetById({ roleId: this.form.roleId }).then((res) => {
+            this.form.roleId = res.roleId
+            this.form.roleName = res.roleName
+
+            this.menusParsing(res.menuList)
+        })
+    },
+    menusParsing(array) {
+        array.map((item,index) => {
+            this.checkedMenuKeys.push(item.menuId)
+            if (item.children !== null) {
+                this.menusParsing(item.children)
+            }
+        })
+    }
+  },
+  created() {
+      this.GetMenus()
+      this.form.roleId = this.$route.query.id
+      this.getByRoleId()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/sysuser/role/list.vue

@@ -2,31 +2,45 @@
   <div id="root">
     <el-form :inline="true" :model="formInline" class="demo-form-inline">
       <el-form-item label="角色名称">
-        <el-input v-model="formInline.customerName" placeholder="角色名称"></el-input>
+        <el-input v-model="formInline.roleName" placeholder="角色名称"></el-input>
       </el-form-item> 
       <el-form-item>
         <el-button type="primary" @click="onSubmit">查询</el-button>
         <el-button type="info" @click="clear">重置</el-button>
       </el-form-item>
     </el-form>
+    <div style="margin-bottom: 20px;">
+<!--      <router-link :to="{name: 'role-add'}" tag="el-button">添加</router-link>-->
+
+      <el-button type="success" @click="addRole">添加</el-button>
+      <el-button type="warning" @click="updateRole">修改</el-button>
+      <el-button type="danger" @click="deleteRole">删除</el-button>
+    </div>
     <el-table
-    :data="FollowupList"
+    :data="roleDataList.records"
+    @selection-change="handleSelectionChange"
     border>
+      <el-table-column
+              type="selection"
+              width="55"/>
     <el-table-column
-      prop="customerId"
+      prop="roleId"
       align='center'
-      label="角色名称">
-    </el-table-column>
+      label="编号"/>
     <el-table-column
-      prop="customerName"
+      prop="roleName"
       align='center'
-      label="角色状态">
-    </el-table-column>
+      label="角色名称"/>
     <el-table-column
-      prop="phone"
+      prop="roleStatus"
       align='center'
-      label="创建时间">
+      label="角色状态">
+      <template slot-scope="scope">{{ scope.row.status === 1 ? '有效' : '无效' }}</template>
     </el-table-column>
+    <el-table-column
+       prop="createDate"
+       align='center'
+       label="创建时间"/>
   </el-table>
     <el-pagination
             style="margin-top:50px;float:right"
@@ -35,6 +49,7 @@
             :current-page="formInline.pageNum"
             :page-sizes="[1,10, 20, 30, 40]"
             :page-size="formInline.pageSize"
+            :total="roleDataList.total"
             layout="total, sizes, prev, pager, next, jumper"
             >
             <!-- :total="FollowupList.total || 0" -->
@@ -43,39 +58,38 @@
 </template>
 <script>
 import { createNamespacedHelpers } from 'vuex'
-const {mapState: mapUserManagementState, mapActions: mapUserManagementActions } = createNamespacedHelpers('sysuser')
+const {mapState: mapSysRoleState, mapActions: mapSysRoleActions } = createNamespacedHelpers('sysyrole')
 
 export default {
   name: 'followup-index',
   data() {
     return {
       formInline: {
-        customerName:'',
-        personName: '',
-        phone: '',
-        platNumber: '',
+        roleName: '',
         pageNum: 1,
         pageSize: 10
-      }
+      },
+      ids: []
     }
   },
   computed: {
-    ...mapUserManagementState({
-    FollowupList: x => x.followup
+    ...mapSysRoleState({
+    roleDataList: x => x.data
     })
   },
   created() {
     this.getPage()
   },
   methods: {
-    ...mapUserManagementActions([
-      'roleManagementList',
+    ...mapSysRoleActions([
+      'GetList',
+      'DeleteMenu'
     ]),
     onSubmit() {
       this.getPage()
     },
     getPage() {
-       this.roleManagementList(this.formInline)
+       this.GetList(this.formInline)
       // window.console.log(this.$store)
       // this.$store.commit('security/foo')
       // this.$store.dispatch('security/getSecurity')
@@ -90,35 +104,42 @@ export default {
       this.formInline.pageNum = val
       this.getPage()
     },
-    favorHouse (msg) {
-      if (msg == '1') {
-        return "三房"
-      } else if(msg == '2'){
-        return "四房"
-      }else if(msg == '3'){
-        return "四房以上"
-      }
-    },
-    favorLevel (msg) {
-      if (msg == 'A') {
-        return "买房"
-      } else if(msg == 'B'){
-        return "有意向金"
-      }else if(msg == 'C'){
-        return "考虑中"
-      }else if(msg == 'D'){
-        return "不买"
-      }
-    },
     clear(){
-      this.formInline.customerName = ''
-      this.formInline.phone = ''
-      this.formInline.platNumber = ''
+      this.formInline.roleName = ''
       this.formInline.pageNum = 1
       this.formInline.pageSize = 10
       this.getPage()
+    },
+    addRole() {
+      this.$router.push({name: 'role-add'})
+    },
+    deleteRole() {
+      if (this.ids.length <= 0) {
+        this.$message.error("请至少选择一行")
+        return
+      }
+
+      this.DeleteMenu({ menuIds: this.ids })
+      this.getPage()
+    },
+    updateRole() {
+      if (this.ids.length > 1) {
+        this.$message.error("只能针对一行操作")
+        return
+      }
+      if (this.ids.length <= 0) {
+        this.$message.error("请至少选择一行")
+        return
+      }
+
+      this.$router.push({name: 'role-edi', query: { id: this.ids[0] }})
+    },
+    handleSelectionChange(val) {
+      this.ids = []
+      val.map((item,index)=> {
+        this.ids.push(item.roleId);
+      })
     }
-   
   }
 }
 </script>

src/views/sysuser/userRole/addUserRole.vue

@@ -0,0 +1,140 @@
+<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 勾上选中的-->
+        <el-tree
+          ref="tree"
+          :data="FollowupList"
+          :default-expanded-keys="formInline.menuArray"
+          :default-checked-keys="formInline.menuArray"
+          :props="defaultProps"
+          show-checkbox
+          node-key="id"
+          @check-change="handleCheckChange"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('formInline')">立即创建</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const {mapState: mapUserManagementState, mapActions: mapUserManagementActions} = createNamespacedHelpers('sysuser')
+
+export default {
+  name: 'followup-index',
+  data() {
+    return {
+      formInline: {
+        customerName:'',
+        personName: '',
+        phone: '',
+        platNumber: '',
+        pageNum: 1,
+        pageSize: 10,
+        menuArray:[],
+        roleId:[],
+         empty:[]
+
+      },
+      defaultProps: {
+          id: 'id',
+        label: 'roleName'
+     },
+     rules: {
+        userName: [
+          { required: true, message: '名称', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, message: '请输入手机号', trigger: 'blur' },
+          { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
+        ],
+        menuArray: [
+          { required: true, message: '请选择角色', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  computed: {
+    ...mapUserManagementState({
+     FollowupList: x => x.list
+    })
+  },
+  created() {
+    this.dateQuery()
+  },
+  methods: {
+    ...mapUserManagementActions([
+      'roleAll',
+      'addUserRole'
+    ]),
+    onSubmit() {
+      this.dateQuery()
+    },
+    dateQuery() {
+       this.roleAll(this.formInline)
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`)
+      this.formInline.pageSize = val
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`)
+      this.formInline.pageNum = val
+      this.dateQuery()
+    },
+    clear(){
+      this.formInline.customerName = ''
+      this.formInline.phone = ''
+      this.formInline.platNumber = ''
+      this.formInline.pageNum = 1
+      this.formInline.pageSize = 10
+      this.dateQuery()
+    },
+    addUser(){
+      this.$router.push({ name: 'addUserRole' })
+    },
+    submitForm(formName ){
+      // 获取选中的树形节点 key
+      this.formInline.menuArray = this.$refs.tree.getCheckedKeys()
+      this.$refs[formName].validate((valid) => {
+        const loading = this.$loading({
+          lock: false,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })    
+      if(valid){ 
+       this.formInline.menuArray = this.$refs.tree.getCheckedNodes()
+       this.formInline.menuArray.map((item) => {
+       this.formInline.roleId.push(item.roleId)
+       })
+       this.addUserRole(this.formInline).then((data)=>{ 
+         if(data.phone === this.formInline.phone){
+             this.$router.push({ name: 'userRole' })
+             return
+             }
+       })}
+     
+           loading.close()
+      })
+    this.formInline.roleId = [] 
+  }
+}
+}
+</script>
+
+<style scoped>
+.demo-formInline {
+  width: 500px;
+  margin-top: 20px;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>

src/views/sysuser/userRole/list.vue

@@ -2,7 +2,7 @@
   <div id="root">
     <el-form :inline="true" :model="formInline" class="demo-form-inline">
       <el-form-item label="姓名">
-        <el-input v-model="formInline.customerName" placeholder="姓名"></el-input>
+        <el-input v-model="formInline.userName" placeholder="姓名"></el-input>
       </el-form-item> 
       <el-form-item label="电话">
         <el-input v-model="formInline.phone" placeholder="电话"></el-input>
@@ -12,16 +12,19 @@
         <el-button type="info" @click="clear">重置</el-button>
       </el-form-item>
     </el-form>
+  <el-row>
+    <el-button type="primary" @click="addUserRole()">添加</el-button>
+  </el-row>
     <el-table
-    :data="FollowupList"
+    :data="FollowupList.records"
     border>
     <el-table-column
-      prop="customerId"
+      prop="username"
       align='center'
       label="姓名">
     </el-table-column>
     <el-table-column
-      prop="customerName"
+      prop="roleName"
       align='center'
       label="角色名称">
     </el-table-column>
@@ -30,6 +33,15 @@
       align='center'
       label="电话">
     </el-table-column>
+     <el-table-column
+        fixed="right"
+        label="操作"
+        align='center'>
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEdit(scope.row.userId)" size="small">编辑</el-button>
+          <el-button type="text" @click="userRoleDelete(scope.row.userId)" size="small">删除</el-button>
+        </template>
+      </el-table-column>
   </el-table>
     <el-pagination
             style="margin-top:50px;float:right"
@@ -39,8 +51,9 @@
             :page-sizes="[1,10, 20, 30, 40]"
             :page-size="formInline.pageSize"
             layout="total, sizes, prev, pager, next, jumper"
+            :total="FollowupList.total || 0"
             >
-            <!-- :total="FollowupList.total || 0" -->
+           
     </el-pagination>
   </div>
 </template>
@@ -53,26 +66,29 @@ export default {
   data() {
     return {
       formInline: {
-        customerName:'',
+        userName:'',
         personName: '',
         phone: '',
         platNumber: '',
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        userId: ''
       }
     }
   },
   computed: {
     ...mapUserManagementState({
-    FollowupList: x => x.followup
+     FollowupList: x => x.list,
     })
   },
   created() {
+     
     this.getPage()
   },
   methods: {
     ...mapUserManagementActions([
       'getUserManagementList',
+      'deleteRole'
     ]),
     onSubmit() {
       this.getPage()
@@ -93,36 +109,28 @@ export default {
       this.formInline.pageNum = val
       this.getPage()
     },
-    favorHouse (msg) {
-      if (msg == '1') {
-        return "三房"
-      } else if(msg == '2'){
-        return "四房"
-      }else if(msg == '3'){
-        return "四房以上"
-      }
-    },
-    favorLevel (msg) {
-      if (msg == 'A') {
-        return "买房"
-      } else if(msg == 'B'){
-        return "有意向金"
-      }else if(msg == 'C'){
-        return "考虑中"
-      }else if(msg == 'D'){
-        return "不买"
-      }
-    },
     clear(){
+      this.formInline.userName = ''
       this.formInline.customerName = ''
       this.formInline.phone = ''
       this.formInline.platNumber = ''
       this.formInline.pageNum = 1
       this.formInline.pageSize = 10
       this.getPage()
+    },
+    addUserRole(){
+      this.$router.push({ name: 'addUserRole' })
+
+    },
+    handleEdit(id){
+       this.$router.push({ name: 'userRoleedit', query: {id:id} })
+    },
+    userRoleDelete(id){
+       this.formInline.userId = id
+       this.deleteRole(this.formInline)
+       this.getPage()
     }
-   
-  }
+   }
 }
 </script>
 

src/views/sysuser/userRole/userRoleedit.vue

@@ -0,0 +1,160 @@
+<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.userName" placeholder="姓名" disabled/>
+      </el-form-item>
+      <el-form-item class="filter-item" label="手机号" prop="phone" >
+        <el-input v-model.trim="formInline.phone" placeholder="手机号" disabled/>
+      </el-form-item>
+      <el-form-item label="角色" prop="menuArray">
+        <!-- default-expanded-keys 展示选中的
+             default-checked-keys 勾上选中的-->
+        <el-tree
+          ref="tree"
+          node-key="roleId"
+          :data="FollowupList.sysRole"
+          :default-expanded-keys="[1]"
+          :default-checked-keys="this.formInline.menuArray"
+          :props="defaultProps"
+          show-checkbox
+          @check-change="handleCheckChange"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('formInline')">立即创建</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import { createNamespacedHelpers } from 'vuex'
+const {mapState: mapUserManagementState, mapActions: mapUserManagementActions} = createNamespacedHelpers('sysuser')
+
+export default {
+  name: 'followup-index',
+  data() {
+    return {
+      formInline: {
+        customerName:'',
+        personName: '',
+        phone: '',
+        platNumber: '',
+        pageNum: 1,
+        pageSize: 10,
+        menuArray:[],
+        roleId:[],
+        userId:'',
+        userName: '',
+
+      },
+      defaultProps: {
+          label: 'roleName'
+     },
+     fullscreenLoading: false,
+     rules: {
+        userName: [
+          { required: true, message: '名称', trigger: 'blur' }
+        ],
+        loginName: [
+          { required: true, message: '请输入手机号', trigger: 'blur' },
+          { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
+        ],
+        menuArray: [
+          { required: true, message: '请选择角色', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  computed: {
+    ...mapUserManagementState({
+     FollowupList: x => x.list
+    })
+  },
+  created() {
+    this.formInline.userId = this.$route.query.id
+    this.dataQuery()
+  },
+  methods: {
+    ...mapUserManagementActions([
+      'userRoledetails',
+      'updateUserRolede'
+    ]),
+    onSubmit() {
+      this.dataQuery()
+    },
+    dataQuery() {
+       this.userRoledetails(this.formInline).then((data)=>{
+         this.formInline.menuArray = data.arrayList;
+         this.formInline.phone = data.user.phone 
+         this.formInline.userName = data.user.username
+       })
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`)
+      this.formInline.pageSize = val
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`)
+      this.formInline.pageNum = val
+      this.dataQuery()
+    },
+    clear(){
+      this.formInline.customerName = ''
+      this.formInline.phone = ''
+      this.formInline.platNumber = ''
+      this.formInline.pageNum = 1
+      this.formInline.pageSize = 10
+      this.dataQuery()
+    },
+    addUser(){
+      this.$router.push({ name: 'addUserRole' })
+    },
+      resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    submitForm(formName ){
+      // 获取选中的树形节点 key
+      this.formInline.menuArray = this.$refs.tree.getCheckedKeys()
+        this.fullscreenLoading = true;
+        setTimeout(() => {
+          this.fullscreenLoading = false;
+        }, 2000);
+      this.$refs[formName].validate((valid) => {
+        const loading = this.$loading({
+          lock: false,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+      if(valid){  
+          this.updateUserRolede(this.formInline).then(()=>{
+             this.$router.push({ name: 'userRole' })  
+            loading.close()
+            return false  
+  
+       })
+      }else{
+      loading.close()
+      return false
+      }
+      })
+  },
+  // 获取当前所有key
+  acquireKey(){
+       this.formInline.menuArray = this.$refs.tree.getCheckedNodes()
+       this.formInline.menuArray.map((item) => {
+       this.formInline.roleId.push(item.roleId)
+       })
+  }
+}
+}
+</script>
+
+<style scoped>
+.demo-formInline {
+  width: 500px;
+  margin-top: 20px;
+  margin-left: auto;
+  margin-right: auto;
+}
+</style>