From 5c2e8cd2a5b8ce689fe7554e6b7aafd8206a298e Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 14 Dec 2022 17:44:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E9=A2=86?=
 =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  4 ++--
 src/views/inventory/addDeviceCollectOrder.vue | 22 +++++++++++++++++++
 src/views/inventory/deviceCollectOrderNew.vue |  3 ++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 21fe13e..34ae01c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1565,7 +1565,7 @@ export const asyncRouterMap = [
                                     {
                                         path: "deviceMAOrderNew",
                                         component: deviceMAOrderNew,
-                                        name: "新增设备养护",
+                                        name: "资产管理",
                                         icon: "",
                                         meta: {
                                             authRule: ["deviceMA/orderNew"]
@@ -1574,7 +1574,7 @@ export const asyncRouterMap = [
                                     {
                                         path: "deviceMAOrderCompleted",
                                         component: deviceMAOrderCompleted,
-                                        name: "设备养护查询",
+                                        name: "养护记录",
                                         icon: "",
                                         meta: {
                                             authRule: ["deviceMA/orderCompleted"]
diff --git a/src/views/inventory/addDeviceCollectOrder.vue b/src/views/inventory/addDeviceCollectOrder.vue
index 818d1e0..c23191a 100644
--- a/src/views/inventory/addDeviceCollectOrder.vue
+++ b/src/views/inventory/addDeviceCollectOrder.vue
@@ -60,6 +60,28 @@
                         </el-select>
                     </el-form-item>
                 </el-col>
+
+                <el-col :span="3">
+                    <div class="ao-text">
+                        <span>领用人：</span>
+                    </div>
+                </el-col>
+                <el-col :span="7">
+                    <el-form-item prop="collectUser">
+                        <el-select v-model="formData.deptCode" placeholder="领用部门"
+                                   :disabled="detailList.length >0 "
+                                   clearable>
+                            <el-option
+                                v-for="item in deptList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
             </el-row>
 
 
diff --git a/src/views/inventory/deviceCollectOrderNew.vue b/src/views/inventory/deviceCollectOrderNew.vue
index 63afe13..feaa910 100644
--- a/src/views/inventory/deviceCollectOrderNew.vue
+++ b/src/views/inventory/deviceCollectOrderNew.vue
@@ -44,7 +44,8 @@
                 <el-table-column label="设备领用记录号" prop="orderId" width="180"></el-table-column>
                 <el-table-column label="领用部门" prop="deptName" width="180"></el-table-column>
                 <el-table-column label="领用日期" prop="createTime" width="180"></el-table-column>
-                <el-table-column label="领用人" prop="createUser" width="120"></el-table-column>
+                <el-table-column label="领用人" prop="collectUser" width="120"></el-table-column>
+                <el-table-column label="创建人" prop="createUser" width="120"></el-table-column>
                 <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
                     <template slot-scope="scope">
                         <el-tag>{{ statusMap[scope.row.status] }}</el-tag>