Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

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/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 => {

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

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"