diff --git a/src/api/device/faultReport.js b/src/api/device/faultReport.js
index cf42c1c..e183880 100644
--- a/src/api/device/faultReport.js
+++ b/src/api/device/faultReport.js
@@ -29,7 +29,7 @@ export function addFaultReport(data) {
 // 修改故障报修
 export function updateFaultReport(data) {
 	return request({
-		url: '/device/faultReport',
+		url: '/device/faultReport/edit',
 		method: 'put',
 		data: data
 	});
@@ -60,3 +60,11 @@ export function getEquipmentTypeList() {
   });
 }
 
+// 审核维修工单
+export function checkFaultReport(data) {
+  return request({
+    url: '/device/faultReport/check',
+    method: 'put',
+    data: data
+  });
+}
diff --git a/src/api/device/repairOrder.js b/src/api/device/repairOrder.js
new file mode 100644
index 0000000..98d5f41
--- /dev/null
+++ b/src/api/device/repairOrder.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+// 查询维修工单列表
+export function listRepairOrder(query) {
+	return request({
+		url: '/device/repairOrder/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询维修工单详细
+export function getRepairOrder(workId) {
+	return request({
+		url: '/device/repairOrder/' + workId,
+		method: 'get'
+		});
+}
+
+// 新增维修工单
+export function addRepairOrder(data) {
+	return request({
+		url: '/device/repairOrder',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改维修工单
+export function updateRepairOrder(data) {
+	return request({
+		url: '/device/repairOrder',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除维修工单
+export function delRepairOrder(workId) {
+	return request({
+		url: '/device/repairOrder/' + workId,
+		method: 'delete'
+	});
+}
+
+
diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index 8b53004..23cb5bf 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -31,7 +31,7 @@
         </el-date-picker>
 			</el-form-item>
 			<el-form-item label="报修来源" prop="orderSource">
-        <el-select v-model="form.orderSource" style="width:195px">
+        <el-select v-model="queryParams.orderSource" style="width:195px" clearable>
           <el-option
             v-for="dict in dict.type.device_order_source"
             :key="dict.value"
@@ -123,7 +123,7 @@
 
 		<el-table v-loading="loading" :data="faultReportList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="报修单号" align="center" prop="orderCode" width="120"/>
+			<el-table-column label="报修单号" align="center" prop="orderCode" width="150"/>
 			<el-table-column label="设备编码" align="center" prop="equipmentCode" width="100"/>
 			<el-table-column label="故障描述" align="center" prop="orderDesc" width="200"/>
 			<el-table-column label="故障时间" align="center" prop="orderBreakdownTime" width="180">
@@ -140,10 +140,15 @@
 			<el-table-column label="报修人" align="center" prop="orderRepairman" />
 			<el-table-column label="联系方式" align="center" prop="orderConnection" width="120"/>
 			<el-table-column label="处理状态" align="center" prop="orderStatus" />
-			<el-table-column label="关联计划" align="center" prop="orderRelevance" />
+			<el-table-column label="报修去向" align="center" prop="repairDestination" width="120"/>
 			<el-table-column label="故障图片" align="center" prop="orderPicture" />
-			<el-table-column label="创建人" align="center" prop="craeteBy" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+			<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.orderBreakdownTime) }}</span>
+        </template>
+      </el-table-column>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
 				<template slot-scope="scope">
 					<el-button
 						size="mini"
@@ -159,6 +164,13 @@
 						@click="handleDelete(scope.row)"
 						v-hasPermi="['device:faultReport:remove']"
 					>删除</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-circle-check"
+						@click="handleCheck(scope.row)"
+						v-hasPermi="['device:faultReport:check']"
+					>审核</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -171,75 +183,286 @@
 			@pagination="getList"
 		/>
 
-		<!-- 添加或修改故障报修对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+		<!-- 审核故障报修对话框 -->
+		<el-dialog :title="title" :visible.sync="openCheck" width="1000px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 				<el-row :gutter="10" class="mb8">
           <el-col :span="8">
 						<el-form-item label="设备编码" prop="equipmentCode">
-              <el-input v-model="form.equipmentCode" placeholder="请选择辅助设备" >
-                <el-button slot="append" @click="handleSelectEquipment" icon="el-icon-search"></el-button>
-          			  </el-input>
-          				<ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect>
+              <el-input v-model="form.equipmentCode" disabled style="width:195px">
+          		</el-input>
+          		<ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect>
 			  		</el-form-item>
           </el-col>
+          <el-col :span="8">
+						<el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model="form.equipmentName" disabled style="width:195px">
+          		</el-input>
+			  		</el-form-item>
+          </el-col>
+          <el-col :span="8">
+						<el-form-item label="设备类型" prop="equipmentTypeName">
+              <el-input v-model="form.equipmentTypeName" disabled style="width:195px">
+          		</el-input>
+			  		</el-form-item>
+          </el-col>
+        </el-row>
+
+				<el-row :gutter="10" class="mb8">
+          <el-col :span="8">
+						<el-form-item label="规格型号" prop="equipmentSpec">
+              <el-input v-model="form.equipmentSpec" disabled style="width:195px">
+          		</el-input>
+          		<ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect>
+			  		</el-form-item>
+          </el-col>
+          <el-col :span="8">
+						<el-form-item label="所在部门" prop="department">
+              <el-input v-model="form.department" disabled style="width:195px">
+          		</el-input>
+			  		</el-form-item>
+          </el-col>
+          <el-col :span="8">
+						<el-form-item label="所在位置" prop="equipmentLocation">
+              <el-input v-model="form.equipmentLocation" disabled style="width:195px">
+          		</el-input>
+			  		</el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10" class="mb8">
           <el-col :span="8">
 						<el-form-item label="故障时间" prop="orderBreakdownTime">
 	            <el-date-picker
 	              clearable
                 v-model="form.orderBreakdownTime"
                 type="datetime"
-                placeholder="选择日期时间">
+                placeholder="选择日期时间"
+                disabled
+                style="width:195px"
+                >
               </el-date-picker>
 						</el-form-item>
           </el-col>
 					<el-col :span="8">
 						<el-form-item label="报修来源" prop="orderSource">
-					    	<el-input v-model="form.orderSource" placeholder="请输入报修来源" />
+              <el-select v-model="form.orderSource" style="width:195px" disabled>
+                <el-option
+                  v-for="dict in dict.type.device_order_source"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
 						</el-form-item>
           </el-col>
-        </el-row>
-				<el-row :gutter="10" class="mb8">
           <el-col :span="8">
 						<el-form-item label="报修时间" prop="orderTime">
-							<el-date-picker clearable
-								v-model="form.orderTime"
-								type="date"
-								value-format="yyyy-MM-dd"
-								placeholder="请选择报修时间">
-							</el-date-picker>
+	            <el-date-picker
+	              clearable
+                v-model="form.orderTime"
+                type="datetime"
+                disabled
+                style="width:195px"
+                placeholder="报修时间">
+              </el-date-picker>
 						</el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8">
           <el-col :span="8">
 						<el-form-item label="报修人" prop="orderRepairman">
-					    <el-input v-model="form.orderRepairman" placeholder="请输入报修人" />
+					    <el-input v-model="form.orderRepairman" placeholder="请输入报修人" disabled style="width:195px"/>
 						</el-form-item>
           </el-col>
 					<el-col :span="8">
 						<el-form-item label="联系方式" prop="orderConnection">
-							<el-input v-model="form.orderConnection" placeholder="请输入联系方式" />
+							<el-input v-model="form.orderConnection" placeholder="请输入联系方式" disabled style="width:195px"/>
 						</el-form-item>
           </el-col>
         </el-row>
 			  <el-row>
 					<el-form-item label="故障描述" prop="orderDesc">
-						<el-input v-model="form.orderDesc" placeholder="请输入故障描述" />
+						<el-input v-model="form.orderDesc" placeholder="请输入故障描述" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" disabled/>
 					</el-form-item>
 				</el-row>
 				<el-form-item label="故障图片" prop="orderPicture">
 					<el-input v-model="form.orderPicture" placeholder="请输入故障图片" />
 				</el-form-item>
+        <el-divider>报修信息审核</el-divider>
+			  <el-row>
+          <el-col :span="24">
+            <el-form-item label="报修去向" prop="repairDestination">
+              <el-radio-group v-model="form.repairDestination">
+                <el-radio label="计划性维修">计划性维修</el-radio>
+                <el-radio label="不维修">不维修</el-radio>
+                <el-radio label="委外维修">委外维修</el-radio>
+                <el-radio label="立即维修" @click="timeBackFilling">立即维修</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
+            <el-form-item prop="workTeam" label="维修组">
+              <el-input v-model="form.workTeam" placeholder="请选择维修组" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
+            <el-form-item prop="workPlanTime" label="计划维修时间">
+    	        <el-date-picker
+    	          clearable
+                v-model="form.workPlanTime"
+                type="datetime"
+                placeholder="请选择计划维修时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
+            <el-form-item prop="workPlanDownTime" label="计划停机时间">
+    	        <el-date-picker
+    	          clearable
+                v-model="form.workPlanDownTime"
+                type="datetime"
+                placeholder="请选择计划停机时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="8" v-if="form.repairDestination == '立即维修'">
+            <el-form-item prop="workTeam" label="维修组">
+              <el-input v-model="form.workTeam" placeholder="请选择维修组" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="form.repairDestination == '立即维修'">
+            <el-form-item prop="workPlanTime" label="计划维修时间">
+    	        <el-date-picker
+    	          clearable
+                v-model="form.workPlanTime"
+                type="datetime"
+                placeholder="">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="form.repairDestination == '立即维修'">
+            <el-form-item prop="workPlanDownTime" label="计划停机时间">
+    	        <el-date-picker
+    	          clearable
+                v-model="form.workPlanDownTime"
+                type="datetime"
+                placeholder="">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="8" v-if="form.repairDestination == '委外维修'">
+            <el-form-item prop="workTeam" label="委外单位">
+              <el-input v-model="form.workTeam" placeholder="请选填写委外单位" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="form.repairDestination == '委外维修'">
+            <el-form-item prop="workPlanTime" label="委外人员">
+              <el-input v-model="form.workTeam" placeholder="请选填写委外人员" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24" v-if="form.repairDestination == '委外维修'">
+            <el-form-item prop="workPlanDownTime" label="委外原因">
+             <el-input v-model="form.orderDesc" placeholder="请输入委外原因" type="textarea" :autosize="{ minRows: 2, maxRows: 4}"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
+				<el-button type="primary" @click="submitCheckForm">确 定</el-button>
+				<el-button @click="cancel">返 回</el-button>
 			</div>
 		</el-dialog>
+
+		<!-- 添加或修改故障报修对话框 -->
+    		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+    			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    				<el-row :gutter="10" class="mb8">
+              <el-col :span="8">
+    						<el-form-item label="设备编码" prop="equipmentCode">
+                  <el-input v-model="form.equipmentCode" placeholder="请选择辅助设备" >
+                    <el-button slot="append" @click="handleSelectEquipment" icon="el-icon-search"></el-button>
+              			  </el-input>
+              				<ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect>
+    			  		</el-form-item>
+              </el-col>
+              <el-col :span="8">
+    						<el-form-item label="故障时间" prop="orderBreakdownTime">
+    	            <el-date-picker
+    	              clearable
+                    v-model="form.orderBreakdownTime"
+                    placeholder="选择日期时间">
+                  </el-date-picker>
+    						</el-form-item>
+              </el-col>
+    					<el-col :span="8">
+    						<el-form-item label="报修来源" prop="orderSource">
+                  <el-select v-model="form.orderSource" style="width:195px">
+                    <el-option
+                      v-for="dict in dict.type.device_order_source"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+    						</el-form-item>
+              </el-col>
+            </el-row>
+    				<el-row :gutter="10" class="mb8">
+              <el-col :span="8">
+    						<el-form-item label="报修时间" prop="orderTime">
+    	            <el-date-picker
+    	              clearable
+                    v-model="form.orderTime"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="报修时间">
+                  </el-date-picker>
+    						</el-form-item>
+              </el-col>
+              <el-col :span="8">
+    						<el-form-item label="报修人" prop="orderRepairman">
+    					    <el-input v-model="form.orderRepairman" placeholder="请输入报修人" />
+    						</el-form-item>
+              </el-col>
+    					<el-col :span="8">
+    						<el-form-item label="联系方式" prop="orderConnection">
+    							<el-input v-model="form.orderConnection" placeholder="请输入联系方式" />
+    						</el-form-item>
+              </el-col>
+            </el-row>
+    			  <el-row>
+    					<el-form-item label="故障描述" prop="orderDesc">
+    						<el-input v-model="form.orderDesc" placeholder="请输入故障描述" type="textarea" :autosize="{ minRows: 2, maxRows: 4}"/>
+    					</el-form-item>
+    				</el-row>
+    				<el-form-item label="故障图片" prop="orderPicture">
+    					<el-input v-model="form.orderPicture" 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>
 </template>
 
 <script>
-import { listFaultReport, getFaultReport, delFaultReport, addFaultReport, updateFaultReport,getEquipmentList } from "@/api/device/faultReport";
+import { listFaultReport, getFaultReport, delFaultReport, addFaultReport, updateFaultReport,getEquipmentList,checkFaultReport } from "@/api/device/faultReport";
 import ItemSelect  from "./single.vue";
 export default {
 	name: "FaultReport",
@@ -266,6 +489,8 @@ export default {
 			title: "",
 			// 是否显示弹出层
 			open: false,
+			// 是否显示弹出层
+      openCheck: false,
 			// 查询参数
 			queryParams: {
 				pageNum: 1,
@@ -285,7 +510,7 @@ export default {
 				attr1: null,
 				attr2: null,
 				attr3: null,
-				craeteBy: null,
+				createBy: null,
 				orderBreakdownTimeArray: [],
 				orderTimeArray: []
 			},
@@ -355,6 +580,10 @@ export default {
 		this.getList();
 	},
 	methods: {
+	  timeBackFilling(){
+	    this.form.workPlanTime = new Date();
+	    log("时间时间",new Date());
+	  },
     //新增 设备选择弹出框
     handleSelectEquipment(){
       this.$refs.itemSelect.showFlag = true;
@@ -377,6 +606,10 @@ export default {
 			this.open = false;
 			this.reset();
 		},
+		// 返回按钮
+		cancel() {
+			this.openCheck = false;
+		},
 		// 表单重置
 		reset() {
 			this.form = {
@@ -397,7 +630,7 @@ export default {
 				attr2: null,
 				attr3: null,
 				delFlag: null,
-				craeteBy: null,
+				createBy: null,
 				createTime: null,
 				updateBy: null,
 				updateTime: null
@@ -423,6 +656,7 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
+			this.form.orderSource = "PC";
 			this.open = true;
 			this.title = "添加故障报修";
 		},
@@ -436,6 +670,16 @@ export default {
 				this.title = "修改故障报修";
 			});
 		},
+		/** 审核按钮操作 */
+		handleCheck(row) {
+			this.reset();
+			const orderId = row.orderId || this.ids
+			getFaultReport(orderId).then(response => {
+				this.form = response.data;
+				this.openCheck = true;
+				this.title = "审核故障报修";
+			});
+		},
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs["form"].validate(valid => {
@@ -456,6 +700,20 @@ export default {
 				}
 			});
 		},
+		/** 审核提交按钮 */
+		submitCheckForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.orderId != null) {
+						checkFaultReport(this.form).then(response => {
+							this.$modal.msgSuccess("审核成功");
+							this.openCheck = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const orderIds = row.orderId || this.ids;
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
new file mode 100644
index 0000000..c7fb94d
--- /dev/null
+++ b/src/views/device/repairOrder/index.vue
@@ -0,0 +1,465 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
+			<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="workPlanTime">
+				<el-date-picker clearable
+					v-model="queryParams.workPlanTime"
+					type="date"
+					value-format="yyyy-MM-dd"
+					placeholder="请选择计划维修时间">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="计划停机时间" prop="workPlanDownTime">
+				<el-date-picker clearable
+					v-model="queryParams.workPlanDownTime"
+					type="date"
+					value-format="yyyy-MM-dd"
+					placeholder="请选择计划停机时间">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="维修人员" prop="workPerson">
+				<el-input
+					v-model="queryParams.workPerson"
+					placeholder="请输入维修人员"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="维修组" prop="workTeam">
+				<el-input
+					v-model="queryParams.workTeam"
+					placeholder="请输入维修组"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="是否委外" prop="workOutsource">
+				<el-input
+					v-model="queryParams.workOutsource"
+					placeholder="请输入是否委外"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="是否停机维修" prop="workDownMachine">
+				<el-input
+					v-model="queryParams.workDownMachine"
+					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 label="委外工单编码" prop="outWorkCode">
+				<el-input
+					v-model="queryParams.outWorkCode"
+					placeholder="请输入委外工单编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="工厂编码" prop="factoryCode">
+				<el-input
+					v-model="queryParams.factoryCode"
+					placeholder="请输入工厂编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</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: repairOrder: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: repairOrder: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: repairOrder: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: repairOrder:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data=" repairOrderList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="报修单号" align="center" prop="orderCode" width="180"/>
+			<el-table-column label="设备编码" align="center" prop="equipmentCode" />
+			<el-table-column label="计划维修时间" align="center" prop="workPlanTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.workPlanTime) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="是否停机维修" align="center" prop="workDownMachine" width="180"/>
+			<el-table-column label="计划停机时间" align="center" prop="workPlanDownTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.workPlanDownTime) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="维修人员" align="center" prop="workPerson" />
+			<el-table-column label="维修组" align="center" prop="workTeam" />
+			<el-table-column label="是否委外" align="center" prop="workOutsource" />
+      <el-table-column label="委外工单编码" align="center" prop="outWorkCode" width="180"/>
+
+			<el-table-column label="原因分析" align="center" prop="workReason" />
+			<el-table-column label="故障描述" align="center" prop="workFaultDesc" />
+			<el-table-column label="维修用时" align="center" prop="workCostTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.workCostTime) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="维修费用" align="center" prop="workCost" />
+			<el-table-column label="工厂编码" align="center" prop="factoryCode" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['device: repairOrder:edit']"
+					>修改</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['device: repairOrder: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="500px" append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="报修主键" prop="orderId">
+					<el-input v-model="form.orderId" placeholder="请输入报修主键" />
+				</el-form-item>
+				<el-form-item label="报修单号" prop="orderCode">
+					<el-input v-model="form.orderCode" placeholder="请输入报修单号" />
+				</el-form-item>
+				<el-form-item label="是否立即处理" prop="workHandle">
+					<el-input v-model="form.workHandle" placeholder="请输入是否立即处理" />
+				</el-form-item>
+				<el-form-item label="计划维修时间" prop="workPlanTime">
+					<el-date-picker clearable
+						v-model="form.workPlanTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择计划维修时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="计划停机时间" prop="workPlanDownTime">
+					<el-date-picker clearable
+						v-model="form.workPlanDownTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择计划停机时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="关联计划" prop="orderRelevance">
+					<el-input v-model="form.orderRelevance" placeholder="请输入关联计划" />
+				</el-form-item>
+				<el-form-item label="维修人员" prop="workPerson">
+					<el-input v-model="form.workPerson" placeholder="请输入维修人员" />
+				</el-form-item>
+				<el-form-item label="维修组" prop="workTeam">
+					<el-input v-model="form.workTeam" placeholder="请输入维修组" />
+				</el-form-item>
+				<el-form-item label="是否委外" prop="workOutsource">
+					<el-input v-model="form.workOutsource" placeholder="请输入是否委外" />
+				</el-form-item>
+				<el-form-item label="是否停机维修" prop="workDownMachine">
+					<el-input v-model="form.workDownMachine" 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="workReason">
+					<el-input v-model="form.workReason" placeholder="请输入原因分析" />
+				</el-form-item>
+				<el-form-item label="故障描述" prop="workFaultDesc">
+					<el-input v-model="form.workFaultDesc" placeholder="请输入故障描述" />
+				</el-form-item>
+				<el-form-item label="维修用时" prop="workCostTime">
+					<el-date-picker clearable
+						v-model="form.workCostTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择维修用时">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="维修费用" prop="workCost">
+					<el-input v-model="form.workCost" placeholder="请输入维修费用" />
+				</el-form-item>
+				<el-form-item label="委外工单id" prop="outWorkId">
+					<el-input v-model="form.outWorkId" placeholder="请输入委外工单id" />
+				</el-form-item>
+				<el-form-item label="委外工单编码" prop="outWorkCode">
+					<el-input v-model="form.outWorkCode" 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-item label="工厂编码" prop="factoryCode">
+					<el-input v-model="form.factoryCode" 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>
+</template>
+
+<script>
+import { listRepairOrder, getRepairOrder, delRepairOrder, addRepairOrder, updateRepairOrder } from "@/api/device/repairOrder";
+
+export default {
+	name: " repairOrder",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 维修工单表格数据
+			 repairOrderList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				orderId: null,
+				orderCode: null,
+				workHandle: null,
+				workPlanTime: null,
+				workPlanDownTime: null,
+				orderRelevance: null,
+				workPerson: null,
+				workTeam: null,
+				workOutsource: null,
+				workDownMachine: null,
+				equipmentCode: null,
+				workReason: null,
+				workFaultDesc: null,
+				workCostTime: null,
+				workCost: null,
+				outWorkId: null,
+				outWorkCode: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				factoryCode: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询维修工单列表 */
+		getList() {
+			this.loading = true;
+			listRepairOrder(this.queryParams).then(response => {
+				this.repairOrderList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				workId: null,
+				orderId: null,
+				orderCode: null,
+				workHandle: null,
+				workPlanTime: null,
+				workPlanDownTime: null,
+				orderRelevance: null,
+				workPerson: null,
+				workTeam: null,
+				workOutsource: null,
+				workDownMachine: null,
+				equipmentCode: null,
+				workReason: null,
+				workFaultDesc: null,
+				workCostTime: null,
+				workCost: null,
+				outWorkId: null,
+				outWorkCode: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				createBy: null,
+				createTime: null,
+				updateTime: null,
+				updateBy: null,
+				delFlag: null,
+				factoryCode: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.workId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加维修工单";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const workId = row.workId || this.ids
+			getRepairOrder(workId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改维修工单";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.workId != null) {
+						updateRepairOrder(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addRepairOrder(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const workIds = row.workId || this.ids;
+			this.$modal.confirm('是否确认删除维修工单编号为"' + workIds + '"的数据项？').then(function() {
+				return delRepairOrder(workIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('device/repairOrder/export', {
+				...this.queryParams
+			}, ` repairOrder_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>