From f148a8fd773f9b75ea319dab47f9ff2d8c6f38eb Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 3 Jun 2024 13:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=9C=BA=E5=85=B7=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86-=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=91=98=E3=80=81=E5=BA=93=E7=AE=A1=E5=91=98=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/system/user.js              |  9 +++++++++
 sgzb-ui/src/views/store/tools/toolsType.vue | 18 +++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

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