diff --git a/src/api/api.js b/src/api/api.js index c8d3887..40edea8 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -6,6 +6,7 @@ import {UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types" const addRole = (params)=>postAction("/sys/role/add",params); const editRole = (params)=>postAction("/sys/role/edit",params); const checkRoleCode = (params)=>getAction("/sys/role/checkRoleCode",params); +const queryallRoles = (params)=> getAction('sys/role/treeList',params) const queryall = (params)=>getAction("/sys/role/queryall",params); //用户管理 @@ -21,7 +22,7 @@ const checkOnlyUser = (params)=>getAction("/sys/user/checkOnlyUser",params); //改变密码 const changePassword = (params)=>postAction("/sys/user/changePassword",params); // 重置密码 -const resetUserPassword = (params) => postAction('',params) +const resetUserPassword = (params) => postAction('/sys/user/resetPassword',params) //权限管理 const addPermission= (params)=>postAction("/sys/permission/add",params); @@ -163,7 +164,8 @@ export { getUserNoticeInfo, getDictItemsFromCache, resetUserPassword, - getContactsByCompany + getContactsByCompany, + queryallRoles } diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue index 7bc1835..7edacac 100644 --- a/src/views/system/RoleUserList.vue +++ b/src/views/system/RoleUserList.vue @@ -173,7 +173,7 @@ export default { }, handleAddUserRole() { if (this.currentRoleId == "") { - this.$message.error("请选择一个角色!"); + this.$message.warn("请选择一个角色!"); } else { this.$refs.selectUserModal.visible = true; } @@ -205,5 +205,6 @@ export default { } }; - diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index 9067860..8d94b21 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -59,6 +59,7 @@ 导入 + 导出 批量删除 @@ -74,12 +75,13 @@ :dataSource="dataSource" :pagination="ipagination" :loading="loading" + class="j-table-force-nowrap" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> 编辑 - 重置密码 + 重置密码 删除 @@ -51,20 +51,20 @@ - - - - {{ role.roleName }} - - - + + + + + + + + + + + + + + @@ -75,57 +75,59 @@ - - - {{ item.title }} - - - - - - - 男 - 女 - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -165,7 +167,7 @@ import moment from 'moment' import Vue from 'vue' import {ACCESS_TOKEN} from "@/store/mutation-types" import {getAction} from '@/api/manage' -import {addUser, editUser, queryUserRole, queryall, queryDepartTreeList} from '@/api/api' +import {addUser, editUser, queryUserRole, queryall,queryallRoles, queryDepartTreeList} from '@/api/api' import {disabledAuthFilter} from "@/utils/authFilter" import {duplicateCheck} from '@/api/api' import { isEmail, passwordReg} from "@/utils/validate"; @@ -188,8 +190,6 @@ export default { treeDepartData:[], // 角色类型下拉数据 treeRoleData:[], - - selectedDepartKeys: [], //保存用户选择部门id checkedDepartKeys: [], checkedDepartNames: [], // 保存部门的名称 =>title @@ -217,7 +217,7 @@ export default { }, confirmpassword: { rules: [{ - required: true, message: '请重新输入登录密码!', + required: true, message: '请输入确认密码!', }, { validator: this.compareToFirstPassword, }], @@ -232,7 +232,8 @@ export default { },], validateTrigger: 'blur' }, - roles: {}, + selectedroles:{rules: [{required: true, message:"请选择角色类型"}], validateTrigger: ['blur','change']}, + selecteddeparts:{rules: [{required: true, message:"请选择组织机构"}], validateTrigger: ['blur','change']} // sex:{initialValue:((!this.model.sex)?"": (this.model.sex+""))} }, departIdShow: false, @@ -311,13 +312,15 @@ export default { }); }, loadUserRoles(userid) { - queryUserRole({userid: userid}).then((res) => { - if (res.success) { - this.selectedRole = res.result; - } else { - console.log(res.message); - } - }); + return new Promise(resolve => { + queryUserRole({userid: userid}).then((res) => { + if (res.success) { + resolve(res.result) + } else { + console.log(res.message); + } + }); + }) }, refresh() { this.selectedDepartKeys = []; @@ -336,9 +339,12 @@ export default { this.edit({activitiSync: '1'}); }, edit(record) { + this.resetScreenSize(); // 调用此方法,根据屏幕宽度自适应调整抽屉的宽度 // 加载组织机构数据 this.loadDepartTreeData() + // 加载角色数据 + this.loadRolesTreeData() // 获取公钥 this.getPublicKey() let that = this; @@ -346,7 +352,9 @@ export default { that.checkedDepartNameString = ""; that.form.resetFields(); if (record.hasOwnProperty("id")) { - that.loadUserRoles(record.id); + that.loadUserRoles(record.id).then(res => { + that.form.setFieldsValue({selectedroles:res}) + }); setTimeout(() => { this.fileList = record.avatar; }, 5) @@ -354,8 +362,11 @@ export default { that.userId = record.id; that.visible = true; that.model = Object.assign({}, record); + if(record.departIds !== '' && record.id){ + that.model.selecteddeparts = record.departIds.split(',') + } that.$nextTick(() => { - that.form.setFieldsValue(pick(this.model, 'username', 'sex', 'realname', 'email', 'phone', 'post')) + that.form.setFieldsValue(pick(this.model, 'username', 'realname', 'email', 'phone', 'post','selecteddeparts')) }); //身份为上级显示负责部门，否则不显示 if (this.model.userIdentity == "2") { @@ -392,7 +403,21 @@ export default { } }) }, - // + // 角色下拉数据 + loadRolesTreeData() { + const that = this + queryallRoles().then((res) => { + if(res.success){ + that.treeRoleData = []; + let treeList = res.result + for(let a=0;a { @@ -473,8 +498,8 @@ export default { //update-begin-author:taoyan date:2020710 for:多租户配置 formData.relTenantIds = this.currentTenant.length > 0 ? this.currentTenant.join(',') : '' //update-end-author:taoyan date:2020710 for:多租户配置 - formData.selectedroles = this.selectedRole.length > 0 ? this.selectedRole.join(",") : ''; - formData.selecteddeparts = this.userDepartModel.departIdList.length > 0 ? this.userDepartModel.departIdList.join(",") : ''; + formData.selectedroles = values.selectedroles.length > 0 ? values.selectedroles.join(",") : ''; + formData.selecteddeparts = values.selecteddeparts.length > 0 ? values.selecteddeparts.join(",") : ''; formData.userIdentity = this.identity; //如果是上级择传入departIds,否则为空 if (this.identity === "2") {