diff --git a/common/style/layout.css b/common/style/layout.css
index 1df8924..0fdb623 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -71,7 +71,7 @@ uni-button:after {
 }
 .content {
 	width: 100%;
-	height: 100%;
+	height: auto;
 	padding: 92rpx 15rpx 82rpx 14rpx;
 }
 .wrapper {
@@ -198,11 +198,12 @@ uni-button:after {
 	margin: 0 20rpx 10rpx 0;
 	border-radius: 30rpx;
 }
-.btn-disabled {
+.btn-disabled, .submit-button:disabled {
 	background-color: #c9c9c9;
 	border: 1px solid #c9c9c9;
 	color: #fff;
 }
+
   
 /** 弹窗 */
 .msg_wrapper {
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index ee6c2ce..4f94d35 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -35,6 +35,7 @@
 			handleChange ($event) {
 				if ($event.target.value) {
 					this.cur = $event.target.value
+					this.$emit('input', this.cur)
 				}
 			},
 			toSearch () {
diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue
index d941ae4..5dbf869 100644
--- a/pages/ProductManage/EmptyPipeInStore.vue
+++ b/pages/ProductManage/EmptyPipeInStore.vue
@@ -10,14 +10,13 @@
 					<view class="filter_input_wraper">
 						<search-box
 						v-model="val1"
-						@toSearch="toSearch"
 						/>
 					</view>
 				</view>
 				<view class="filter_item">
 					<view class="filter_label">物料</view>
 					<view class="filter_input_wraper">
-						<input type="text" class="filter_input">
+						<input type="text" class="filter_input" v-model="val2">
 					</view>
 				</view>
 				<view class="filter_item">
@@ -26,34 +25,30 @@
 						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
+				<view class="filter_item">
+					<view class="filter_label">数量</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="qty">
+					</view>
+				</view>
 			</view>
 			<view class="wrapper grid-wraper">
 				<view class="slide_new">
 					<table>
 						<thead>
 							<tr>
-								<th>任务号</th>
-								<th>指令号</th>
-								<th>起点</th>
-								<th>终点</th>
-								<th>状态</th>
-								<th>agv车号</th>
-								<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">
-								<td>{{e.task_no}}</td>
-								<td>{{e.inst_no}}</td>
-								<td>{{e.start_devicecode}}</td>
-								<td>{{e.next_devicecode}}</td>
-								<td>{{e.inst_status_name}}</td>
-								<td>{{e.carno}}</td>
-								<td>{{e.material_type_name}}</td>
-								<td>{{e.priority}}</td>
-								<td>{{e.create_time}}</td>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.point_code === pkId}">
+								<td>{{e.point_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.qty}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -61,8 +56,8 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button btn-disabled">入库确认</button>
-			<button class="submit-button">查询</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_emptyConfirm">入库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2 || !index}" @tap="_queryMaterialInfo">查询</button>
 		</view>
 	</view>
 </template>
@@ -70,6 +65,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryMaterialInfo, emptyConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -78,24 +74,63 @@
 		data() {
 			return {
 				val1: '',
+				val2: '',
 				options: [],
-				index: 0,
-				dataList: [{task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1'}, {task_no: '1', start_devicecode: '000fjopd', create_time: '2020-1-1444'}]
+				index: '',
+				qty: '',
+				dataList: [],
+				pkId: '',
+				disabled: false
 			};
 		},
+		created () {
+			// this._queryProductArea()
+		},
 		methods: {
-			toSearch (e) {
+			handleChange (e) {
 				console.log(e)
 			},
 			/** 选择器 */
 			selectChange(e) {
 				this.index = e
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.rows]
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				if (!this.val1 || !this.val2 || !this.index) {
+					return
+				}
+				let res = await queryMaterialInfo(this.val1, this.val2, this.options[this.index].value)
+			this.dataList = [...res.rows]	
+			},
+			/** 确认 */
+			async _emptyConfirm () {
+				this.disabled = true
+				if (!pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await emptyConfirm()
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === point_code ? '' : e.point_code
 			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-.grid-wraper
-	height calc(100% - 238rpx)
 </style>
diff --git a/utils/getData2.js b/utils/getData2.js
index e69de29..bb105d8 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -0,0 +1,28 @@
+import request from './request.js'
+
+/**
+ * 空管入库
+ */
+// 1.1生产区域下拉框查询
+export const queryProductArea = () => request({
+	url:'api/pda/raw/queryProductArea',
+	data: {}
+})
+// 1.2空纸管库设备物料初始化查询
+export const queryMaterialInfo = (code, mcode, area) => request({
+	url:'api/pda/empty/queryMaterialInfo',
+	data: {
+		point_code: code,
+		material_code: mcode,
+		product_area: area
+	}
+})
+// 1.3入库确认
+export const emptyConfirm = (jo, qty, code) => request({
+	url:'api/pda/empty/confirm',
+	data: {
+		raw_jo: jo,
+		qty: qty,
+		material_code: code
+	}
+})
\ No newline at end of file