diff --git a/pages/entry/group-to-store.vue b/pages/entry/group-to-store.vue
index eebc9e6..da91c13 100644
--- a/pages/entry/group-to-store.vue
+++ b/pages/entry/group-to-store.vue
@@ -5,55 +5,73 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">载具编码</span>
+					<view class="zd-col-8">
+						<span class="filter_label">合格证编码</span>
 					</view>
-					<view class="zd-col-24">
+					<view class="zd-col-16">
 						<search-box
 						v-model="val1"
+						@handleChange="handleChange1"
 						/>
 					</view>
 				</view>
+				<view class="zd-row">
+					<view class="zd-col-8">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-16">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">订单号</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.MONumber}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料编码</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料名称</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_name}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">物料规格</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.material_spec}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">单位</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.unit_name}}</span></view>
+				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">关联单据</span>
+					<view class="zd-col-8"><span class="filter_label">物料数量</span></view>
+					<view class="zd-col-16">
+						<input type="number" class="filter_input" v-model="currentData.qty">
 					</view>
-					<view class="zd-col-24">
-						<input type="text" class="filter_input" @tap="toJump" v-model="val2">
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">组织</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.StockOrgId}}</span></view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-8"><span class="filter_label">货主</span></view>
+					<view class="zd-col-16"><span class="filter_input">{{currentData.OwnerId_Id}}</span></view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-8"><span class="filter_label">仓库编码</span></view>
+					<view class="zd-col-16 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></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>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.single_weight}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="compute_wraper">
-			
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !checkArr.length}" :disabled="disabled">组盘确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
 		</view>
 	</view>
 </template>
@@ -61,7 +79,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {mdGruopDick} from '@/utils/getData2.js'
+	import {storList, getCertificateInfo, inStorageConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -72,38 +90,52 @@
 				title: '',
 				val1: '',
 				val2: '',
-				dataList: [],
-				checkArr: '',
+				currentData: {},
+				options: [],
+				index: '',
 				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
-		},
-		onShow () {
-			if (this.$store.getters.publicArr.length) {
-				this.dataList = [...this.$store.getters.publicArr]
-				this.$store.dispatch('setPublicArr', '')
-			}
+			this._storList()
 		},
 		methods: {
-			toJump () {
-				uni.navigateTo({
-					url: '/pages/entry/document?title=关联单据'
-				})
+			async _storList () {
+				let res = await storList()
+				if (res.code === '200') {
+					this.options = [...res.content]
+					this.options.map(el => {
+						this.$set(el, 'text', el.label)
+					})
+				}
+			},
+			handleChange1 (e) {
+				this._getCertificateInfo(e)
+			},
+			async _getCertificateInfo (e) {
+				let res = await getCertificateInfo(e)
+				this.currentData = res
 			},
 			toEmpty () {
 				this.val1 = ''
-				this.dataList = []
+				this.val2 = ''
+				this.currentData = {}
+				this.index = ''
+				this.disabled = false
 			},
-			async _mdGruopDick () {
+			async _inStorageConfirm () {
 				this.disabled = true
-				if (!this.checkArr.length) {
+				if (!this.val1 || !this.val2 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await mdGruopDick(this.dataList, this.val1, this.val2)
+					let obj = Object.assign(this.currentData, {vehicle_code: this.val2, stor_code: this.index})
+					let res = await inStorageConfirm(obj)
+					if (res.code === '200') {
+						this.toEmpty()
+					}
 					this.disabled = false
 					uni.showToast({
 						title: res.msg,
@@ -118,8 +150,4 @@
 </script>
 
 <style lang="stylus">
-@import '../../common/style/mixin.styl';
-.msg_wrapper
-	height auto
-	min-height 30%
 </style>
diff --git a/utils/getData2.js b/utils/getData2.js
index 7230ce9..d9d7d60 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -213,4 +213,28 @@ export const outStorageConfirm = (obj) => request({
 // 		msg: 'ok'
 // 	}
 // 	return res
-// }
\ No newline at end of file
+// }
+
+// 扫描合格证获取物料信息
+export const getCertificateInfo = (id) => request({
+	url:'api/pda/outStorage/getCertificateInfo/' + id,
+	method: 'GET'
+})
+// export const getCertificateInfo = (id) => {
+// 	let res = {
+// 		MONumber: '订单号',
+// 		material_code: 'material_code',
+// 		material_name: 'material_name',
+// 		material_spec: 'material_spec',
+// 		unit_name: 'unit_name',
+// 		qty: '100',
+// 		StockOrgId: 'StockOrgId',
+// 		OwnerId_Id: 'OwnerId_Id'
+// 	}
+// 	return res
+// }
+// 单据入库组盘确认
+export const inStorageConfirm = (obj) => request({
+	url:'api/pda/inStorage/confirm',
+	data: obj
+})