工机具管理-类型管理-维修员、库管员下拉问题

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
+  })
+}

sgzb-ui/src/views/store/tools/toolsType.vue

@@ -299,11 +299,12 @@
                                 filterable
                                 placeholder="请选择维修员"
                                 style="width: 100%"
+                                clearable
                             >
                                 <el-option
                                     v-for="keeper in repairUserList"
                                     :key="keeper.userId"
-                                    :label="keeper.nickName"
+                                    :label="keeper.userName"
                                     :value="keeper.userId"
                                 ></el-option>
                             </el-select>
@@ -414,7 +415,7 @@
                                 <el-option
                                     v-for="keeper in keeperList"
                                     :key="keeper.userId"
-                                    :label="keeper.nickName"
+                                    :label="keeper.userName"
                                     :value="keeper.userId"
                                 ></el-option>
                             </el-select>
@@ -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
             })
         },