diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index f515bd4a..3eb9c9a0 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -449,6 +449,7 @@
               clearable
               v-model="form.workPlanTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="请选择计划维修时间"
             >
             </el-date-picker>
@@ -460,6 +461,7 @@
               clearable
               v-model="form.workPlanDownTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="请选择计划停机时间"
             >
             </el-date-picker>
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index c7fb94d2..1ae94471 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -42,20 +42,26 @@
 				/>
 			</el-form-item>
 			<el-form-item label="是否委外" prop="workOutsource">
-				<el-input
-					v-model="queryParams.workOutsource"
-					placeholder="请输入是否委外"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
+        <el-select
+          v-model="queryParams.workOutsource"
+          placeholder="请选择是否委外"
+          @change="$forceUpdate()"
+          clearable
+          style="width:220px"
+          @keyup.enter.native="handleQuery">
+          <el-option v-for="item in workOutsourceOption" :key="item.workOutsource" :label="item.label" :value="item.workOutsource"></el-option>
+        </el-select>
 			</el-form-item>
 			<el-form-item label="是否停机维修" prop="workDownMachine">
-				<el-input
-					v-model="queryParams.workDownMachine"
-					placeholder="请输入是否停机维修"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
+        <el-select
+          v-model="queryParams.workDownMachine"
+          placeholder="请选择是否停机"
+          @change="$forceUpdate()"
+          clearable
+          style="width:220px"
+          @keyup.enter.native="handleQuery">
+          <el-option v-for="item in workDownMachineOption" :key="item.workDownMachine" :label="item.label" :value="item.workDownMachine"></el-option>
+        </el-select>
 			</el-form-item>
 			<el-form-item label="设备编码" prop="equipmentCode">
 				<el-input
@@ -78,6 +84,7 @@
 					v-model="queryParams.factoryCode"
 					placeholder="请输入工厂编码"
 					clearable
+					style="width:220px"
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
@@ -142,7 +149,11 @@
 					<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="workDownMachine" width="180">
+			  <template slot-scope="scope">
+          {{ scope.row.workDownMachine == "1" ? "停机" : "不停机" }}
+        </template>
+      </el-table-column>
 			<el-table-column label="计划停机时间" align="center" prop="workPlanDownTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.workPlanDownTime) }}</span>
@@ -150,9 +161,12 @@
 			</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="workOutsource" >
+				<template slot-scope="scope">
+          {{ scope.row.workOutsource == "1" ? "委外" : "不委外" }}
+        </template>
+			</el-table-column>
       <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">
@@ -162,7 +176,7 @@
 			</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">
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
 				<template slot-scope="scope">
 					<el-button
 						size="mini"
@@ -334,6 +348,20 @@ export default {
 				attr3: null,
 				factoryCode: null
 			},
+			 workOutsourceOption: [{
+                workOutsource: "1",
+                label: '委外'
+              }, {
+                workOutsource: "0",
+                label: '不委外'
+              }],
+			 workDownMachineOption: [{
+                workDownMachine: "1",
+                label: '停机'
+              }, {
+                workDownMachine: "0",
+                label: '不停机'
+              }],
 			// 表单参数
 			form: {},
 			// 表单校验