From d5803487ac6287d42a42e462dbaa31e1708c2edd Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 2 Aug 2024 17:32:11 +0800
Subject: [PATCH] =?UTF-8?q?2024-08-02=20=E8=AE=BE=E5=A4=87=E4=B9=9D?=
 =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89?=
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/inspectionPlan/index.vue     |  2 +-
 src/views/device/inspectionWork/index.vue     | 19 +++++++-
 src/views/device/maintenanceWork/index.vue    | 46 ++++++++++++++-----
 src/views/device/spotCheckPlan/index.vue      |  2 +-
 .../device/spotInspectionOrder/index.vue      | 17 +++++++
 src/views/device/spotInspectionWork/index.vue | 17 +++++++
 src/views/device/upkeepOrder/index.vue        | 17 +++++++
 src/views/device/upkeepPlan/index.vue         |  2 +-
 9 files changed, 123 insertions(+), 16 deletions(-)

diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index 12152de..9196b15 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -116,6 +116,20 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item v-if="false" label="循环周期" prop="planLoop">
         <el-input
           v-model="queryParams.planLoop"
@@ -1029,6 +1043,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        createTimeArray: [],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -1119,6 +1134,7 @@ export default {
         updateBy: null,
         updateTime: null,
         equ: { equipmentName: null },
+        createTimeArray: [],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -1133,6 +1149,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.createTimeArray = [];
       this.queryParams.loopStartArray = [];
       this.queryParams.orderStartArray = [];
       this.queryParams.orderEndArray = [];
diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue
index 60d1cc3..907c1fc 100644
--- a/src/views/device/inspectionPlan/index.vue
+++ b/src/views/device/inspectionPlan/index.vue
@@ -165,7 +165,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item v-if="false" label="创建时间" prop="createTime">
+      <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTimeArray"
           type="daterange"
diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue
index f78281c..5b3dbdd 100644
--- a/src/views/device/inspectionWork/index.vue
+++ b/src/views/device/inspectionWork/index.vue
@@ -148,7 +148,7 @@
           v-model="queryParams.orderStart"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择点检时间"
+          placeholder="请选择巡检时间"
         >
         </el-date-picker>
       </el-form-item>
@@ -314,6 +314,20 @@
         >
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -903,6 +917,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        createTimeArray:[],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -993,6 +1008,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        createTimeArray:[],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -1007,6 +1023,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.createTimeArray = [];
       this.queryParams.loopStartArray = [];
       this.queryParams.orderStartArray = [];
       this.queryParams.orderEndArray = [];
diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index 4d5c807..9eb17c4 100644
--- a/src/views/device/maintenanceWork/index.vue
+++ b/src/views/device/maintenanceWork/index.vue
@@ -178,6 +178,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="保养类型" prop="upkeep">
+        <el-select
+          v-model="queryParams.upkeep"
+          placeholder="请选择保养类型"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.device_upkeep_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item v-if="false" label="工单用时" prop="orderCostTime">
         <el-input
           v-model="queryParams.orderCostTime"
@@ -272,6 +286,7 @@
       </el-form-item>
       <el-form-item label="循环范围开始" prop="planLoopStart">
         <el-date-picker
+          style="width: 250px"
           v-model="queryParams.loopStartArray"
           type="daterange"
           align="right"
@@ -286,6 +301,7 @@
       </el-form-item>
       <el-form-item label="循环范围结束" prop="planLoopEnd">
         <el-date-picker
+          style="width: 250px"
           v-model="queryParams.loopEndArray"
           type="daterange"
           align="right"
@@ -300,6 +316,7 @@
       </el-form-item>
       <el-form-item label="保养开始时间" prop="orderStart">
         <el-date-picker
+          style="width: 250px"
           v-model="queryParams.orderStartArray"
           type="daterange"
           align="right"
@@ -314,6 +331,7 @@
       </el-form-item>
       <el-form-item label="保养结束时间" prop="orderEnd">
         <el-date-picker
+          style="width: 250px"
           v-model="queryParams.orderEndArray"
           type="daterange"
           align="right"
@@ -326,19 +344,20 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="保养类型" prop="upkeep">
-        <el-select
-          v-model="queryParams.upkeep"
-          placeholder="请选择保养类型"
-          clearable
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          style="width: 250px"
+          v-model="queryParams.createTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
         >
-          <el-option
-            v-for="dict in dict.type.device_upkeep_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -1002,6 +1021,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        createTimeArray:[],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -1108,6 +1128,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        createTimeArray:[],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -1122,6 +1143,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.createTimeArray = [];
       this.queryParams.loopEndArray = null;
       this.queryParams.loopStartArray = null;
       this.queryParams.orderEndArray = null;
diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue
index d6ddb2f..03e5696 100644
--- a/src/views/device/spotCheckPlan/index.vue
+++ b/src/views/device/spotCheckPlan/index.vue
@@ -193,7 +193,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item v-if="false" label="创建时间" prop="createTime">
+      <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTimeArray"
           type="daterange"
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index 9a8bb79..357b624 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -286,6 +286,20 @@
         >
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item
         v-if="false"
         label-width="100px"
@@ -1035,6 +1049,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        createTimeArray:[],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -1142,6 +1157,7 @@ export default {
         updateBy: null,
         updateTime: null,
         equ: { equipmentName: null },
+        createTimeArray:[],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -1155,6 +1171,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.createTimeArray = [],
       this.queryParams.loopStartArray = [];
       this.queryParams.orderStartArray = [];
       this.queryParams.orderEndArray = [];
diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 028643a..e7226d6 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -277,6 +277,20 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -671,6 +685,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        createTimeArray:[],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -762,6 +777,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        createTimeArray:[],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -775,6 +791,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.createTimeArray = [];
       this.queryParams.loopStartArray = [];
       this.queryParams.orderStartArray = [];
       this.queryParams.orderEndArray = [];
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index d4eccce..02eced7 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -347,6 +347,20 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -1608,6 +1622,7 @@ export default {
         updateBy: null,
         updateTime: null,
         equ: { equipmentName: null },
+        createTimeArray:[],
         loopStartArray: [],
         orderStartArray: [],
         orderEndArray: [],
@@ -2118,6 +2133,7 @@ export default {
         updateBy: null,
         updateTime: null,
         equ: { equipmentName: null },
+        createTimeArray:[],
         timeArray: [],
         loopStartArray: [],
         orderStartArray: [],
@@ -2133,6 +2149,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.createTimeArray = [],
       this.queryParams.loopStartArray = [];
       this.queryParams.orderStartArray = [];
       this.queryParams.orderEndArray = [];
diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index aff4b39..dc9b40f 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -185,7 +185,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item v-if="false" label="创建时间" prop="createTime">
+      <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTimeArray"
           type="daterange"