From d1b5b00888c0ad536a9bd8d4d5bde8d2e70cd6c6 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Thu, 16 Nov 2023 14:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87-=E5=B7=A5=E5=8D=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/deviceOrder/index.vue         |  1 +
 src/views/device/inspectionWork/index.vue      |  1 +
 src/views/device/maintenanceWork/index.vue     |  1 +
 src/views/device/spotInspectionOrder/index.vue |  1 +
 src/views/device/spotInspectionWork/index.vue  |  1 +
 src/views/device/upkeepOrder/index.vue         | 10 ++++++----
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index 3c024a3..a70a261 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -286,6 +286,7 @@
         </template>
       </el-table-column>
       <el-table-column label="设备编码" align="center" prop="equipmentCode"/>
+      <el-table-column label="设备名称" align="center" prop="equipmentName"/>
       <el-table-column label="工单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue
index a3ea39b..bd1d887 100644
--- a/src/views/device/inspectionWork/index.vue
+++ b/src/views/device/inspectionWork/index.vue
@@ -280,6 +280,7 @@
         </template>
       </el-table-column>
       <el-table-column label="设备编码" align="center" prop="equipmentCode"/>
+      <el-table-column label="设备名称" align="center" prop="equipmentName"/>
       <el-table-column label="工单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index 6eaac20..ed92424 100644
--- a/src/views/device/maintenanceWork/index.vue
+++ b/src/views/device/maintenanceWork/index.vue
@@ -276,6 +276,7 @@
         </template>
       </el-table-column>
       <el-table-column label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column label="设备名称" align="center" prop="equipmentName" />
       <el-table-column label="工单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index ed9cd56..3a34ebb 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -292,6 +292,7 @@
 			</el-table-column>
 			<el-table-column label="设备编码" align="center" prop="equipmentCode" />
 			<el-table-column label="设备名称" align="center" prop="equipmentName" />
+			<el-table-column label="设备名称" align="center" prop="equipmentName" />
 			<el-table-column label="工单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 9fb9a06..7570546 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -276,6 +276,7 @@
         </template>
       </el-table-column>
       <el-table-column label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column label="设备名称" align="center" prop="equipmentName" />
       <el-table-column label="工单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index f31a06d..4131878 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -280,6 +280,7 @@
         </template>
       </el-table-column>
       <el-table-column label="设备编码" align="center" prop="equipmentCode"/>
+      <el-table-column label="设备名称" align="center" prop="equipmentName"/>
       <el-table-column label="工单状态" align="center" prop="orderStatus"/>
       <el-table-column label="审核状态" align="center" prop="orderInspect"/>
       <el-table-column label="工单费用" align="center" prop="orderCost"/>
@@ -370,7 +371,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="10" :offset="1">
-                <el-form-item label-width="100px" label="保养执行时间">
+                <el-form-item label-width="100px" label="循环时间范围">
                   <el-date-picker
                     @change="changeArray"
                     v-model="form.planTimeArray"
@@ -748,11 +749,11 @@
             <el-row>
               <el-col :offset="9" :span="6">
                 <el-form-item label="设备名称:">
-                  {{ this.form.equ.equipmentName }}
+                  {{ this.form.equipmentName }}
                 </el-form-item>
               </el-col>
             </el-row>
-            <div v-for="(detail,detailIndex) in form.equ.detailList" :key="detailIndex">
+            <div v-for="(detail,detailIndex) in form.detailList" :key="detailIndex">
               <!-- 检查项 -->
               <el-row>
                 <el-col :span="6">
@@ -814,7 +815,7 @@
           </el-tab-pane>
           <el-tab-pane label="备件">
             <el-table
-              :data="form.equ.spareList"
+              :data="form.spareList"
               stripe
               style="width: 100%">
               <el-table-column width="60" align="center" label="序号" type="index"/>
@@ -1071,6 +1072,7 @@ export default {
     },
     // 点击快速工单按钮
     cilckFastWork(){
+      this.reset();
       this.selectPersonList = [];
       this.personList = [];
       this.setPerson();