From f94fd5708dd0b1738e75f2dcd7d36eb3ddb2dee7 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 3 Jul 2024 13:12:04 +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-=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE=E6=8A=A5=E8=A1=A8=E6=98=BE=E7=A4=BA=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E4=BA=BA=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/repairOrder/index.vue       | 124 ++++++++++++-------
 src/views/device/repairOrderReport/index.vue |  15 ++-
 2 files changed, 90 insertions(+), 49 deletions(-)

diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 80ccf891..3182bce5 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -52,10 +52,10 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="维修人员" prop="workPerson">
+      <el-form-item label="维修人员姓名" prop="workPersonName">
         <el-input
-          v-model="queryParams.workPerson"
-          placeholder="请输入维修人员"
+          v-model="queryParams.workPersonName"
+          placeholder="请输入维修人员姓名"
           clearable
           style="width: 200px"
           @keyup.enter.native="handleQuery"
@@ -352,7 +352,8 @@
           <span>{{ parseTime(scope.row.workPlanDownTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="维修人员" align="center" prop="workPerson" />
+      <el-table-column label="维修人员工号" align="center" prop="workPerson" width="100"/>
+      <el-table-column label="维修人员姓名" align="center" prop="workPersonName" width="100"/>
       <el-table-column
         label="维修组编码"
         align="center"
@@ -525,10 +526,10 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="维修人" prop="workPerson">
+        <el-form-item label="维修人工号" prop="workPerson">
           <el-input
             v-model="form.workPerson"
-            placeholder="请选择维修人"
+            placeholder="请选择维修人工号"
             style="width: 280px"
           >
             <el-button
@@ -543,6 +544,14 @@
           >
           </ItemSelectPerson>
         </el-form-item>
+        <el-form-item label="维修人姓名" prop="workPersonName">
+          <el-input
+            v-model="form.workPersonName"
+            placeholder="请输入维修人姓名"
+            style="width: 280px"
+            disabled
+          />
+        </el-form-item>
         <el-form-item label="维修组" prop="workTeam">
           <el-select
             v-model="form.workTeam"
@@ -642,10 +651,10 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="维修人" prop="workPerson">
+        <el-form-item label="维修人工号" prop="workPerson">
           <el-input
             v-model="form.workPerson"
-            placeholder="请选择维修人"
+            placeholder="请选择维修人工号"
             style="width: 250px"
           >
             <el-button
@@ -660,6 +669,14 @@
           >
           </ItemSelectPerson>
         </el-form-item>
+        <el-form-item label="维修人姓名" prop="workPersonName">
+          <el-input
+            v-model="form.workPersonName"
+            placeholder="请输入维修人姓名"
+            style="width: 250px"
+            disabled
+          />
+        </el-form-item>
         <el-form-item label="维修组" prop="workTeam">
           <el-select
             v-model="form.workTeam"
@@ -1034,12 +1051,12 @@
           </el-tab-pane>
 
           <el-tab-pane label="填写维修记录">
-            <el-row :gutter="10" class="mb8">
+            <el-row>
               <el-col :span="8">
-                <el-form-item label="维修人" prop="workPerson" label-width="120px">
+                <el-form-item label="维修人工号" prop="workPerson" label-width="120px">
                   <el-input
                     v-model="form.workPerson"
-                    placeholder="请选择维修人"
+                    placeholder="请选择维修人工号"
                     style="width: 250px"
                   >
                     <el-button
@@ -1055,6 +1072,16 @@
                   </ItemSelectPerson>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="维修人姓名" prop="workPersonName" label-width="120px">
+                  <el-input
+                    v-model="form.workPersonName"
+                    style="width: 250px"
+                    disabled
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="维修状态" prop="workStatus" label-width="120px">
                   <el-select
@@ -1071,19 +1098,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="维修费用" prop="workCost" label-width="120px">
-                  <el-input-number
-                    :min="0"
-                    :step="1"
-                    v-model="form.workCost"
-                    style="width: 250px"
-                  />
-                  <span> 元</span>
-                </el-form-item>
-              </el-col>
             </el-row>
-            <el-row :gutter="10" class="mb8">
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="开始时间" prop="workStartTime" label-width="120px">
                   <el-date-picker
@@ -1121,7 +1137,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="10" class="mb8">
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="故障报修时间" prop="orderBreakdownTime" v-if = "form.faultStartTime == null" label-width="120px">
                   <el-date-picker
@@ -1133,6 +1149,8 @@
                     disabled
                   ></el-date-picker>
                 </el-form-item>
+              </el-col>
+              <el-col :span="8">
                 <el-form-item label="故障开始时间" prop="faultStartTime" v-if = "form.faultStartTime != null" label-width="120px">
                   <el-date-picker
                     clearable
@@ -1154,8 +1172,6 @@
                   </el-input>
                 </el-form-item>
               </el-col>  
-            </el-row>
-            <el-row :gutter="10" class="mb8">
               <el-col :span="8">
                 <el-form-item label="是否停机" prop="workDownMachine" abel-width="120px">
                   <el-radio-group v-model="form.workDownMachine">
@@ -1164,6 +1180,8 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <!-- <el-col :span="8">
                 <el-form-item label="故障类型" prop="faultType">
                   <el-cascader
@@ -1174,8 +1192,6 @@
                   ></el-cascader>
                 </el-form-item>
               </el-col> -->
-            </el-row>
-            <el-row :gutter="10" class="mb8">
               <el-col :span="8">
                 <el-form-item label="故障原因" prop="workReason" label-width="120px">
                   <el-select
@@ -1218,6 +1234,17 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="维修费用" prop="workCost" label-width="120px">
+                  <el-input-number
+                    :min="0"
+                    :step="1"
+                    v-model="form.workCost"
+                    style="width: 250px"
+                  />
+                  <span> 元</span>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
@@ -1455,7 +1482,7 @@
           <el-tab-pane label="查看维修记录">
             <el-row :gutter="10" class="mb8">
               <el-col :span="8">
-                <el-form-item label="维修人" prop="workPerson" label-width="120px">
+                <el-form-item label="维修人工号" prop="workPerson" label-width="120px">
                   <el-input
                     v-model="form.workPerson"
                     style="width: 195px"
@@ -1464,6 +1491,16 @@
                   </el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="维修人姓名" prop="workPersonName" label-width="120px">
+                  <el-input
+                    v-model="form.workPersonName"
+                    style="width: 195px"
+                    disabled
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="维修状态" prop="workStatus" label-width="120px">
                   <el-select
@@ -1480,18 +1517,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="维修费用" prop="workCost" label-width="120px">
-                  <el-input-number
-                    :min="0"
-                    :step="1"
-                    disabled
-                    v-model="form.workCost"
-                    style="width: 175px"
-                  />
-                  <span> 元</span>
-                </el-form-item>
-              </el-col>
             </el-row>
             <el-row :gutter="10" class="mb8">
               <el-col :span="8">
@@ -1564,8 +1589,6 @@
                   </el-input>
                 </el-form-item>
               </el-col>  
-            </el-row>
-            <el-row :gutter="10" class="mb8">
               <el-col :span="8">
                 <el-form-item label="是否停机" prop="workDownMachine" label-width="120px">
                   <el-radio-group v-model="form.workDownMachine" disabled>
@@ -1627,6 +1650,18 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="维修费用" prop="workCost" label-width="120px">
+                  <el-input-number
+                    :min="0"
+                    :step="1"
+                    disabled
+                    v-model="form.workCost"
+                    style="width: 175px"
+                  />
+                  <span> 元</span>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-tab-pane>
           <el-tab-pane label="查看备件申领记录">
@@ -1774,6 +1809,7 @@ export default {
         workPlanDownTime: null,
         orderRelevance: null,
         workPerson: null,
+        workPersonName: null,
         workTeam: null,
         workOutsource: null,
         workDownMachine: null,
@@ -2084,6 +2120,7 @@ export default {
         workPlanDownTime: null,
         orderRelevance: null,
         workPerson: null,
+        workPersonName: null,
         workTeam: null,
         workOutsource: null,
         workDownMachine: null,
@@ -2410,6 +2447,7 @@ export default {
     onItemSelectedPerson(obj) {
       console.log(obj);
       this.form.workPerson = obj[0].userName;
+      this.form.workPersonName = obj[0].nickName;
     },
     //设备选择
     onItemSelectedEquipment(obj) {
diff --git a/src/views/device/repairOrderReport/index.vue b/src/views/device/repairOrderReport/index.vue
index 738db6ce..b942ea27 100644
--- a/src/views/device/repairOrderReport/index.vue
+++ b/src/views/device/repairOrderReport/index.vue
@@ -52,10 +52,10 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="维修人员" prop="workPerson">
+      <el-form-item label="维修人员姓名" prop="workPersonName">
         <el-input
-          v-model="queryParams.workPerson"
-          placeholder="请输入维修人员"
+          v-model="queryParams.workPersonName"
+          placeholder="请输入维修人姓名"
           clearable
           style="width: 200px"
           @keyup.enter.native="handleQuery"
@@ -261,7 +261,8 @@
           <span>{{ parseTime(scope.row.workPlanDownTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="维修人员" align="center" prop="workPerson" />
+      <el-table-column label="维修人工号" align="center" prop="workPerson" width="100"/>
+      <el-table-column label="维修人姓名" align="center" prop="workPersonName" width="100"/>
       <el-table-column
         label="维修组编码"
         align="center"
@@ -454,8 +455,8 @@
                 form.actualDownEndTime
               }}</el-descriptions-item>
 
-              <el-descriptions-item label="维修人（负责人）">{{
-                form.workPerson
+              <el-descriptions-item label="维修人姓名（负责人）">{{
+                form.workPersonName
               }}</el-descriptions-item>
               <el-descriptions-item label="维修人联系方式">{{
                 form.workConnection
@@ -668,6 +669,7 @@ export default {
         workPlanDownTime: null,
         orderRelevance: null,
         workPerson: null,
+        workPersonName: null,
         workTeam: null,
         workOutsource: null,
         workDownMachine: null,
@@ -780,6 +782,7 @@ export default {
         workPlanDownTime: null,
         orderRelevance: null,
         workPerson: null,
+        workPersonName: null,
         workTeam: null,
         workOutsource: null,
         workDownMachine: null,