diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 5f97cff..321cb97 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -1,6 +1,72 @@ import request from '../index' const prefix = 'sys/' // 修改密码 -export function changePwd(data: { oldPwd: string;newPwd: string }) { +export function changePwd(data: { oldPwd: string; newPwd: string }) { return request.post(`${prefix}mgr/changePwd`, data) } +// 用户列表 +export function getUserList(params: object) { + return request({ + url: `${prefix}mgr/list`, + method: 'get', + params, + }) +} + +// 添加用户 +export function addUser(data: object) { + return request.post(`${prefix}mgr/add`, data) +} +// 修改用户 +export function updateUser(data: object) { + return request.post(`${prefix}mgr/update`, data) +} +// 删除用户 +export function delUser(data: { id: string }) { + return request({ + url: `${prefix}mgr/delete`, + method: 'post', + data, + }) +} + +// 冻结用户 +export function freezeUserApi(data: { id: string }) { + return request({ + url: `${prefix}mgr/freeze`, + method: 'post', + data, + }) +} +// 冻结用户 +export function unfreezeUser(data: { id: string }) { + return request({ + url: `${prefix}mgr/unfreeze`, + method: 'post', + data, + }) +} + +// 重置用户密码 +export function resetPwd(data: object) { + return request({ + url: 'sys/mgr/reset', + method: 'post', + data, + }) +} + +// 分配角色 +// export function roleAssign(userId: string, ids: string[]) { +// return request({ +// url: 'sys/mgr/roleAssign', +// method: 'post', +// data: { +// userId: userId, +// roleIds: ids +// }, +// // paramsSerializer: params => { +// // return qs.stringify(params, { indices: false }) +// // } +// }) +// } diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 5f97cff..321cb97 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -1,6 +1,72 @@ import request from '../index' const prefix = 'sys/' // 修改密码 -export function changePwd(data: { oldPwd: string;newPwd: string }) { +export function changePwd(data: { oldPwd: string; newPwd: string }) { return request.post(`${prefix}mgr/changePwd`, data) } +// 用户列表 +export function getUserList(params: object) { + return request({ + url: `${prefix}mgr/list`, + method: 'get', + params, + }) +} + +// 添加用户 +export function addUser(data: object) { + return request.post(`${prefix}mgr/add`, data) +} +// 修改用户 +export function updateUser(data: object) { + return request.post(`${prefix}mgr/update`, data) +} +// 删除用户 +export function delUser(data: { id: string }) { + return request({ + url: `${prefix}mgr/delete`, + method: 'post', + data, + }) +} + +// 冻结用户 +export function freezeUserApi(data: { id: string }) { + return request({ + url: `${prefix}mgr/freeze`, + method: 'post', + data, + }) +} +// 冻结用户 +export function unfreezeUser(data: { id: string }) { + return request({ + url: `${prefix}mgr/unfreeze`, + method: 'post', + data, + }) +} + +// 重置用户密码 +export function resetPwd(data: object) { + return request({ + url: 'sys/mgr/reset', + method: 'post', + data, + }) +} + +// 分配角色 +// export function roleAssign(userId: string, ids: string[]) { +// return request({ +// url: 'sys/mgr/roleAssign', +// method: 'post', +// data: { +// userId: userId, +// roleIds: ids +// }, +// // paramsSerializer: params => { +// // return qs.stringify(params, { indices: false }) +// // } +// }) +// } diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue index 3ee448b..f2875d2 100644 --- a/src/views/system/user/list.user.vue +++ b/src/views/system/user/list.user.vue @@ -1,14 +1,317 @@ diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 5f97cff..321cb97 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -1,6 +1,72 @@ import request from '../index' const prefix = 'sys/' // 修改密码 -export function changePwd(data: { oldPwd: string;newPwd: string }) { +export function changePwd(data: { oldPwd: string; newPwd: string }) { return request.post(`${prefix}mgr/changePwd`, data) } +// 用户列表 +export function getUserList(params: object) { + return request({ + url: `${prefix}mgr/list`, + method: 'get', + params, + }) +} + +// 添加用户 +export function addUser(data: object) { + return request.post(`${prefix}mgr/add`, data) +} +// 修改用户 +export function updateUser(data: object) { + return request.post(`${prefix}mgr/update`, data) +} +// 删除用户 +export function delUser(data: { id: string }) { + return request({ + url: `${prefix}mgr/delete`, + method: 'post', + data, + }) +} + +// 冻结用户 +export function freezeUserApi(data: { id: string }) { + return request({ + url: `${prefix}mgr/freeze`, + method: 'post', + data, + }) +} +// 冻结用户 +export function unfreezeUser(data: { id: string }) { + return request({ + url: `${prefix}mgr/unfreeze`, + method: 'post', + data, + }) +} + +// 重置用户密码 +export function resetPwd(data: object) { + return request({ + url: 'sys/mgr/reset', + method: 'post', + data, + }) +} + +// 分配角色 +// export function roleAssign(userId: string, ids: string[]) { +// return request({ +// url: 'sys/mgr/roleAssign', +// method: 'post', +// data: { +// userId: userId, +// roleIds: ids +// }, +// // paramsSerializer: params => { +// // return qs.stringify(params, { indices: false }) +// // } +// }) +// } diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue index 3ee448b..f2875d2 100644 --- a/src/views/system/user/list.user.vue +++ b/src/views/system/user/list.user.vue @@ -1,14 +1,317 @@ diff --git a/src/views/system/user/user.add.vue b/src/views/system/user/user.add.vue new file mode 100644 index 0000000..9df400d --- /dev/null +++ b/src/views/system/user/user.add.vue @@ -0,0 +1,291 @@ + + + + + diff --git a/src/api/system/user.ts b/src/api/system/user.ts index 5f97cff..321cb97 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -1,6 +1,72 @@ import request from '../index' const prefix = 'sys/' // 修改密码 -export function changePwd(data: { oldPwd: string;newPwd: string }) { +export function changePwd(data: { oldPwd: string; newPwd: string }) { return request.post(`${prefix}mgr/changePwd`, data) } +// 用户列表 +export function getUserList(params: object) { + return request({ + url: `${prefix}mgr/list`, + method: 'get', + params, + }) +} + +// 添加用户 +export function addUser(data: object) { + return request.post(`${prefix}mgr/add`, data) +} +// 修改用户 +export function updateUser(data: object) { + return request.post(`${prefix}mgr/update`, data) +} +// 删除用户 +export function delUser(data: { id: string }) { + return request({ + url: `${prefix}mgr/delete`, + method: 'post', + data, + }) +} + +// 冻结用户 +export function freezeUserApi(data: { id: string }) { + return request({ + url: `${prefix}mgr/freeze`, + method: 'post', + data, + }) +} +// 冻结用户 +export function unfreezeUser(data: { id: string }) { + return request({ + url: `${prefix}mgr/unfreeze`, + method: 'post', + data, + }) +} + +// 重置用户密码 +export function resetPwd(data: object) { + return request({ + url: 'sys/mgr/reset', + method: 'post', + data, + }) +} + +// 分配角色 +// export function roleAssign(userId: string, ids: string[]) { +// return request({ +// url: 'sys/mgr/roleAssign', +// method: 'post', +// data: { +// userId: userId, +// roleIds: ids +// }, +// // paramsSerializer: params => { +// // return qs.stringify(params, { indices: false }) +// // } +// }) +// } diff --git a/src/views/system/user/list.user.vue b/src/views/system/user/list.user.vue index 3ee448b..f2875d2 100644 --- a/src/views/system/user/list.user.vue +++ b/src/views/system/user/list.user.vue @@ -1,14 +1,317 @@ diff --git a/src/views/system/user/user.add.vue b/src/views/system/user/user.add.vue new file mode 100644 index 0000000..9df400d --- /dev/null +++ b/src/views/system/user/user.add.vue @@ -0,0 +1,291 @@ + + + + + diff --git a/src/views/system/user/user_interface.ts b/src/views/system/user/user_interface.ts new file mode 100644 index 0000000..b312d97 --- /dev/null +++ b/src/views/system/user/user_interface.ts @@ -0,0 +1,62 @@ +export interface IlistQueryType { + keywords: string + beginTime: string + endTime: string + offset: number + limit: number + sort: string + deptId: string + deptType: string +} +// 树形结构 +export interface TreeStructure { + checked: boolean + children: TreeStructure[] + code: string + id: string + name: string + open: boolean + pCodes: string + pid: string + value: string + +} +// 新增或添加 +export interface addInfo { + id: string // 编号 + account: string // 账号 + name: string // 姓名 + email: string // 邮箱， + phone: string // 手机号， + deptId: string // 组织机构编号 + roleid: string // 角色 + password?: string // 密码 + rePassword?: string // 重复密码 + birthday?: string + sex?: string // 性别 + roleName?: string +} +// 用户列表返回值类型 +export interface userType { + account: string + attr1: string + avatar: string + birthday: string + createtime: string + deptId: string + deptName: string + email: string + id: string + name: string + phone: string + roleId: string + roleName: string + sex: string + sexName: string + status: string + statusName: string + syncId: string + syncName: string + version: string + +}