Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/systemSet/roleManager/index.vue

     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h">
-          <el-button size="mini" type="success" @click='editRole'>新增角色</el-button>
+          <el-button size="mini" type="success" @click='addRole'>新增角色</el-button>
         </div>
         <tableSearch value='角色名称' @exportSearchKey="searchList"></tableSearch>
       </div>
     layout="prev, pager, next, jumper"
     :total="roles.pagenum">
     </el-pagination>
-    <!-- <el-dialog title="请选择机构" :visible.sync="dialogTableVisible">
+    <el-dialog title="请选择菜单" :visible.sync="dialogTableVisible">
       <el-tree
+        v-if="dialogTableVisible"
         class="flxe-h"
-        :data="treeData"
+        :data="menus"
         :default-expand-all="true"
         :expand-on-click-node="false"
+        :default-checked-keys="defaultChecked"
         ref="tree"
         show-checkbox
         @node-click="handleNodeClick"></el-tree>
         <div class="flex-h" style="justify-content: flex-end;margin-top: 1rem">
           <el-button type='success' @click="getCheckedNodes">确定</el-button>
         </div>
-    </el-dialog> -->
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { createNamespacedHelpers } from 'vuex'
+import { createNamespacedHelpers, mapState } from 'vuex'
 import tableSearch from '@/components/tableSearch/index'
 
 const { mapState: mapRoleState, mapActions: mapRoleActions } = createNamespacedHelpers('role')
   data () {
     return {
       currentPage: 0, // 当前页码
-      tableSearch: {
-        // 表格搜索条件
-        key: '111' // 搜索关键字
-      },
+      key: '',
+      selid: '',
       dialogTableVisible: false,
     }
   },
   computed: {
     ...mapRoleState({
       roles: x => x.roleList,
+      selmenus: x => x.roleMenus,
+    }),
+    ...mapState({
+      menus: x => x.app.menus
     }),
+    defaultChecked: {
+      get () {
+        console.log(this.selmenus)
+        // const sels = (this.selmenus || []).map(x => x.MenuId)
+        return []
+      },
+    },
   },
   components: {
     tableSearch
   methods: {
     ...mapRoleActions([
       'GetRolesList',
+      'DelRole',
+      'SaveRoleMenus',
+      'GetRoleMenu',
     ]),
     FormatDate (date) {
       console.log()
     handleDelete (index, row) {
       // 删除
       console.log(index, row)
-      this.$confirm('确认删除此用户?', '提示', {
+      this.$confirm('确认删除此角色?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
         .then(() => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          })
+          this.DelRole({id: row.RoleId, callback: this.delCallBack})
         })
         .catch(() => {
           this.$message({
           })
         })
     },
+    delCallBack () {
+      this.$message({
+        type: 'success',
+        message: '删除成功!'
+      })
+      this.GetRolesList({name: this.key})
+    },
     handlePermission (index, row) {
+      this.selid = row.RoleId
+      this.GetRoleMenu(this.selid)
       this.dialogTableVisible = true
       console.log(index)
     },
       console.log(node)
     },
     searchList (key) {
-      this.GetRolesList({name: key})
+      this.key = key
+      this.GetRolesList({name: this.key})
     },
     addRole () {
-      this.$router.push({ name: 'addRole' })
+      this.$router.push({ name: 'editRole' })
     },
     getCheckedNodes () { // 获取选中的节点
-      console.log(this.$refs.tree.getCheckedNodes())
-    }
+      const menuids = this.$refs.tree.getCheckedNodes().map(x => x.id).join(',')
+      this.SaveRoleMenus({
+        id: this.selid,
+        menuids: menuids,
+        callback: this.hideDialog,
+      })
+    },
+    hideDialog () {
+      this.$message({
+        type: 'success',
+        message: '操作成功!'
+      })
+      this.dialogTableVisible = false
+    },
   },
   beforeMount () {
     this.GetRolesList()

src/store/app.js

   let cp = data.slice()
   const res = []
 
+  cp.map(x => {
+    x.id = x.MenuId
+    x.label = x.MenuName
+    return x
+  })
+
   data.forEach((it, inx) => {
     let found = false
     for (let i = 0; i < cp.length; i += 1) {

src/store/system/role.js

   state: {
     roleList: [],
     roleInfo: {},
+    roleMenus: [],
   },
   mutations: {
     updateList (state, payload) {
     updateInfo (state, payload) {
       state.roleInfo = payload || {}
     },
+    updateRoleMenus (state, payload) {
+      state.roleMenus = payload || {}
+    },
   },
   actions: {
     GetRolesList ({ commit }, payload) {
       }).then(res => {
       })
     },
-    DelRole ({ commit }, payload) {
+    DelRole ({ commit }, { id, callback }) {
       ajax(api.role.delete.url, {
         method: api.role.delete.method,
-        data: {
-          ...payload
+        urlData: {
+          id: id,
         }
       }).then(res => {
+        callback()
       })
     },
     SetRoleNull ({ commit }) {
       commit('updateInfo', {})
-    }
+    },
+    GetRoleMenu ({ commit }, payload) {
+      ajax(api.role.getmenus.url, {
+        method: api.role.getmenus.method,
+        urlData: {
+          id: payload.id,
+        },
+      }).then(res => {
+        commit('updateRoleMenus', res)
+      })
+    },
+    SaveRoleMenus ({ commit }, payload) {
+      ajax(api.role.savemenu.url, {
+        method: api.role.savemenu.method,
+        urlData: {
+          id: payload.id,
+        },
+        data: {
+          menuids: payload.menuids
+        }
+      }).then(res => {
+        payload.callback()
+      })
+    },
   }
 }

src/util/api.js

       method: 'delete',
       url: `${baseUrl}${common}/role/:id`
     },
+    getmenus: {
+      method: 'get',
+      url: `${baseUrl}${common}/rolemenu/:id`
+    },
+    savemenu: {
+      method: 'put',
+      url: `${baseUrl}${common}/rolemenu/:id`
+    },
   },
   dataStatistics: {
     getCustomerList: { // 获取会员列表