diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue
index c2afe43..038ee01 100644
--- a/src/views/device/inspectionWork/index.vue
+++ b/src/views/device/inspectionWork/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item v-if="false" label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
@@ -9,6 +16,14 @@
           @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="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -17,16 +32,20 @@
           @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"
         />
       </el-form-item>
       <el-form-item label="车间编码" prop="planWorkshop">
-        <el-select v-model="queryParams.planWorkshop" placeholder="请选择车间" clearable>
+        <el-select
+          v-model="queryParams.planWorkshop"
+          placeholder="请选择车间"
+          clearable
+        >
           <el-option
             v-for="work in workCenterList"
             :key="work.factoryCode"
@@ -43,16 +62,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="循环周期" prop="planLoop">
-        <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
-          <el-option
-            v-for="dict in dict.type.device_loop_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item v-if="false" label="循环周期" prop="planLoop">
         <el-input
           v-model="queryParams.planLoop"
@@ -62,35 +71,43 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
-        <el-date-picker clearable
-                        v-model="queryParams.planLoopStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择循环执行时间开始">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间开始"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.planLoopEnd"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择循环执行时间结束">
+        <el-date-picker
+          clearable
+          v-model="queryParams.planLoopEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择循环执行时间结束"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="实际开始时间" prop="orderStart">
-        <el-date-picker clearable
-                        v-model="queryParams.orderStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择实际开始时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际开始时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="实际结束时间" prop="orderEnd">
-        <el-date-picker clearable
-                        v-model="queryParams.orderEnd"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择实际结束时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderEnd"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择实际结束时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="设备编码" prop="equipmentCode">
@@ -112,17 +129,19 @@
       <el-form-item label="巡检人" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
-          placeholder="请输入点检人"
+          placeholder="请输入巡检人"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="巡检时间" prop="orderStart">
-        <el-date-picker clearable
-                        v-model="queryParams.orderStart"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择点检时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.orderStart"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择点检时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="工单用时" prop="orderCostTime">
@@ -190,11 +209,13 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="创建时间" prop="createTime">
-        <el-date-picker clearable
-                        v-model="queryParams.createTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择创建时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.createTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择创建时间"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="更新人" prop="updateBy">
@@ -206,13 +227,29 @@
         />
       </el-form-item>
       <el-form-item v-if="false" label="更新时间" prop="updateTime">
-        <el-date-picker clearable
-                        v-model="queryParams.updateTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择更新时间">
+        <el-date-picker
+          clearable
+          v-model="queryParams.updateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择更新时间"
+        >
         </el-date-picker>
       </el-form-item>
+      <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"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="循环范围开始" prop="planLoopStart">
         <el-date-picker
           v-model="queryParams.loopStartArray"
@@ -223,7 +260,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="循环范围结束" prop="planLoopEnd">
@@ -236,7 +274,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="执行开始时间" prop="orderStart">
@@ -249,7 +288,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item v-if="false" label="执行结束时间" prop="orderEnd">
@@ -262,12 +302,21 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions">
+          :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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
@@ -280,7 +329,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['device:inspectionWork:add']"
-        >新增
+          >新增
         </el-button>
       </el-col>
       <el-col v-if="false" :span="1.5">
@@ -292,7 +341,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['device:inspectionWork:edit']"
-        >修改
+          >修改
         </el-button>
       </el-col>
       <el-col v-if="false" :span="1.5">
@@ -304,7 +353,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['device:inspectionWork:remove']"
-        >删除
+          >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -315,87 +364,247 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['device:inspectionWork:export']"
-        >导出
+          >导出
         </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="inspectionWorkList">
-      <el-table-column v-if="false" label="主键" align="center" prop="orderId" />
+      <el-table-column
+        v-if="false"
+        label="主键"
+        align="center"
+        prop="orderId"
+      />
       <!-- 序号 -->
-      <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>
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+        fixed
+      />
+      <el-table-column
+        width="150"
+        label="巡检工单号"
+        align="center"
+        prop="orderCode"
+        fixed
+      >
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="showWork(scope.row)"
-          >{{ scope.row.orderCode }}</el-button
-          >
+          <el-button type="text" @click="showWork(scope.row)">{{
+            scope.row.orderCode
+          }}</el-button>
         </template>
       </el-table-column>
