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 1/3] =?UTF-8?q?=E5=B7=A5=E6=9C=BA=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86-=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=E5=91=98=E3=80=81=E5=BA=93=E7=AE=A1=E5=91=98=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=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
             })
         },

From 52e8e95c4517eb2fa25918654f608f7dcfcee41d Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 3 Jun 2024 16:21:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE-=E7=BB=B4=E4=BF=AE=E4=BA=BA=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
index 6c7c5ea7..cb962bb9 100644
--- a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
+++ b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
@@ -14,7 +14,7 @@
             </el-form-item>
             <el-form-item v-if="index == 0" :prop="'premiumListTwo.' + index + '.repairer'" label="维修人：">
               <el-select v-model="domain.repairer" placeholder="请选择" size="small" filterable style="width: 350px">
-                <el-option v-for="dict in userSelectList" :key="dict.userId" :label="dict.nickName"
+                <el-option v-for="dict in userSelectList" :key="dict.userId" :label="dict.userName"
                   :value="dict.userId" />
               </el-select>
             </el-form-item>
@@ -75,7 +75,7 @@
             </el-form-item>
             <el-form-item v-if="index == 0" :prop="'premiumListTwo.' + index + '.repairer'" label="维修人：">
               <el-select v-model="domain.repairer" placeholder="请选择" size="small" filterable style="width: 350px">
-                <el-option v-for="dict in userSelectList" :key="dict.userId" :label="dict.nickName"
+                <el-option v-for="dict in userSelectList" :key="dict.userId" :label="dict.userName"
                   :value="dict.userId" />
               </el-select>
             </el-form-item>
@@ -128,9 +128,10 @@
 </template>
 <script>
 import {
-  submitRepairApplyApi, getUserSelectApi,
+  submitRepairApplyApi,
   getRepairMaTypeListApi, listPartType
 } from "@/api/repairTest/repair";
+import { getUserByRoleList } from '@/api/system/user'
 // import { listPartType, } from "@/api/store/tools";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -283,7 +284,7 @@ export default {
         this.dynamicValidateFormTwo.premiumListTwo = [];
         this.addDomainTwo();
       }
-      getUserSelectApi().then(response => {
+      getUserByRoleList().then(response => {
         this.userSelectList = response.data;
       })
       getInfo().then(res => {

From 2e199241046d0e94b9ced61334e0eea6820cc16c Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 3 Jun 2024 17:48:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2-?=
 =?UTF-8?q?=E9=A2=86=E6=96=99=E6=9F=A5=E8=AF=A2-=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E7=89=8C=E5=8F=B7=E3=80=81=E9=A2=86?=
 =?UTF-8?q?=E6=96=99=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/stquery/leaseRecord.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sgzb-ui/src/views/stquery/leaseRecord.vue b/sgzb-ui/src/views/stquery/leaseRecord.vue
index 1d3518f5..f13812af 100644
--- a/sgzb-ui/src/views/stquery/leaseRecord.vue
+++ b/sgzb-ui/src/views/stquery/leaseRecord.vue
@@ -167,6 +167,18 @@
                 prop="leasePerson"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+                label="车牌号"
+                align="center"
+                prop="carCode"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="领料单号"
+                align="center"
+                prop="code"
+                show-overflow-tooltip
+            />
             <el-table-column
                 label="领料日期"
                 align="center"