diff --git a/pages.json b/pages.json
index dd3e26b..e772583 100644
--- a/pages.json
+++ b/pages.json
@@ -49,6 +49,18 @@
 			"style": {
 				"navigationStyle": "custom"
 			} 
+		},
+		{
+			"path": "pages/modules/EquipRepairExecute",
+			"style": {
+				"navigationStyle": "custom"
+			} 
+		},
+		{
+			"path": "pages/modules/MaintainResultFill",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}
     ],
 	"globalStyle": {
diff --git a/pages/modules/EquipRepairExecute.vue b/pages/modules/EquipRepairExecute.vue
new file mode 100644
index 0000000..f7fdbc2
--- /dev/null
+++ b/pages/modules/EquipRepairExecute.vue
@@ -0,0 +1,107 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="设备维修执行"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>维修单</th>
+								<th>设备编号</th>
+								<th>设备名称</th>
+								<th>状态</th>
+								<th>计划维修日期</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.repair_id === pkId}">
+								<td>{{e.repair_code}}</td>
+								<td>{{e.device_code}}</td>
+								<td>{{e.device_name}}</td>
+								<td>{{e.status_name}}</td>
+								<td>{{e.plan_start_date}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId || !index}" :disabled="disabled" @tap="_confirmInstor">开始维修</button>
+			<button class="submit-button" @tap="searchList">填报</button>
+			<button class="submit-button" @tap="searchList">委外维修</button>
+			<button class="submit-button" @tap="searchList">结束维修</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {coolIOQuery, confirmInstor, statusList} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+		},
+		methods: {
+			/** 下拉框查询 */
+			async _statusList () {
+				let res = await statusList()
+				this.options = [...res.data]
+			},
+			/** 确认 */
+			async _confirmInstor () {
+				this.disabled = true
+				if (!this.val1 || !this.pkId || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmInstor(this.pkObj, this.val1, this.index)
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.repair_id ? '' : e.repair_id
+				this.pkObj = this.pkId === e.repair_id ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/modules/MaintainResultFill.vue b/pages/modules/MaintainResultFill.vue
new file mode 100644
index 0000000..885a9dd
--- /dev/null
+++ b/pages/modules/MaintainResultFill.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="维修结果填报"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input filter_input_disabled" disabled v-model="val1">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">维修单</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input filter_input_disabled" disabled v-model="val2">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">生产配合人</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val3">
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>是否完成</th>
+								<th>维修项目编号</th>
+								<th>维修项目名称</th>
+								<th>要求</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.repair_id === pkId}">
+								<td>{{e.indexId}}</td>
+								<td>
+									<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+								</td>
+								<td>{{e.repair_item_code}}</td>
+								<td>{{e.repair_item_name}}</td>
+								<td>{{e.requirement}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId || !index}" :disabled="disabled" @tap="_confirmInstor">确认</button>
+			<button class="submit-button" @tap="searchList">取消</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {coolIOQuery, confirmInstor, statusList} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+		},
+		methods: {
+			/** 下拉框查询 */
+			async _statusList () {
+				let res = await statusList()
+				this.options = [...res.data]
+			},
+			/** 确认 */
+			async _confirmInstor () {
+				this.disabled = true
+				if (!this.val1 || !this.pkId || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmInstor(this.pkObj, this.val1, this.index)
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.repair_id ? '' : e.repair_id
+				this.pkObj = this.pkId === e.repair_id ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>