diff --git a/sgzb-ui/src/api/system/user.js b/sgzb-ui/src/api/system/user.js index 3e498792..8f2f9e3e 100644 --- a/sgzb-ui/src/api/system/user.js +++ b/sgzb-ui/src/api/system/user.js @@ -143,3 +143,12 @@ export function getUserByRoleList(data) { params: data }) } + +// 库管员 +export function getMaUserList(params) { + return request({ + url: '/base/maWarehouseKeeper/getMaUserList', + method: 'get', + params + }) +} diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue index 54bf034d..130c20a4 100644 --- a/sgzb-ui/src/views/store/tools/toolsType.vue +++ b/sgzb-ui/src/views/store/tools/toolsType.vue @@ -299,11 +299,12 @@ filterable placeholder="请选择维修员" style="width: 100%" + clearable > @@ -414,7 +415,7 @@ @@ -579,7 +580,7 @@ import { updateMaType, delMaType, } from '@/api/store/tools' -import { getUserByRoleList } from '@/api/system/user' +import { getUserByRoleList, getMaUserList } from '@/api/system/user' import { getProLists } from '@/api/base/base' import { imgUpLoad, fileUpLoad } from '@/api/system/upload' import { getInfo } from '@/api/login' @@ -692,6 +693,13 @@ export default { trigger: 'blur', }, ], + keeperUserId: [ + { + required: true, + message: '库管员不能为空', + trigger: 'change', + }, + ], // password: [ // {required: true, message: "用户密码不能为空", trigger: "blur"}, // {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'} @@ -757,10 +765,10 @@ export default { // }, /** 查询用户列表--库管员,维修员 */ getUserList() { - getUserByRoleList({ roleId: '101' }).then((response) => { + getMaUserList().then((response) => { this.keeperList = response.data }) - getUserByRoleList({ roleId: '102' }).then((response) => { + getUserByRoleList().then((response) => { this.repairUserList = response.data }) },