From 81e5c44cfd8870781eeaa409bfd1b489d0c66aa8 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 3 Jul 2024 11:05:40 +0800
Subject: [PATCH] =?UTF-8?q?2024-07-03=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E6=98=BE=E7=A4=BA=E6=A3=80=E6=9F=A5=E4=BA=BA?=
 =?UTF-8?q?=E5=B7=A5=E5=8F=B7=E5=92=8C=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/deviceOrder/index.vue        | 17 ++++++++++----
 src/views/device/inspectionWork/index.vue     | 23 +++++++++++++++----
 src/views/device/maintenanceWork/index.vue    | 23 +++++++++++++++----
 .../device/spotInspectionOrder/index.vue      | 11 +++++++--
 src/views/device/spotInspectionWork/index.vue | 21 +++++++++++++----
 src/views/device/upkeepOrder/index.vue        | 11 +++++++--
 6 files changed, 85 insertions(+), 21 deletions(-)

diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index 2448bba7..4b6c0379 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -84,10 +84,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="巡检人" prop="planPerson">
+      <el-form-item label="巡检人工号" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
-          placeholder="请输入巡检人"
+          placeholder="请输入巡检人工号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -330,7 +330,7 @@
         >
         </el-date-picker>
       </el-form-item>
-      
+
       <el-form-item>
         <el-button
           type="primary"
@@ -486,7 +486,8 @@
         align="center"
         prop="orderEnd"
       />
-      <el-table-column label="巡检人" align="center" prop="planPerson" />
+      <el-table-column label="巡检人工号" align="center" prop="planPerson" width="100"/>
+      <el-table-column label="巡检人姓名" align="center" prop="planPersonName" width="100"/>
       <el-table-column
         v-if="false"
         label="产线"
@@ -799,9 +800,12 @@
             <el-descriptions-item v-if="false" label="执行结束时间">{{
               workVO.order.orderEnd
             }}</el-descriptions-item>
