diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue
index 239d03a..d17db26 100644
--- a/pages/WarehouseManage/InStoreConfirm.vue
+++ b/pages/WarehouseManage/InStoreConfirm.vue
@@ -1,19 +1,152 @@
 <template>
-	<view>
-		
+	<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 class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</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>
+								<th>生产顺序</th>
+								<th>生产日期</th>
+								<th>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
+								<td>{{Number(i) + 1}}</td>
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">补码</button>
+			<button class="submit-button" @tap="_queryMaterialInfo">入库确认</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryMaterialInfo2, casingConfirm} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				val1: '',
+				val2: '',
+				qty: '',
+				dataList: [],
+				disabled: false,
+				checkArr: []
 			};
+		},
+		created () {
+			// this._queryMaterialInfo()
+		},
+		methods: {
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				let res = await queryMaterialInfo2(this.val1, this.index)
+				res.data.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList = [...res.data]	
+			},
+			/** 确认 */
+			async _casingConfirm () {
+				this.disabled = true
+				if (!this.checkArr.length || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await casingConfirm(this.checkArr, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+					this.checkArr = []
+					this._queryMaterialInfo()
+					
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		width 92rpx
+		z-index 102
+	.slide_new table td:nth-child(3), .slide_new table th:nth-child(3)
+		position sticky
+		left 176rpx
+		z-index 103
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
 </style>
diff --git a/pages/WarehouseManage/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue
index 239d03a..581e157 100644
--- a/pages/WarehouseManage/ScrapInStore.vue
+++ b/pages/WarehouseManage/ScrapInStore.vue
@@ -1,19 +1,152 @@
 <template>
-	<view>
-		
+	<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 class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</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>
+								<th>生产顺序</th>
+								<th>生产日期</th>
+								<th>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
+								<td>{{Number(i) + 1}}</td>
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">报废入库</button>
+			<button class="submit-button" @tap="_queryMaterialInfo">入库确认</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryMaterialInfo2, casingConfirm} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				val1: '',
+				val2: '',
+				qty: '',
+				dataList: [],
+				disabled: false,
+				checkArr: []
 			};
+		},
+		created () {
+			// this._queryMaterialInfo()
+		},
+		methods: {
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				let res = await queryMaterialInfo2(this.val1, this.index)
+				res.data.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList = [...res.data]	
+			},
+			/** 确认 */
+			async _casingConfirm () {
+				this.disabled = true
+				if (!this.checkArr.length || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await casingConfirm(this.checkArr, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+					this.checkArr = []
+					this._queryMaterialInfo()
+					
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		width 92rpx
+		z-index 102
+	.slide_new table td:nth-child(3), .slide_new table th:nth-child(3)
+		position sticky
+		left 176rpx
+		z-index 103
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
 </style>
diff --git a/pages/WarehouseManage/SemifinishedInStore.vue b/pages/WarehouseManage/SemifinishedInStore.vue
index 239d03a..be301e0 100644
--- a/pages/WarehouseManage/SemifinishedInStore.vue
+++ b/pages/WarehouseManage/SemifinishedInStore.vue
@@ -1,19 +1,168 @@
 <template>
-	<view>
-		
+	<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 class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">母卷</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">烘烤完成</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</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>
+								<th>生产顺序</th>
+								<th>生产日期</th>
+								<th>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
+								<td>{{Number(i) + 1}}</td>
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">确认入库</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryMaterialInfo2, casingConfirm} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				qty: '',
+				dataList: [],
+				disabled: false,
+				checkArr: []
 			};
+		},
+		created () {
+			// this._queryProductArea()
+		},
+		methods: {
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.data]
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				let res = await queryMaterialInfo2(this.val1, this.index)
+				res.data.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList = [...res.data]	
+			},
+			/** 确认 */
+			async _casingConfirm () {
+				this.disabled = true
+				if (!this.checkArr.length || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await casingConfirm(this.checkArr, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+					this.checkArr = []
+					this._queryMaterialInfo()
+					
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		width 92rpx
+		z-index 102
+	.slide_new table td:nth-child(3), .slide_new table th:nth-child(3)
+		position sticky
+		left 176rpx
+		z-index 103
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
 </style>
diff --git a/pages/WarehouseManage/SemifinishedOutStore.vue b/pages/WarehouseManage/SemifinishedOutStore.vue
index 239d03a..1cd502f 100644
--- a/pages/WarehouseManage/SemifinishedOutStore.vue
+++ b/pages/WarehouseManage/SemifinishedOutStore.vue
@@ -1,19 +1,170 @@
 <template>
-	<view>
-		
+	<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 class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">母卷</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">区域</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</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>
+								<th>生产顺序</th>
+								<th>生产日期</th>
+								<th>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
+								<td>{{Number(i) + 1}}</td>
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">确认出库</button>
+			<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryMaterialInfo2, casingConfirm} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				qty: '',
+				dataList: [],
+				disabled: false,
+				checkArr: []
 			};
+		},
+		created () {
+			// this._queryProductArea()
+			// this._queryMaterialInfo()
+		},
+		methods: {
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.data]
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				let res = await queryMaterialInfo2(this.val1, this.index)
+				res.data.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList = [...res.data]	
+			},
+			/** 确认 */
+			async _casingConfirm () {
+				this.disabled = true
+				if (!this.checkArr.length || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await casingConfirm(this.checkArr, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+					this.checkArr = []
+					this._queryMaterialInfo()
+					
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		width 92rpx
+		z-index 102
+	.slide_new table td:nth-child(3), .slide_new table th:nth-child(3)
+		position sticky
+		left 176rpx
+		z-index 103
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
 </style>