diff --git a/pages.json b/pages.json
index 782d9a8..33cc8af 100644
--- a/pages.json
+++ b/pages.json
@@ -25,13 +25,13 @@
 		    }  
 		},
 		{
-		    "path" : "pages/modules/SemifinishedInStore",
+		    "path" : "pages/warehouse/SemifinishedInStore",
 		    "style": {
 		    	"navigationStyle": "custom"
 		    }   
 		},
 		{
-			"path": "pages/modules/SemifinishedMaterSearch",
+			"path": "pages/warehouse/SemifinishedMaterSearch",
 			"style": {
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": true,
@@ -39,13 +39,13 @@
 			} 
 		},
 		{
-		    "path" : "pages/modules/SemifinishedOutStore",
+		    "path" : "pages/warehouse/SemifinishedOutStore",
 		    "style": {
 		    	"navigationStyle": "custom"
 		    }   
 		},
 		{
-			"path": "pages/modules/EmptyOutStore",
+			"path": "pages/warehouse/EmptyOutStore",
 			"style": {
 				"navigationStyle": "custom"
 			} 
@@ -57,6 +57,7 @@
 			} 
 		},
 		{
+<<<<<<< HEAD
 			"path": "pages/modules/EquipMaintainSure",
 			"style": {
 				"navigationStyle": "custom"
@@ -64,16 +65,32 @@
 		},
 		{
 			"path": "pages/modules/EquipRepairExecute",
+=======
+			"path": "pages/device/RepairWork",
+>>>>>>> 7f09ba976650bb89b69572bac02657185529bbed
 			"style": {
 				"navigationStyle": "custom"
 			} 
 		},
 		{
-			"path": "pages/modules/MaintainResultFill",
+			"path": "pages/device/RepairFill",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		}
+        ,{
+            "path" : "pages/warehouse/RawmaterialRevice",
+            "style": {
+            	"navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/warehouse/WarehouseReceiptDetails",
+            "style": {
+            	"navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/modules/MaintainResultFill.vue b/pages/device/RepairFill.vue
similarity index 85%
rename from pages/modules/MaintainResultFill.vue
rename to pages/device/RepairFill.vue
index 885a9dd..57e73fc 100644
--- a/pages/modules/MaintainResultFill.vue
+++ b/pages/device/RepairFill.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="维修结果填报"></nav-bar>
+		<nav-bar :inner2="true" @goIn="goIn" title="维修结果填报"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
@@ -56,8 +56,8 @@
 			</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" :class="{'btn-disabled': dataList.length === 0}" :disabled="disabled" @tap="dataList.length === 0">确认</button>
+			<button class="submit-button" @tap="toCancle">取消</button>
 		</view>
 	</view>
 </template>
@@ -74,6 +74,8 @@
 		data() {
 			return {
 				val1: '',
+				val2: '',
+				val3: '',
 				dataList: [],
 				pkId: '',
 				pkObj: {},
@@ -112,6 +114,15 @@
 			toCheck (e) {
 				this.pkId = this.pkId === e.repair_id ? '' : e.repair_id
 				this.pkObj = this.pkId === e.repair_id ? e : {}
+			},
+			toCancle () {
+			  this.$store.dispatch('setPublicObj', {})
+			  this.goIn()
+			},
+			goIn () {
+				uni.redirectTo({
+					url: '/pages/modules/EquipRepairExecute'
+				})
 			}
 		}
 	}
diff --git a/pages/modules/EquipRepairExecute.vue b/pages/device/RepairWork.vue
similarity index 76%
rename from pages/modules/EquipRepairExecute.vue
rename to pages/device/RepairWork.vue
index f7fdbc2..1383605 100644
--- a/pages/modules/EquipRepairExecute.vue
+++ b/pages/device/RepairWork.vue
@@ -40,10 +40,10 @@
 			</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>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="toSure1">开始维修</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" @tap="toJump">填报</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="toSure2">委外维修</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled3" @tap="toSure3">结束维修</button>
 		</view>
 	</view>
 </template>
@@ -63,7 +63,9 @@
 				dataList: [],
 				pkId: '',
 				pkObj: {},
-				disabled: false
+				disabled1: false,
+				disabled2: false,
+				disabled3: false
 			};
 		},
 		created () {
@@ -98,6 +100,14 @@
 			toCheck (e) {
 				this.pkId = this.pkId === e.repair_id ? '' : e.repair_id
 				this.pkObj = this.pkId === e.repair_id ? e : {}
+			},
+			toJump () {
+				if (this.pkId) {
+				this.$store.dispatch('setPublicObj', this.pkObj)
+				uni.navigateTo({
+					url: '/pages/modules/MaintainResultFill'
+				})
+				}
 			}
 		}
 	}
diff --git a/pages/modules/EmptyOutStore.vue b/pages/warehouse/EmptyOutStore.vue
similarity index 100%
rename from pages/modules/EmptyOutStore.vue
rename to pages/warehouse/EmptyOutStore.vue
diff --git a/pages/warehouse/RawmaterialRevice.vue b/pages/warehouse/RawmaterialRevice.vue
new file mode 100644
index 0000000..76f8d5b
--- /dev/null
+++ b/pages/warehouse/RawmaterialRevice.vue
@@ -0,0 +1,106 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="原辅料收料"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>选择</th>
+								<th>仓库</th>
+								<th>入库单号</th>
+								<th>业务日期</th>
+								<th>明细数</th>
+								<th>总重量</th>
+								<th>单位</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td>{{e.device_code}}</td>
+								<td @tap="toJump(e)">{{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': !pkId}" :disabled="disabled" @tap="toSure1">确认入库</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 {
+				dataList: [],
+				checkArr: [],
+				disabled: false
+			};
+		},
+		created () {
+		},
+		methods: {
+			/** 下拉框查询 */
+			async _statusList () {
+				let res = await statusList()
+				this.options = [...res.data]
+			},
+			/** grid查询 */
+			async _empOutgetIvt (e) {
+				let res = await empOutgetIvt(e)
+				res.data.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList = [...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) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			},
+			toJump (e) {
+				this.$store.dispatch('setPublicObj', e)
+				uni.navigateTo({
+					url: '/pages/warehouse/WarehouseReceiptDetails'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/modules/SemifinishedInStore.vue b/pages/warehouse/SemifinishedInStore.vue
similarity index 100%
rename from pages/modules/SemifinishedInStore.vue
rename to pages/warehouse/SemifinishedInStore.vue
diff --git a/pages/modules/SemifinishedMaterSearch.vue b/pages/warehouse/SemifinishedMaterSearch.vue
similarity index 100%
rename from pages/modules/SemifinishedMaterSearch.vue
rename to pages/warehouse/SemifinishedMaterSearch.vue
diff --git a/pages/modules/SemifinishedOutStore.vue b/pages/warehouse/SemifinishedOutStore.vue
similarity index 100%
rename from pages/modules/SemifinishedOutStore.vue
rename to pages/warehouse/SemifinishedOutStore.vue
diff --git a/pages/warehouse/WarehouseReceiptDetails.vue b/pages/warehouse/WarehouseReceiptDetails.vue
new file mode 100644
index 0000000..50a6235
--- /dev/null
+++ b/pages/warehouse/WarehouseReceiptDetails.vue
@@ -0,0 +1,153 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :inner2="true" @goIn="goIn" 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="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="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>
+								<th>业务日期</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.material_code === pkId}">
+								<td>{{i+1}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.product_name}}</td>
+								<td>{{e.net_weight}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<!-- <view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" @tap="toSure">确认</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 {getMaterial} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 30
+			};
+		},
+		methods: {
+			handleChange (e) {
+				this.dataList = []
+				this.pageNum = 1
+				this._getMaterial(e)
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._getMaterial(this.val1)
+			},
+			/** grid查询 */
+			async _getMaterial (e) {
+				let res = await getMaterial(e, this.pageNum + '', this.pageSize + '')
+				this.totalCount = res.size
+				if (res.size > 0) {
+					const dataMap = res.data
+					this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+					this.reload = false
+				} else {
+					this.dataList = []
+				}
+				if (this.totalCount == this.dataList.length) {
+					this.reload = false
+					this.status = 'noMore'
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._getMaterial(this.val1)
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_code ? '' : e.material_code
+				this.pkObj = this.pkId === e.material_code ? e : {}
+			},
+			toSure () {
+				if (!this.pkId) {
+					return
+				}
+				this.$store.dispatch('setPublicObj', this.pkObj)
+				this.goIn()
+				
+			},
+			goIn () {
+				uni.redirectTo({
+					url: '/pages/modules/SemifinishedInStore'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>