-            <el-descriptions-item label="巡检人">{{
+            <el-descriptions-item label="巡检人工号">{{
               workVO.order.planPerson
             }}</el-descriptions-item>
+            <el-descriptions-item label="巡检人姓名">{{
+              workVO.order.planPersonName
+            }}</el-descriptions-item>
             <el-descriptions-item label="报修单号">{{
               workVO.order.repairCode
             }}</el-descriptions-item>
@@ -924,6 +928,7 @@ export default {
           orderStart: null,
           orderEnd: null,
           planPerson: null,
+          planPersonName: null,
         },
         equ: {
           equipmentCode: null,
@@ -1013,6 +1018,7 @@ export default {
         orderStatus: null,
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
@@ -1101,6 +1107,7 @@ export default {
         orderStatus: null,
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue
index 038ee012..d8c6de57 100644
--- a/src/views/device/inspectionWork/index.vue
+++ b/src/views/device/inspectionWork/index.vue
@@ -126,10 +126,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="巡检人" prop="planPerson">
+      <el-form-item label="巡检人工号" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
-          placeholder="请输入巡检人"
+          placeholder="请输入巡检人工号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="巡检人姓名" prop="planPersonName">
+        <el-input
+          v-model="queryParams.planPersonName"
+          placeholder="请输入巡检人姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -458,7 +466,8 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="巡检人" align="center" prop="planPerson" />
+      <el-table-column label="巡检人工号" align="center" prop="planPerson" width="100"/>
+      <el-table-column label="巡检人姓名" align="center" prop="planPersonName" width="100"/>
       <el-table-column
         v-if="false"
         label="产线"
@@ -665,9 +674,12 @@
             <el-descriptions-item v-if="false" label="执行结束时间">{{
               workVO.order.orderEnd
             }}</el-descriptions-item>
-            <el-descriptions-item label="巡检人">{{
+            <el-descriptions-item label="巡检人工号">{{
               workVO.order.planPerson
             }}</el-descriptions-item>
+            <el-descriptions-item label="巡检人姓名">{{
+              workVO.order.planPersonName
+            }}</el-descriptions-item>
             <el-descriptions-item label="报修单号">{{
               workVO.order.repairCode
             }}</el-descriptions-item>
@@ -826,6 +838,7 @@ export default {
           orderStart: null,
           orderEnd: null,
           planPerson: null,
+          planPersonName: null,
         },
         equ: {
           equipmentCode: null,
@@ -879,6 +892,7 @@ export default {
         orderStatus: "1",
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
@@ -968,6 +982,7 @@ export default {
         orderStatus: "1",
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index cb41d48f..30a1304c 100644
--- a/src/views/device/maintenanceWork/index.vue
+++ b/src/views/device/maintenanceWork/index.vue
@@ -162,10 +162,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="保养人" prop="planPerson">
+      <el-form-item label="保养人工号" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
-          placeholder="请输入保养人"
+          placeholder="请输入保养人工号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="保养人姓名" prop="planPersonName">
+        <el-input
+          v-model="queryParams.planPersonName"
+          placeholder="请输入保养人姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -503,7 +511,8 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="保养人" align="center" prop="planPerson" />
+      <el-table-column label="保养人工号" align="center" prop="planPerson" width="100"/>
+      <el-table-column label="保养人姓名" align="center" prop="planPersonName" width="100"/>
       <el-table-column
         v-if="false"
         label="产线"
@@ -715,9 +724,12 @@
             <el-descriptions-item label="是否停机保养">{{
               workVO.order.shutDown
             }}</el-descriptions-item>
-            <el-descriptions-item label="保养人">{{
+            <el-descriptions-item label="保养人工号">{{
               workVO.order.planPerson
             }}</el-descriptions-item>
+            <el-descriptions-item label="保养人姓名">{{
+              workVO.order.planPersonName
+            }}</el-descriptions-item>
             <!--            <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>-->
             <el-descriptions-item label="保养图片">
               <div class="demo-image__lazy">
@@ -922,6 +934,7 @@ export default {
           orderStart: null,
           orderEnd: null,
           planPerson: null,
+          planPersonName: null,
           upkeepPictures: [],
         },
         equ: {
@@ -978,6 +991,7 @@ export default {
         orderStatus: "1",
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
@@ -1083,6 +1097,7 @@ export default {
         orderStatus: "1",
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index 2adb332d..c0265aae 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -480,7 +480,8 @@
         align="center"
         prop="orderEnd"
       />
-      <el-table-column label="点检人" align="center" prop="planPerson" />
+      <el-table-column label="点检人工号" align="center" prop="planPerson" width="100"/>
+      <el-table-column label="点检人姓名" align="center" prop="planPersonName" width="100"/>
       <el-table-column
         v-if="false"
         label="产线"
@@ -802,9 +803,12 @@
             <el-descriptions-item v-if="false" label="执行结束时间">{{
               workVO.order.orderEnd
             }}</el-descriptions-item>
-            <el-descriptions-item label="点检人">{{
+            <el-descriptions-item label="点检人工号">{{
               workVO.order.planPerson
             }}</el-descriptions-item>
+            <el-descriptions-item label="点检人姓名">{{
+              workVO.order.planPersonName
+            }}</el-descriptions-item>
             <el-descriptions-item label="报修单号">{{
               workVO.order.repairCode
             }}</el-descriptions-item>
@@ -928,6 +932,7 @@ export default {
           orderStart: null,
           orderEnd: null,
           planPerson: null,
+          planPersonName: null,
         },
         equ: {
           equipmentCode: null,
@@ -1019,6 +1024,7 @@ export default {
         orderStatus: null,
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
@@ -1124,6 +1130,7 @@ export default {
         orderStatus: null,
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 0bee4ab2..7a3dd6df 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -116,10 +116,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="点检人" prop="planPerson">
+      <el-form-item label="点检人工号" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
-          placeholder="请输入点检人"
+          placeholder="请输入点检人工号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="点检人姓名" prop="planPersonName">
+        <el-input
+          v-model="queryParams.planPersonName"
+          placeholder="请输入点检人姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -343,7 +351,8 @@
       <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
       <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column width="150" label="点检时间" align="center" prop="orderStart"/>
-      <el-table-column label="点检人" align="center" prop="planPerson" />
+      <el-table-column label="点检人工号" align="center" prop="planPerson" width="100"/>
+      <el-table-column label="点检人姓名" align="center" prop="planPersonName" width="100"/>
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
       <el-table-column label="循环周期" align="center" prop="planLoop" />
       <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
@@ -442,7 +451,8 @@
             <el-descriptions-item v-if="false" label="点检执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
             <el-descriptions-item v-if="false" label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
             <el-descriptions-item v-if="false" label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
-            <el-descriptions-item label="点检人">{{ workVO.order.planPerson }}</el-descriptions-item>
+            <el-descriptions-item label="点检人工号">{{ workVO.order.planPerson }}</el-descriptions-item>
+            <el-descriptions-item label="点检人姓名">{{ workVO.order.planPersonName }}</el-descriptions-item>
             <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
@@ -597,6 +607,7 @@ export default {
           orderStart:null,
           orderEnd:null,
           planPerson:null,
+          planPersonName: null,
         },equ: {
           equipmentCode:null,
           equipmentName: null,
@@ -648,6 +659,7 @@ export default {
         orderStatus: '1',
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
@@ -738,6 +750,7 @@ export default {
         orderStatus: '1',
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 314b2d55..d886df22 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -577,7 +577,8 @@
         </template>
       </el-table-column>
       <el-table-column label="工单费用" align="center" prop="orderCost" />
-      <el-table-column label="保养人" align="center" prop="planPerson" />
+      <el-table-column label="保养人工号" align="center" prop="planPerson" width="100"/>
+      <el-table-column label="保养人姓名" align="center" prop="planPersonName" width="100"/>
       <el-table-column
         width="120"
         label="工单用时(min)"
@@ -1264,9 +1265,12 @@
             <el-descriptions-item label="是否停机保养">{{
               workVO.order.shutDown
             }}</el-descriptions-item>
-            <el-descriptions-item label="保养人">{{
+            <el-descriptions-item label="保养人工号">{{
               workVO.order.planPerson
             }}</el-descriptions-item>
+            <el-descriptions-item label="保养人姓名">{{
+              workVO.order.planPersonName
+            }}</el-descriptions-item>
             <!--            <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>-->
             <el-descriptions-item label="保养图片">
               <div class="demo-image__lazy">
@@ -1444,6 +1448,7 @@ export default {
           orderStart: null,
           orderEnd: null,
           planPerson: null,
+          planPersonName: null,
           upkeepPictures: [],
         },
         equ: {
@@ -1594,6 +1599,7 @@ export default {
         orderStatus: null,
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,
@@ -2103,6 +2109,7 @@ export default {
         orderStatus: null,
         orderCost: null,
         planPerson: null,
+        planPersonName: null,
         orderCostTime: null,
         orderSignPerson: null,
         factoryCode: null,