+
+      <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="200"
+        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 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" >
+      <el-table-column
+        width="150"
+        label="车间"
+        align="center"
+        prop="workCenterName"
+      />
+      <el-table-column
+        width="100"
+        label="设备编码"
+        align="center"
+        prop="equipmentCode"
+      />
+      <el-table-column
+        width="120"
+        label="设备名称"
+        align="center"
+        prop="equipmentName"
+      />
+      <el-table-column
+        width="150"
+        label="巡检时间"
+        align="center"
+        prop="orderEnd"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
+          <span>{{
+            parseTime(scope.row.orderEnd, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="循环范围开始" align="center" prop="planLoopStart">
+      <el-table-column label="巡检人" align="center" prop="planPerson" />
+      <el-table-column
+        v-if="false"
+        label="产线"
+        align="center"
+        prop="planProdLine"
+      />
+      <el-table-column label="循环周期" align="center" prop="planLoopType" />
+      <el-table-column
+        width="120"
+        label="循环周期类型"
+        align="center"
+        prop="planLoopType"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
+          <dict-tag
+            :options="dict.type.device_loop_type"
+            :value="scope.row.planLoopType"
+          />
         </template>
       </el-table-column>
-      <el-table-column width="120" label="循环范围结束" align="center" prop="planLoopEnd">
+      <el-table-column
+        width="120"
+        label="循环范围开始"
+        align="center"
+        prop="planLoopStart"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planLoopStart, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" width="120" label="执行开始时间" align="center" prop="orderStart">
+      <el-table-column
+        width="120"
+        label="循环范围结束"
+        align="center"
+        prop="planLoopEnd"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.planLoopEnd, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" width="120" label="执行结束时间" align="center" prop="orderEnd">
+      <el-table-column
+        v-if="false"
+        width="120"
+        label="执行开始时间"
+        align="center"
+        prop="orderStart"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.orderStart, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
-      <el-table-column label="工单状态" align="center" prop="orderStatus" >
+      <el-table-column
+        v-if="false"
+        width="120"
+        label="执行结束时间"
+        align="center"
+        prop="orderEnd"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
+          <span>{{ parseTime(scope.row.orderEnd, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" label="工单费用" align="center" prop="orderCost" />
-      <el-table-column label="巡检人" align="center" prop="planPerson" />
-      <el-table-column v-if="false" label="工单用时" align="center" prop="orderCostTime" />
-      <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson" />
-      <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode" />
-      <el-table-column v-if="false" label="备用字段1" align="center" prop="attr1" />
-      <el-table-column v-if="false" label="备用字段2" align="center" prop="attr2" />
-      <el-table-column v-if="false" label="备用字段3" align="center" prop="attr3" />
-      <el-table-column v-if="false" label="删除标志" align="center" prop="delFlag" />
+      <el-table-column label="工单状态" align="center" prop="orderStatus">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.device_order_status"
+            :value="scope.row.orderStatus"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="false"
+        label="工单费用"
+        align="center"
+        prop="orderCost"
+      />
+      <el-table-column
+        v-if="false"
+        label="工单用时"
+        align="center"
+        prop="orderCostTime"
+      />
+      <el-table-column
+        v-if="false"
+        label="签字"
+        align="center"
+        prop="orderSignPerson"
+      />
+      <el-table-column
+        v-if="false"
+        label="工厂"
+        align="center"
+        prop="factoryCode"
+      />
+      <el-table-column
+        v-if="false"
+        label="备用字段1"
+        align="center"
+        prop="attr1"
+      />
+      <el-table-column
+        v-if="false"
+        label="备用字段2"
+        align="center"
+        prop="attr2"
+      />
+      <el-table-column
+        v-if="false"
+        label="备用字段3"
+        align="center"
+        prop="attr3"
+      />
+      <el-table-column
+        v-if="false"
+        label="删除标志"
+        align="center"
+        prop="delFlag"
+      />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updateTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="false" label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        v-if="false"
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -403,7 +612,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['device:inspectionWork:edit']"
-          >修改
+            >修改
           </el-button>
           <el-button
             size="mini"
@@ -411,119 +620,135 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['device:inspectionWork:remove']"
-          >删除
+            >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
 
-    <el-dialog
-      title="巡检详情"
-      :visible.sync="workDetail"
-      width="1000px"
-    >
+    <el-dialog title="巡检详情" :visible.sync="workDetail" width="1000px">
       <el-tabs type="border-card">
         <el-tab-pane label="巡检信息">
           <el-descriptions title="" border :column="2">
-            <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 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.orderCode }}</el-descriptions-item>
-            <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
-            <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
-            <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
-            <el-descriptions-item v-if="false" label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
-            <el-descriptions-item v-if="false" label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
-            <el-descriptions-item label="巡检人">{{ workVO.order.planPerson }}</el-descriptions-item>
-            <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</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>
+            <el-descriptions-item label="循环结束时间">{{
+              workVO.order.planLoopEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行开始时间">{{
+              workVO.order.orderStart
+            }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行结束时间">{{
+              workVO.order.orderEnd
+            }}</el-descriptions-item>
+            <el-descriptions-item label="巡检人">{{
+              workVO.order.planPerson
+            }}</el-descriptions-item>
+            <el-descriptions-item label="报修单号">{{
+              workVO.order.repairCode
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="设备信息">
           <el-descriptions class="my-margin-top" title="" :column="2" border>
-            <el-descriptions-item label="设备编码">{{ workVO.equ.equipmentCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备名称">{{ workVO.equ.equipmentName }}</el-descriptions-item>
-            <el-descriptions-item label="设备位置">{{ workVO.equ.equipmentLocation }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型编码">{{ workVO.equ.equipmentTypeCode }}</el-descriptions-item>
-            <el-descriptions-item label="设备类型名称">{{ workVO.equ.equipmentTypeName }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心编码">{{ workVO.equ.workshopCode }}</el-descriptions-item>
-            <el-descriptions-item label="所属工作中心名称">{{ workVO.equ.workshopName }}</el-descriptions-item>
+            <el-descriptions-item label="设备编码">{{
+              workVO.equ.equipmentCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备名称">{{
+              workVO.equ.equipmentName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备位置">{{
+              workVO.equ.equipmentLocation
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型编码">{{
+              workVO.equ.equipmentTypeCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="设备类型名称">{{
+              workVO.equ.equipmentTypeName
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心编码">{{
+              workVO.equ.workshopCode
+            }}</el-descriptions-item>
+            <el-descriptions-item label="所属工作中心名称">{{
+              workVO.equ.workshopName
+            }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
         <el-tab-pane label="检查项信息">
-            <el-table
-              :data="standardListVo"
-              border
-              style="width: 100%">
-              <el-table-column
-                prop="itemName"
-                label="检查项"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardName"
-                label="标准名称"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="standardTypeName"
-                label="标准类型"
-                width="80">
-              </el-table-column>
-              <el-table-column
-                prop="detailReach"
-                label="是否达标">
-              </el-table-column>
-              <el-table-column
-                prop="actualValue"
-                label="实际值">
-              </el-table-column>
-              <el-table-column
-                prop="detailUpLimit"
-                label="上限">
-              </el-table-column>
-              <el-table-column
-                prop="detailDownLimit"
-                label="下限">
-              </el-table-column>
-              <el-table-column
-                prop="detailUnit"
-                label="单位">
-              </el-table-column>
-              <el-table-column
-                prop="picturePath"
-                label="图片">
-                <template slot-scope="scope">
-                  <el-popover
-                    placement="right"
-                    width="300"
-                    trigger="hover">
-                    <div class="demo-image__lazy">
-                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
-                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
-                        <el-image
-                          :src="url"
-                        ></el-image>
-                      </div>
+          <el-table :data="standardListVo" border style="width: 100%">
+            <el-table-column prop="itemName" label="检查项" width="180">
+            </el-table-column>
+            <el-table-column prop="standardName" label="标准名称" width="180">
+            </el-table-column>
+            <el-table-column
+              prop="standardTypeName"
+              label="标准类型"
+              width="80"
+            >
+            </el-table-column>
+            <el-table-column prop="detailReach" label="是否达标">
+            </el-table-column>
+            <el-table-column prop="actualValue" label="实际值">
+            </el-table-column>
+            <el-table-column prop="detailUpLimit" label="上限">
+            </el-table-column>
+            <el-table-column prop="detailDownLimit" label="下限">
+            </el-table-column>
+            <el-table-column prop="detailUnit" label="单位"> </el-table-column>
+            <el-table-column prop="picturePath" label="图片">
+              <template slot-scope="scope">
+                <el-popover placement="right" width="300" trigger="hover">
+                  <div class="demo-image__lazy">
+                    <el-empty
+                      :image-size="200"
+                      v-if="scope.row.checkPictrueList.length == 0"
+                    ></el-empty>
+                    <div
+                      v-for="(url, index) in scope.row.checkPictrueList"
+                      :key="index"
+                    >
+                      <el-image :src="url"></el-image>
                     </div>
-                    <el-button slot="reference" type="primary" icon="el-icon-picture" circle></el-button>
-                  </el-popover>
-                </template>
-              </el-table-column>
-            </el-table>
+                  </div>
+                  <el-button
+                    slot="reference"
+                    type="primary"
+                    icon="el-icon-picture"
+                    circle
+                  ></el-button>
+                </el-popover>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="workDetail = false">关 闭</el-button>
-  </span>
+        <el-button @click="workDetail = false">关 闭</el-button>
+      </span>
     </el-dialog>
 
     <!-- 添加或修改巡检记录对话框 -->
@@ -542,46 +767,50 @@ import {
   getInspectionWork,
   delInspectionWork,
   addInspectionWork,
-  updateInspectionWork
+  updateInspectionWork,
 } from "@/api/device/inspectionWork";
-import {listDeviceOrder} from "@/api/device/deviceOrder";
-import {getWorkCenter} from "@/api/device/plan";
+import { listDeviceOrder } from "@/api/device/deviceOrder";
+import { getWorkCenter } from "@/api/device/plan";
 
 export default {
   name: "InspectionWork",
-  dicts: ['device_order_status', 'device_loop_type'],
+  dicts: ["device_order_status", "device_loop_type"],
   data() {
     return {
-      standardListVo:[],
+      standardListVo: [],
       workCenterList: [],
       test: false,
       // 日期范围选择快捷
       pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
       // 初始化VO
       workVO: {
@@ -597,7 +826,8 @@ export default {
           orderStart: null,
           orderEnd: null,
           planPerson: null,
-        }, equ: {
+        },
+        equ: {
           equipmentCode: null,
           equipmentName: null,
           equipmentLocation: null,
@@ -605,7 +835,8 @@ export default {
           equipmentTypeName: null,
           workshopCode: null,
           workshopName: null,
-        }, detailList: []
+        },
+        detailList: [],
       },
       // 工单详情弹窗
       workDetail: false,
@@ -633,6 +864,7 @@ export default {
         pageSize: 10,
         planId: null,
         planCode: null,
+        planName: null,
         planType: "inspection",
         orderCode: null,
         planWorkshop: null,
@@ -644,7 +876,7 @@ export default {
         orderStart: null,
         orderEnd: null,
         equipmentCode: null,
-        orderStatus: '1',
+        orderStatus: "1",
         orderCost: null,
         planPerson: null,
         orderCostTime: null,
@@ -666,7 +898,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {},
     };
   },
   created() {
@@ -680,20 +912,20 @@ export default {
     },
     // 获取工作中心
     setWorkCenter() {
-      getWorkCenter().then(response => {
+      getWorkCenter().then((response) => {
         this.workCenterList = response.data;
-      })
+      });
     },
     // 展示
     showWork(row) {
       this.loading = true;
       this.reset();
       this.standardListVo = [];
-      const orderId = row.orderId || this.ids
-      getInspectionWork(orderId).then(response => {
+      const orderId = row.orderId || this.ids;
+      getInspectionWork(orderId).then((response) => {
         this.workVO = response.data;
         for (let i = 0; i < this.workVO.detailList.length; i++) {
-          for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) {
+          for (let j = 0;j < this.workVO.detailList[i].standardList.length;j++) {
             this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName;
             this.standardListVo.push(this.workVO.detailList[i].standardList[j]);
           }
@@ -701,12 +933,11 @@ export default {
         this.loading = false;
         this.workDetail = true;
       });
-
     },
     /** 查询巡检记录列表 */
     getList() {
       this.loading = true;
-      listDeviceOrder(this.queryParams).then(response => {
+      listDeviceOrder(this.queryParams).then((response) => {
         this.inspectionWorkList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -734,7 +965,7 @@ export default {
         orderStart: null,
         orderEnd: null,
         equipmentCode: null,
-        orderStatus: '1',
+        orderStatus: "1",
         orderCost: null,
         planPerson: null,
         orderCostTime: null,
@@ -771,9 +1002,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.orderId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.orderId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -784,8 +1015,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const orderId = row.orderId || this.ids
-      getInspectionWork(orderId).then(response => {
+      const orderId = row.orderId || this.ids;
+      getInspectionWork(orderId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改巡检记录";
@@ -793,16 +1024,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.orderId != null) {
-            updateInspectionWork(this.form).then(response => {
+            updateInspectionWork(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addInspectionWork(this.form).then(response => {
+            addInspectionWork(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -814,25 +1045,32 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const orderIds = row.orderId || this.ids;
-      this.$modal.confirm('是否确认删除巡检记录编号为"' + orderIds + '"的数据项？').then(function () {
-        return delInspectionWork(orderIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      });
+      this.$modal
+        .confirm('是否确认删除巡检记录编号为"' + orderIds + '"的数据项？')
+        .then(function () {
+          return delInspectionWork(orderIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('device/inspectionWork/export', {
-        ...this.queryParams
-      }, `inspectionWork_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "device/inspectionWork/export",
+        {
+          ...this.queryParams,
+        },
+        `inspectionWork_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
 <style>
-.demo-image__lazy{
+.demo-image__lazy {
   height: 400px;
   overflow-y: auto;
 }
diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index cfe7805..dd8f6c1 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();
     },
diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 7d59fbf..a49d059 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -9,6 +9,14 @@
           @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="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -17,10 +25,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"
         />
@@ -43,16 +51,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="循环周期" prop="planLoop">
-        <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
-          <el-option
-            v-for="dict in dict.type.device_loop_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item v-if="false" label="循环周期" prop="planLoop">
         <el-input
           v-model="queryParams.planLoop"
@@ -101,7 +100,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentCode">
+      <el-form-item label="设备名称" prop="equipmentName">
         <el-input
           v-model="queryParams.equipmentName"
           placeholder="请输入设备名称"
@@ -220,6 +219,16 @@
                         value-format="yyyy-MM-dd"
                         placeholder="请选择更新时间">
         </el-date-picker>
+      </el-form-item>
+            <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"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="循环开始时间" prop="planLoopStart">
         <el-date-picker
@@ -318,7 +327,7 @@
       <el-table-column v-if="false" label="主键" align="center" prop="orderId" />
       <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 width="200" 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">
@@ -331,7 +340,10 @@
       </el-table-column>
       <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 width="150" label="点检时间" align="center" prop="orderStart"/>
+      <el-table-column label="点检人" align="center" prop="planPerson" />
       <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" >
@@ -359,15 +371,12 @@
           <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</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 label="工单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
         </template>
       </el-table-column>
       <el-table-column v-if="false" label="工单费用" align="center" prop="orderCost" />
-      <el-table-column label="点检人" align="center" prop="planPerson" />
       <el-table-column v-if="false" label="工单用时" align="center" prop="orderCostTime" />
       <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson" />
       <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode" />
@@ -624,6 +633,7 @@ export default {
         pageSize: 10,
         planId: null,
         planCode: null,
+        planName: null,
         planType: "spotInspection",
         orderCode: null,
         planWorkshop: null,