diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index cfe7805f..dd8f6c12 100644
--- a/src/views/device/maintenanceWork/index.vue
+++ b/src/views/device/maintenanceWork/index.vue
@@ -9,6 +9,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="保养工单号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入保养工单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="检验状态" prop="orderInspect">
+        <el-select v-model="queryParams.orderInspect" placeholder="请选择保养类型" clearable>
+          <el-option
+            v-for="dict in dict.type.device_inspect_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="计划编码" prop="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -17,10 +35,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单号" prop="orderCode">
+      <el-form-item label="计划名称" prop="planName">
         <el-input
-          v-model="queryParams.orderCode"
-          placeholder="请输入工单号"
+          v-model="queryParams.planName"
+          placeholder="请输入计划名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -35,6 +53,22 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="设备编码" prop="equipmentCode">
+        <el-input
+          v-model="queryParams.equipmentCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="equipmentName">
+        <el-input
+          v-model="queryParams.equipmentName"
+          placeholder="请输入设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item v-if="false" label="产线" prop="planProdLine">
         <el-input
           v-model="queryParams.planProdLine"
@@ -43,7 +77,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="循环周期" prop="planLoop">
+      <el-form-item label="循环周期" prop="planLoopType">
         <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
           <el-option
             v-for="dict in dict.type.device_loop_type"
@@ -93,22 +127,6 @@
                         placeholder="请选择实际结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="设备编码" prop="equipmentCode">
-        <el-input
-          v-model="queryParams.equipmentCode"
-          placeholder="请输入设备编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentCode">
-        <el-input
-          v-model="queryParams.equipmentName"
-          placeholder="请输入设备名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item v-if="false" label="工单费用" prop="orderCost">
         <el-input
           v-model="queryParams.orderCost"
@@ -120,7 +138,7 @@
       <el-form-item label="保养人" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
-          placeholder="请输入点检人"
+          placeholder="请输入保养人"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -275,16 +293,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="检验状态" prop="orderInspect">
-        <el-select v-model="queryParams.orderInspect" placeholder="请选择保养类型" clearable>
-          <el-option
-            v-for="dict in dict.type.device_inspect_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </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>
@@ -342,9 +350,6 @@
       <!-- 序号 -->
       <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号" fixed/>
       <el-table-column v-if="false" label="计划id" align="center" prop="planId" />
-      <el-table-column width="150" label="计划编码" align="center" prop="planCode" />
-      <el-table-column width="150" label="计划名称" align="center" prop="planName" />
-      <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
       <el-table-column width="150" label="保养单号" align="center" prop="orderCode" fixed>
         <template slot-scope="scope">
           <el-button
@@ -354,8 +359,18 @@
           >
         </template>
       </el-table-column>
+      <el-table-column label="检验状态" align="center" prop="orderInspect">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.device_inspect_status" :value="scope.row.orderInspect"/>
+        </template>
+      </el-table-column>
+      <el-table-column width="150" label="计划编码" align="center" prop="planCode" />
+      <el-table-column width="150" label="计划名称" align="center" prop="planName" />
+      <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
       <el-table-column label="车间编码" align="center" prop="planWorkshop" />
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
+      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <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" >
@@ -373,18 +388,16 @@
           <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="保养开始时间" align="center" prop="orderStart">
+      <!-- <el-table-column width="120" label="保养开始时间" align="center" prop="orderStart">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column width="120" label="保养结束时间" align="center" prop="orderEnd">
+      </el-table-column> -->
+      <el-table-column width="150" label="保养时间" align="center" prop="orderEnd">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column width="80" label="保养类型" align="center" prop="upkeep" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
@@ -395,11 +408,6 @@
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="检验状态" align="center" prop="orderInspect">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_inspect_status" :value="scope.row.orderInspect"/>
-        </template>
-      </el-table-column>
       <el-table-column width="120" label="工单费用(元)" align="center" prop="orderCost"/>
       <el-table-column label="保养人" align="center" prop="planPerson"/>
       <el-table-column width="120" label="工单用时(min)" align="center" prop="orderCostTime"/>
@@ -460,8 +468,7 @@
           <el-descriptions title="" border :column="2" :contentStyle="CS" :label-style="LS">
             <el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
             <el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
-            <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
-            </el-descriptions-item>
+            <el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}</el-descriptions-item>
             <el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
             <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
             <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
@@ -708,6 +715,7 @@ export default {
         pageSize: 10,
         planId: null,
         planCode: null,
+        planName:null,
         planType: "maintenance",
         orderCode: null,
         planWorkshop: null,
@@ -848,7 +856,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.equipmentName = null;
+      this.queryParams.loopEndArray = null;
+      this.queryParams.loopStartArray = null;
+      this.queryParams.orderEndArray = null;
+      this.queryParams.orderStartArray = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },