diff --git a/src/api/device/plan.js b/src/api/device/plan.js
index 59382c7..bf34205 100644
--- a/src/api/device/plan.js
+++ b/src/api/device/plan.js
@@ -1,5 +1,23 @@
 import request from '@/utils/request'
 
+// 处理计划-设备信息
+export function formatEquItem(data) {
+  return request({
+    url: '/device/plan/formatEquItem',
+    method: 'post',
+    data: data
+  });
+}
+
+// 获取设备信息list
+export function getEquList(equQuery) {
+  return request({
+    url: '/device/plan/getEquList',
+    method: 'get',
+    params: equQuery
+  });
+}
+
 // 查询计划列表
 export function listPlan(query) {
 	return request({
diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue
index 78637b4..c470ee3 100644
--- a/src/views/device/inspectionPlan/index.vue
+++ b/src/views/device/inspectionPlan/index.vue
@@ -1,159 +1,159 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			<el-form-item label="计划编码" prop="planCode">
-				<el-input
-					v-model="queryParams.planCode"
-					placeholder="请输入计划编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="计划名称" prop="planName">
-				<el-input
-					v-model="queryParams.planName"
-					placeholder="请输入计划名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="车间" prop="planWorkshop">
-				<el-input
-					v-model="queryParams.planWorkshop"
-					placeholder="请输入车间"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="产线" prop="planProdLine">
-				<el-input
-					v-model="queryParams.planProdLine"
-					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 label="设备编码" prop="equipmentCode">
-				<el-input
-					v-model="queryParams.equipmentCode"
-					placeholder="请输入设备编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="循环周期" prop="planLoop">
-				<el-input
-					v-model="queryParams.planLoop"
-					placeholder="请输入循环周期"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</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>
-			</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>
-			</el-form-item>
-			<el-form-item label="巡检人员" prop="planPerson">
-				<el-input
-					v-model="queryParams.planPerson"
-					placeholder="请输入巡检人员"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item  v-if="false" label="是否可生产-限制" prop="planRestrict">
-				<el-input
-					v-model="queryParams.planRestrict"
-					placeholder="请输入是否可生产-限制"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item  v-if="false" label="是否委外" prop="planOutsource">
-				<el-input
-					v-model="queryParams.planOutsource"
-					placeholder="请输入是否委外"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item  v-if="false" label="委外工单编码" prop="workCode">
-				<el-input
-					v-model="queryParams.workCode"
-					placeholder="请输入委外工单编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="工厂" prop="factoryCode">
-				<el-input
-					v-model="queryParams.factoryCode"
-					placeholder="请输入工厂"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="备用字段1" prop="attr1">
-				<el-input
-					v-model="queryParams.attr1"
-					placeholder="请输入备用字段1"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="备用字段2" prop="attr2">
-				<el-input
-					v-model="queryParams.attr2"
-					placeholder="请输入备用字段2"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="备用字段3" prop="attr3">
-				<el-input
-					v-model="queryParams.attr3"
-					placeholder="请输入备用字段3"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item v-if="false" label="删除标志" prop="delFlag">
-				<el-input
-					v-model="queryParams.delFlag"
-					placeholder="请输入删除标志"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="创建人" prop="createBy">
-				<el-input
-					v-model="queryParams.createBy"
-					placeholder="请输入创建人"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="创建时间" prop="createTime">
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="计划编码" prop="planCode">
+        <el-input
+          v-model="queryParams.planCode"
+          placeholder="请输入计划编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划名称" prop="planName">
+        <el-input
+          v-model="queryParams.planName"
+          placeholder="请输入计划名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车间" prop="planWorkshop">
+        <el-input
+          v-model="queryParams.planWorkshop"
+          placeholder="请输入车间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产线" prop="planProdLine">
+        <el-input
+          v-model="queryParams.planProdLine"
+          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 label="设备编码" prop="equipmentCode">
+        <el-input
+          v-model="queryParams.equipmentCode"
+          placeholder="请输入设备编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="循环周期" prop="planLoop">
+        <el-input
+          v-model="queryParams.planLoop"
+          placeholder="请输入循环周期"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </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>
+      </el-form-item>
+      <el-form-item label="巡检人员" prop="planPerson">
+        <el-input
+          v-model="queryParams.planPerson"
+          placeholder="请输入巡检人员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="是否可生产-限制" prop="planRestrict">
+        <el-input
+          v-model="queryParams.planRestrict"
+          placeholder="请输入是否可生产-限制"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="是否委外" prop="planOutsource">
+        <el-input
+          v-model="queryParams.planOutsource"
+          placeholder="请输入是否委外"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="委外工单编码" prop="workCode">
+        <el-input
+          v-model="queryParams.workCode"
+          placeholder="请输入委外工单编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="工厂" prop="factoryCode">
+        <el-input
+          v-model="queryParams.factoryCode"
+          placeholder="请输入工厂"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="备用字段1" prop="attr1">
+        <el-input
+          v-model="queryParams.attr1"
+          placeholder="请输入备用字段1"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="备用字段2" prop="attr2">
+        <el-input
+          v-model="queryParams.attr2"
+          placeholder="请输入备用字段2"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="备用字段3" prop="attr3">
+        <el-input
+          v-model="queryParams.attr3"
+          placeholder="请输入备用字段3"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item v-if="false" label="删除标志" prop="delFlag">
+        <el-input
+          v-model="queryParams.delFlag"
+          placeholder="请输入删除标志"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+        <el-input
+          v-model="queryParams.createBy"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTimeArray"
           type="daterange"
@@ -165,16 +165,16 @@
           value-format="yyyy-MM-dd"
           :picker-options="pickerOptions">
         </el-date-picker>
-			</el-form-item>
-			<el-form-item label="更新人" prop="updateBy">
-				<el-input
-					v-model="queryParams.updateBy"
-					placeholder="请输入更新人"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
-			<el-form-item label="更新时间" prop="updateTime">
+      </el-form-item>
+      <el-form-item label="更新人" prop="updateBy">
+        <el-input
+          v-model="queryParams.updateBy"
+          placeholder="请输入更新人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
         <el-date-picker
           v-model="queryParams.updateTimeArray"
           type="daterange"
@@ -186,215 +186,375 @@
           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>
-			</el-form-item>
-		</el-form>
+      </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-form-item>
+    </el-form>
 
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['device:inspectionPlan:add']"
-				>新增</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="success"
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['device:inspectionPlan:edit']"
-				>修改</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['device:inspectionPlan:remove']"
-				>删除</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['device:inspectionPlan:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['device:inspectionPlan:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['device:inspectionPlan:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['device:inspectionPlan:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['device:inspectionPlan:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-		<el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column v-if="false" label="主键" align="center" prop="planId" />
+    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column v-if="false" label="主键" align="center" prop="planId"/>
       <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
-			<el-table-column label="计划编码" align="center" prop="planCode" />
-			<el-table-column label="计划名称" align="center" prop="planName" />
-			<el-table-column label="车间" align="center" prop="planWorkshop" />
-			<el-table-column label="产线" align="center" prop="planProdLine" />
-			<el-table-column label="设备名称" align="center" prop="equipmentName" />
-			<el-table-column label="设备编码" align="center" prop="equipmentCode" />
-			<el-table-column label="循环周期" align="center" prop="planLoop" />
-			<el-table-column label="循环周期类型" align="center" prop="planLoopType" />
-			<el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="循环执行时间结束" align="center" prop="planLoopEnd" width="180">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column label="巡检人员" align="center" prop="planPerson" />
-			<el-table-column label="计划状态" align="center" prop="planStatus" />
-			<el-table-column v-if="false" label="是否可生产-限制" align="center" prop="planRestrict" />
-			<el-table-column v-if="false" label="维护类型" align="center" prop="planType" />
-			<el-table-column v-if="false" label="是否委外" align="center" prop="planOutsource" />
-			<el-table-column v-if="false" label="委外工单编码" align="center" prop="workCode" />
-			<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">
-				<template slot-scope="scope">
-					<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">
-				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column width="180" label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['device:inspectionPlan:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['device:inspectionPlan:remove']"
-					>删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+      <el-table-column label="计划编码" align="center" prop="planCode"/>
+      <el-table-column label="计划名称" align="center" prop="planName"/>
+      <el-table-column label="车间" align="center" prop="planWorkshop"/>
+      <el-table-column label="产线" align="center" prop="planProdLine"/>
+      <el-table-column label="设备名称" align="center" prop="equipmentName"/>
+      <el-table-column label="设备编码" align="center" prop="equipmentCode"/>
+      <el-table-column label="循环周期" align="center" prop="planLoop"/>
+      <el-table-column label="循环周期类型" align="center" prop="planLoopType"/>
+      <el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="循环执行时间结束" align="center" prop="planLoopEnd" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡检人员" align="center" prop="planPerson"/>
+      <el-table-column label="计划状态" align="center" prop="planStatus"/>
+      <el-table-column v-if="false" label="是否可生产-限制" align="center" prop="planRestrict"/>
+      <el-table-column v-if="false" label="维护类型" align="center" prop="planType"/>
+      <el-table-column v-if="false" label="是否委外" align="center" prop="planOutsource"/>
+      <el-table-column v-if="false" label="委外工单编码" align="center" prop="workCode"/>
+      <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">
+        <template slot-scope="scope">
+          <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">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="180" label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['device:inspectionPlan:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['device:inspectionPlan:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改计划对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <div class="my-step-mar">
+          <el-steps :active="inspectionPlanStep" finish-status="success" align-center>
+            <el-step title="巡检计划基本信息"></el-step>
+            <el-step title="选择设备、巡检项目"></el-step>
+          </el-steps>
+          <!-- 巡检计划基本信息 -->
+          <div class="my-step-body" v-if="this.inspectionPlanStep==0">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="计划名称" prop="faultCode">
+                  <el-input v-model="form.planName" placeholder="请输入计划名称"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span=12 :offset="1">
+                <el-form-item label-width="100px" label="巡检执行时间" prop="faultCode">
+                  <el-date-picker
+                    v-model="form.planTimeArray"
+                    type="datetimerange"
+                    range-separator="至"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="循环周期" prop="faultCode">
+                  <el-input v-model="form.planName" placeholder="请输入循环周期"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-select v-model="form.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-col>
+              <el-col :span="6" :offset="1">
+                <el-form-item label-width="100px" label="计划状态" prop="faultCode">
+                  <el-select v-model="form.planStatus" placeholder="计划状态" clearable>
+                    <el-option
+                      v-for="dict in dict.type.sys_normal_disable"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="巡检人员" prop="faultCode">
+                  <el-select v-model="form.planPerson" placeholder="请选择巡检人员" clearable>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <!-- 选择设备、巡检项目 -->
+          <div class="my-step-body" v-if="this.inspectionPlanStep==1">
+            <el-row>
+              <el-col class="my-step-mar" :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="selectEqu = true">
+                  选择设备
+                </el-button>
+              </el-col>
+            </el-row>
+            <el-table
+              :data="form.equipmentItem"
+              stripe
+              style="width: 100%">
+              <el-table-column type="selection" width="55" align="center"/>
+              <el-table-column
+                prop="equipmentCode"
+                label="设备编码"
+                width="180">
+              </el-table-column>
+              <el-table-column
+                prop="equipmentName"
+                label="设备名称"
+                width="180">
+              </el-table-column>
+              <el-table-column
+                prop="InspectionItem"
+                label="巡检项"
+                width="300">
+              </el-table-column>
+              <el-table-column
+                fixed="right"
+                label="操作"
+              >
+                <template slot-scope="scope">
+                  <el-button @click="editorItem = true" type="text" size="small">编辑</el-button>
+                  <el-button type="text" size="small">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <!-- 编辑检查项弹窗 -->
+            <el-dialog
+              title="编辑检查项"
+              :visible.sync="editorItem"
+              width="50%"
+              append-to-body
+              >
+              <span>这是一段信息</span>
+              <span slot="footer" class="dialog-footer">
+                <el-button @click="editorItem = false">取 消</el-button>
+                <el-button type="primary" @click="editorItem = false">确 定</el-button>
+              </span>
+            </el-dialog>
+            <!-- 选择设备弹窗 -->
+            <el-dialog
+              title="选择设备"
+              :visible.sync="selectEqu"
+              width="50%"
+              append-to-body
+            >
+              <el-form :model="equipmentQuery" ref="queryBPForm" size="small" :inline="true" v-show="showSearch"
+                       label-width="68px">
+                <el-form-item label="设备编码">
+                  <el-input
+                    v-model="equipmentQuery.equipmentCode"
+                    placeholder="请输入设备编码"
+                    clearable
+                  />
+                </el-form-item>
+                <el-form-item label="设备名称">
+                  <el-input
+                    v-model="equipmentQuery.equipmentName"
+                    placeholder="请输入设备名称"
+                    clearable
+                  />
+                </el-form-item>
+                <el-form-item v-if="false" label="设备类型">
+                  <el-input
+                    v-model="equipmentQuery.equipmentName"
+                    placeholder="请输入设备类型"
+                    clearable
+                  />
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="primary" icon="el-icon-search" size="mini" @click="getEquList">搜索</el-button>
+                  <el-button icon="el-icon-refresh" size="mini" @click="resetEqu">重置</el-button>
+                </el-form-item>
+              </el-form>
+              <!-- 搜索-设备列表 -->
+              <el-table
+                :data="queryEquipment"
+                v-loading="equLoading"
+                stripe
+                @selection-change="selectChangeEqu"
+                style="width: 100%">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column
+                  prop="equipmentCode"
+                  label="设备编码">
+                </el-table-column>
+                <el-table-column
+                  prop="equipmentName"
+                  label="设备名称">
+                </el-table-column>
+                <el-table-column
+                  prop="equipmentTypeName"
+                  label="设备类型">
+                </el-table-column>
+              </el-table>
 
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
+              <pagination
+                v-show="equTotal>0"
+                :total="equTotal"
+                :page.sync="equipmentQuery.pageNum"
+                :limit.sync="equipmentQuery.pageSize"
+                @pagination="getEquList"
+              />
 
-		<!-- 添加或修改计划对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="计划编码" prop="planCode">
-					<el-input v-model="form.planCode" placeholder="请输入计划编码" />
-				</el-form-item>
-				<el-form-item label="计划名称" prop="planName">
-					<el-input v-model="form.planName" placeholder="请输入计划名称" />
-				</el-form-item>
-				<el-form-item label="车间" prop="planWorkshop">
-					<el-input v-model="form.planWorkshop" placeholder="请输入车间" />
-				</el-form-item>
-				<el-form-item label="产线" prop="planProdLine">
-					<el-input v-model="form.planProdLine" placeholder="请输入产线" />
-				</el-form-item>
-				<el-form-item label="设备名称" prop="equipmentName">
-					<el-input v-model="form.equipmentName" placeholder="请输入设备名称" />
-				</el-form-item>
-				<el-form-item label="设备编码" prop="equipmentCode">
-					<el-input v-model="form.equipmentCode" placeholder="请输入设备编码" />
-				</el-form-item>
-				<el-form-item label="循环周期" prop="planLoop">
-					<el-input v-model="form.planLoop" placeholder="请输入循环周期" />
-				</el-form-item>
-				<el-form-item label="循环执行时间开始" prop="planLoopStart">
-					<el-date-picker clearable
-						v-model="form.planLoopStart"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择循环执行时间开始">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="循环执行时间结束" prop="planLoopEnd">
-					<el-date-picker clearable
-						v-model="form.planLoopEnd"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择循环执行时间结束">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="巡检人员" prop="planPerson">
-					<el-input v-model="form.planPerson" placeholder="请输入巡检人员" />
-				</el-form-item>
-				<el-form-item label="是否可生产-限制" prop="planRestrict">
-					<el-input v-model="form.planRestrict" placeholder="请输入是否可生产-限制" />
-				</el-form-item>
-				<el-form-item label="是否委外" prop="planOutsource">
-					<el-input v-model="form.planOutsource" placeholder="请输入是否委外" />
-				</el-form-item>
-				<el-form-item label="委外工单编码" prop="workCode">
-					<el-input v-model="form.workCode" placeholder="请输入委外工单编码" />
-				</el-form-item>
-				<el-form-item label="工厂" prop="factoryCode">
-					<el-input v-model="form.factoryCode" placeholder="请输入工厂" />
-				</el-form-item>
-				<el-form-item label="备用字段1" prop="attr1">
-					<el-input v-model="form.attr1" placeholder="请输入备用字段1" />
-				</el-form-item>
-				<el-form-item label="备用字段2" prop="attr2">
-					<el-input v-model="form.attr2" placeholder="请输入备用字段2" />
-				</el-form-item>
-				<el-form-item label="备用字段3" prop="attr3">
-					<el-input v-model="form.attr3" placeholder="请输入备用字段3" />
-				</el-form-item>
-				<el-form-item label="删除标志" prop="delFlag">
-					<el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
-	</div>
+              <span slot="footer" class="dialog-footer">
+                <el-button @click="selectEqu = false">取 消</el-button>
+                <el-button type="primary" @click="confirmSelectEquBtn">确 定</el-button>
+              </span>
+            </el-dialog>
+          </div>
+          <!-- 高级设置-弃用 -->
+          <div class="my-step-body" v-if="this.inspectionPlanStep==2">
+
+          </div>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button v-if="this.inspectionPlanStep>0" @click="stepLast">上一步</el-button>
+        <el-button v-if="this.inspectionPlanStep<1" @click="stepNext">下一步</el-button>
+        <el-button v-if="this.inspectionPlanStep==1" type="primary" @click="submitForm">提 交</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/device/plan";
+import {listPlan, getPlan, delPlan, addPlan, updatePlan, getEquList, formatEquItem} from "@/api/device/plan";
 
 export default {
-	name: "Plan",
-	data() {
-		return {
+  name: "Plan",
+  dicts: ['device_loop_type', 'sys_normal_disable'],
+  data() {
+    return {
+      // 选中的设备信息
+      selectEquList: [],
+      // 设备信息loading
+      equLoading: false,
+      // 搜索到的设备总数
+      equTotal: 0,
+      // 搜索到的设备list
+      queryEquipment: [],
+      // 设备弹窗搜索条件
+      equipmentQuery: {
+        equipmentCode: null,
+        equipmentName: null,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 选择设备弹窗
+      selectEqu: false,
+      // 编辑检查项弹窗
+      editorItem: false,
+      // 巡检计划步骤
+      inspectionPlanStep: 0,
       // 日期范围选择快捷
       pickerOptions: {
         shortcuts: [{
@@ -423,186 +583,265 @@ export default {
           }
         }]
       },
-			// 遮罩层
-			loading: true,
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 计划表格数据
-			planList: [],
-			// 弹出层标题
-			title: "",
-			// 是否显示弹出层
-			open: false,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				planCode: null,
-				planName: null,
-				planWorkshop: null,
-				planProdLine: null,
-				equipmentName: null,
-				equipmentCode: null,
-				planLoop: null,
-				planLoopType: null,
-				planLoopStart: null,
-				planLoopEnd: null,
-				planPerson: null,
-				planStatus: null,
-				planRestrict: null,
-				planType: null,
-				planOutsource: null,
-				workCode: null,
-				factoryCode: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				delFlag: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 计划表格数据
+      planList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        planCode: null,
+        planName: null,
+        planWorkshop: null,
+        planProdLine: null,
+        equipmentName: null,
+        equipmentCode: null,
+        planLoop: null,
+        planLoopType: null,
+        planLoopStart: null,
+        planLoopEnd: null,
+        planPerson: null,
+        planStatus: null,
+        planRestrict: null,
+        planType: null,
+        planOutsource: null,
+        workCode: null,
+        factoryCode: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
         createTimeArray: [],
         updateTimeArray: [],
-			},
-			// 表单参数
-			form: {},
-			// 表单校验
-			rules: {
-			}
-		};
-	},
-	created() {
-		this.getList();
-	},
-	methods: {
-		/** 查询计划列表 */
-		getList() {
-			this.loading = true;
-			listPlan(this.queryParams).then(response => {
-				this.planList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				planId: null,
-				planCode: null,
-				planName: null,
-				planWorkshop: null,
-				planProdLine: null,
-				equipmentName: null,
-				equipmentCode: null,
-				planLoop: null,
-				planLoopType: null,
-				planLoopStart: null,
-				planLoopEnd: null,
-				planPerson: null,
-				planStatus: null,
-				planRestrict: null,
-				planType: null,
-				planOutsource: null,
-				workCode: null,
-				factoryCode: null,
-				attr1: null,
-				attr2: null,
-				attr3: null,
-				delFlag: null,
-				createBy: null,
-				createTime: null,
-				updateBy: null,
-				updateTime: null,
+      },
+      // 表单参数
+      form: {
+        planLoopType: 'day',
+        planName: null,
+        planStatus: '0',
+        planPerson: null,
+        planTimeArray: [],
+        equipmentItem: [{equipmentCode: 123, itemList: [{itemCode: 111, itemDetail: [{detailCode: 222}]}]}],
+      },
+      // 表单校验
+      rules: {}
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 选择设备确认按钮
+    confirmSelectEquBtn() {
+      // 查询是否已经选择过
+      for (let i = 0; i < this.form.equipmentItem.length; i++) {
+        for (let j = 0; j < this.selectEquList.length; j++) {
+          if (this.form.equipmentItem[i].equipmentCode == this.selectEquList[j].equipmentCode) {
+            this.$message({
+              message: "存在已选择的设备！",
+              type: "warning"
+            })
+            return
+          }
+        }
+      }
+
+      // 处理信息
+      formatEquItem(this.selectEquList).then(response => {
+        console.log("开始格式化设备信息")
+        console.log(response)
+      })
+
+    },
+    // 选择设备多选操作
+    selectChangeEqu(e) {
+      console.log("这里！！！！！")
+      console.log(e)
+      this.selectEquList = e;
+    },
+    // 获取设备信息
+    getEquList() {
+      this.equLoading = true;
+      getEquList(this.equipmentQuery).then(response => {
+        this.equTotal = response.total;
+        this.queryEquipment = response.rows;
+        this.equLoading = false;
+      })
+    },
+    // 重置设备搜索
+    resetEqu() {
+      this.equipmentQuery = {
+        equipmentCode: null,
+        equipmentName: null,
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.getEquList();
+    },
+    // 步骤上一步
+    stepLast() {
+      this.inspectionPlanStep--;
+    },
+    // 步骤-下一步
+    stepNext() {
+      this.getEquList()
+      this.inspectionPlanStep++;
+
+    },
+    /** 查询计划列表 */
+    getList() {
+      this.loading = true;
+      listPlan(this.queryParams).then(response => {
+        this.planList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        planId: null,
+        planCode: null,
+        planName: null,
+        planWorkshop: null,
+        planProdLine: null,
+        equipmentName: null,
+        equipmentCode: null,
+        planLoop: null,
+        planLoopType: 'day',
+        planLoopStart: null,
+        planLoopEnd: null,
+        planPerson: null,
+        planStatus: '0',
+        planRestrict: null,
+        planType: null,
+        planOutsource: null,
+        workCode: null,
+        factoryCode: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
         createTimeArray: [],
         updateTimeArray: [],
-			};
-			this.resetForm("form");
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.resetForm("queryForm");
+        planTimeArray: [],
+        equipmentItem: [{equipmentCode: 123, itemList: [{itemCode: 111, itemDetail: [{detailCode: 222}]}]}],
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
       // 重置日期范围
       this.queryParams.createTimeArray = [];
       this.queryParams.updateTimeArray = [];
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map(item => item.planId)
-			this.single = selection.length!==1
-			this.multiple = !selection.length
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加计划";
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const planId = row.planId || this.ids
-			getPlan(planId).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改计划";
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.planId != null) {
-						updatePlan(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addPlan(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const planIds = row.planId || this.ids;
-			this.$modal.confirm('是否确认删除计划编号为"' + planIds + '"的数据项？').then(function() {
-				return delPlan(planIds);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('device/inspectionPlan/export', {
-				...this.queryParams
-			}, `plan_${new Date().getTime()}.xlsx`)
-		}
-	}
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.planId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      // 清除缓存
+      this.resetQuery();
+      this.queryEquipment=[];
+      this.open = true;
+      this.title = "添加计划";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const planId = row.planId || this.ids
+      getPlan(planId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改计划";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.planId != null) {
+            updatePlan(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPlan(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const planIds = row.planId || this.ids;
+      this.$modal.confirm('是否确认删除计划编号为"' + planIds + '"的数据项？').then(function () {
+        return delPlan(planIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('device/inspectionPlan/export', {
+        ...this.queryParams
+      }, `plan_${new Date().getTime()}.xlsx`)
+    }
+  }
 };
 </script>
+<style>
+.my-step-mar {
+  margin-left: 10px;
+  margin-right: 10px;
+}
+
+.my-step-body {
+  margin-top: 15px;
+}
+</style>