From 8805e30754d6b5e4a22e85e133343e0d9a6bef1e Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 5 Dec 2023 11:30:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=B7=A5=E5=8D=95=20?=
 =?UTF-8?q?=E5=A7=94=E5=A4=96=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/outsourceWorkOrder/index.vue | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/device/outsourceWorkOrder/index.vue b/src/views/device/outsourceWorkOrder/index.vue
index 6a0986d8..a4f0d4a2 100644
--- a/src/views/device/outsourceWorkOrder/index.vue
+++ b/src/views/device/outsourceWorkOrder/index.vue
@@ -175,13 +175,24 @@
         width="180"
       />
       <el-table-column
-        label="维修/保养单号"
+        label="维修/保养工单号"
         align="center"
         prop="repairCode"
         width="180"
       />
-      <el-table-column label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column label="设备名称" align="center" prop="equipmentName" />
+      <el-table-column label="委外类型" align="center" prop="workType">
+        <template slot-scope="scope">
+          {{ scope.row.workType == 1 ? "保养委外" : "维修委外" }}
+        </template>
+      </el-table-column>
+      <el-table-column label="委外状态" align="center" prop="workStatus" width="100">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.workStatus == 1">完成</el-tag>
+          <el-tag type="danger" v-else-if="scope.row.workStatus == 0">未完成</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备编码" align="center" prop="equipmentCode" width="100"/>
+      <el-table-column label="设备名称" align="center" prop="equipmentName" width="100"/>
       <el-table-column
         label="设备类型"
         align="center"
@@ -211,11 +222,6 @@
         prop="workReason"
         width="150"
       />
-      <el-table-column label="委外类型" align="center" prop="workType">
-        <template slot-scope="scope">
-          {{ scope.row.workType == 1 ? "保养委外" : "维修委外" }}
-        </template>
-      </el-table-column>
       <el-table-column label="委外费用" align="center" prop="workCost" />
       <el-table-column label="委外用时" align="center" prop="workCostTime" />
       <el-table-column

From 09aebc8e669b2e4d9e27f348bea9f4c51173b9fa Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 5 Dec 2023 11:51:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/inspectionWork/index.vue     | 4 ++--
 src/views/device/spotInspectionWork/index.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue
index aae6d3a0..03bff7e0 100644
--- a/src/views/device/inspectionWork/index.vue
+++ b/src/views/device/inspectionWork/index.vue
@@ -231,7 +231,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item v-if="false" label-width="100px" label="执行开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -244,7 +244,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item v-if="false" label-width="100px" label="执行结束时间" prop="orderEnd">
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"
diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 16823576..d57f23d6 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -226,7 +226,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item v-if="false" label-width="100px" label="执行开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -239,7 +239,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item v-if="false" label-width="100px" label="执行结束时间" prop="orderEnd">
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"