diff --git a/pages.json b/pages.json
index 4d9bc4e..9f14894 100644
--- a/pages.json
+++ b/pages.json
@@ -23,305 +23,369 @@
 		    "style": {
 		    	"navigationStyle": "custom"
 		    }  
-		}
-        ,{
-            "path" : "pages/manage/cbj-carry",
+		}
+        ,{
+            "path" : "pages/manage/cbj-carry",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/manage/press-carry",
+            
+        }
+        ,{
+            "path" : "pages/manage/press-carry",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/manage/mater-scrap",
+            
+        }
+        ,{
+            "path" : "pages/manage/mater-scrap",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/manage/man-sort",
+            
+        }
+        ,{
+            "path" : "pages/manage/man-sort",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/manage/task-manage",
+            
+        }
+        ,{
+            "path" : "pages/manage/task-manage",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/manage/inst-manage",
+            
+        }
+        ,{
+            "path" : "pages/manage/inst-manage",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/manage/yzhnml-carry",
+            
+        }
+        ,{
+            "path" : "pages/manage/yzhnml-carry",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/manage/vehicle-unbind",
+            
+        }
+        ,{
+            "path" : "pages/manage/vehicle-unbind",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/manage/group-task",
+            
+        }
+        ,{
+            "path" : "pages/manage/group-task",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/entry/group-to-store",
+            
+        }
+        ,{
+            "path" : "pages/entry/group-to-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/entry/empty-tray-to-store",
+            
+        }
+        ,{
+            "path" : "pages/entry/empty-tray-to-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/outbound/tray-out-store",
+            
+        }
+        ,{
+            "path" : "pages/outbound/tray-out-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/outbound/out-store-confirm",
+            
+        }
+        ,{
+            "path" : "pages/outbound/out-store-confirm",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/in/store-info",
+            
+        }
+        ,{
+            "path" : "pages/in/store-info",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/pick/pick-task",
+            
+        }
+        ,{
+            "path" : "pages/pick/pick-task",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/task/task-manage",
+            
+        }
+        ,{
+            "path" : "pages/task/task-manage",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom",
                 "enablePullDownRefresh": true,
                 "onReachBottomDistance": 50
             }
-            
-        }
-        ,{
-            "path" : "pages/entry/document",
+            
+        }
+        ,{
+            "path" : "pages/entry/document",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom",
                 "enablePullDownRefresh": true,
                 "onReachBottomDistance": 50
             }
-            
-        }
-        ,{
-            "path" : "pages/pick/pick-list",
+            
+        }
+        ,{
+            "path" : "pages/pick/pick-list",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/check/check-task",
+            
+        }
+        ,{
+            "path" : "pages/check/check-task",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/entry/mater-group-to-store",
+            
+        }
+        ,{
+            "path" : "pages/entry/mater-group-to-store",
             "style" :                                                                                    
             {
                "navigationStyle": "custom" 
             }
-            
-        }
-        ,{
-            "path" : "pages/mode/switch-in-out",
+            
+        }
+        ,{
+            "path" : "pages/mode/switch-in-out",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/common/mater-list",
+            
+        }
+        ,{
+            "path" : "pages/common/mater-list",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom",
                 "enablePullDownRefresh": true,
                 "onReachBottomDistance": 50
             }
-            
-        }
-        ,{
-            "path" : "pages/mode/pick",
+            
+        }
+        ,{
+            "path" : "pages/mode/pick",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/mode/command",
+            
+        }
+        ,{
+            "path" : "pages/mode/command",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/outbound/bill-out-store",
+            
+        }
+        ,{
+            "path" : "pages/outbound/bill-out-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/outbound/bill-list",
+            
+        }
+        ,{
+            "path" : "pages/outbound/bill-list",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom",
                 "enablePullDownRefresh": true,
                 "onReachBottomDistance": 50
             }
-            
-        }
-        ,{
-            "path" : "pages/entry/qualified-to-store",
+            
+        }
+        ,{
+            "path" : "pages/entry/qualified-to-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/transfer/tray-transfer",
+            
+        }
+        ,{
+            "path" : "pages/transfer/tray-transfer",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/outbound/stock-out-store",
+            
+        }
+        ,{
+            "path" : "pages/outbound/stock-out-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/outbound/stock-list",
+            
+        }
+        ,{
+            "path" : "pages/outbound/stock-list",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom",
                 "enablePullDownRefresh": true,
                 "onReachBottomDistance": 50
             }
-            
-        }
-        ,{
-            "path" : "pages/outbound/produce-out-store-2nd",
+            
+        }
+        ,{
+            "path" : "pages/outbound/produce-out-store-2nd",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/outbound/pick-confirm-2nd",
+            
+        }
+        ,{
+            "path" : "pages/outbound/pick-confirm-2nd",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/outbound/shelf-bind-2nd",
+            
+        }
+        ,{
+            "path" : "pages/outbound/shelf-bind-2nd",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/entry/bill-to-store",
+            
+        }
+        ,{
+            "path" : "pages/outbound/mater-outstore",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/entry/check-to-store",
+            
+        }
+        ,{
+            "path" : "pages/outbound/shelf-bind",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/carry/call-carry",
+            
+        }
+        ,{
+            "path" : "pages/outbound/line-transfer",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
+            
+        }
+        ,{
+            "path" : "pages/outbound/empty-vehicle-outstore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/outbound/ctu-vehicle-outstore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/bill-to-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/check-to-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/pick-yl-return-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/groupplate-instore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/entry/mater-group",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/carry/call-carry",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/entry/groupplate-instore.vue b/pages/entry/groupplate-instore.vue
new file mode 100644
index 0000000..cb1bb1d
--- /dev/null
+++ b/pages/entry/groupplate-instore.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="zd_container">
+		<!-- 组盘入库 -->
+		<nav-bar :title="title"></nav-bar>
+		<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>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">仓库名称</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料名称</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料规格</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料编号</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料数量</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料批次</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				index: '',
+				disabled: false,
+				currentData: {},
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _pdaPalletIostorinvIn () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/entry/mater-group.vue b/pages/entry/mater-group.vue
new file mode 100644
index 0000000..d495538
--- /dev/null
+++ b/pages/entry/mater-group.vue
@@ -0,0 +1,201 @@
+<template>
+	<view class="zd_container">
+		<!-- 物料组盘 -->
+		<nav-bar :title="title"></nav-bar>
+		<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>
+					<view class="zd-col-17">
+						<search-box v-model="currentData.yd_code" @handleChange="handleChange" @handleDel="handleDel" />
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box v-model="currentData.vehicle_code" @handleChange="handleChange" @handleDel="handleDel" />
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料信息</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="currentData.material_code" @tap="toJump">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料名称</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料规格</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料编码</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料批次</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="currentData.pcsn">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">物料数量</span>
+					</view>
+					<view class="zd-col-17">
+						<NumberInput v-model="currentData.qty" />
+					</view>
+				</view>
+			</view>
+		</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': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_groupMaterIn">组盘确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
+	import {storList, getStructCount, groupMaterIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			NumberInput
+		},
+		data() {
+			return {
+				title: '',
+				currentData: {},
+				options: [],
+				index: '',
+				disabled: false,
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._storList()
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.currentData = this.$store.getters.publicObj
+				if(this.currentData.stor_code !== '' && this.currentData.stor_code !== null && this.currentData.stor_code !== undefined) {
+					this.options.map(el => {
+						if (el.value === this.currentData.stor_code) {
+							this.index = el.value
+						}
+					})
+				} else {
+					if (this.currentData.vehicle_code && this.currentData.vehicle_code.charAt(0).toUpperCase() === 'T') {
+						this.index ='FStockPallet'
+					} else {
+						this.index ='FStockId'
+					}
+				}
+				if (this.currentData.vehicle_code) {
+					this._getStructCount(this.currentData.vehicle_code)
+				} else {
+					this.kwData = {}
+				}
+				this.$store.dispatch('setPublicObj', '')
+			}
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _storList () {
+				let res = await storList()
+				if (res.code === '200') {
+					this.options = [...res.content]
+					this.options.map(el => {
+						this.$set(el, 'text', el.label)
+					})
+				}
+			},
+			toJump () {
+				uni.navigateTo({
+					url: '/pages/common/mater-list?title=查询物料'
+				})
+			},
+			handleChange (e) {
+				if (e) {
+					if (e.charAt(0).toUpperCase() === 'T') {
+						this.index ='FStockPallet'
+					} else {
+						this.index ='FStockId'
+					}
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			handleDel () {
+				this.index = ''
+			},
+			toEmpty () {
+				this.currentData = {}
+				this.index = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _groupMaterIn () {
+				this.disabled = true
+				if (JSON.stringify(this.currentData) === '{}') {
+					this.disabled = false
+					return
+				}
+				try {
+					this.currentData.stor_code = this.index
+					let res = await groupMaterIn(this.index, this.currentData)
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/entry/pick-yl-return-store.vue b/pages/entry/pick-yl-return-store.vue
new file mode 100644
index 0000000..6f3319c
--- /dev/null
+++ b/pages/entry/pick-yl-return-store.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="zd_container">
+		<!-- 拣选余料回库 -->
+		<nav-bar :title="title"></nav-bar>
+		<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>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">仓库名称</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料名称</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料规格</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料编号</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料数量</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料批次</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				index: '',
+				disabled: false,
+				currentData: {},
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _pdaPalletIostorinvIn () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index a5a31d6..d2ffcbe 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -41,8 +41,8 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '单据入库', path: '/pages/entry/bill-to-store'}, {title: '盘点入库', path: '/pages/entry/check-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
-					{title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '盘点出库', path: '/pages/outbound/stock-out-store'}]},
+					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '单据入库', path: '/pages/entry/bill-to-store'}, {title: '盘点入库', path: '/pages/entry/check-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '物料组盘', path: '/pages/entry/mater-group'}]},
+					{title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '盘点出库', path: '/pages/outbound/stock-out-store'}, {title: '物料出库', path: '/pages/outbound/mater-outstore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]},
 					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
 					{title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]},
 					{title: '产线叫料', path: 'RF10', sonTree: [{title: '二楼生产出库', path: '/pages/outbound/produce-out-store-2nd'}, {title: '二楼取货确认', path: '/pages/outbound/pick-confirm-2nd'}, {title: '二楼货架绑定', path: '/pages/outbound/shelf-bind-2nd'}]},
diff --git a/pages/outbound/ctu-vehicle-outstore.vue b/pages/outbound/ctu-vehicle-outstore.vue
new file mode 100644
index 0000000..b1dd7ea
--- /dev/null
+++ b/pages/outbound/ctu-vehicle-outstore.vue
@@ -0,0 +1,124 @@
+<template>
+	<view class="zd_container">
+		<!-- CTU载具出库 -->
+		<nav-bar :title="title"></nav-bar>
+		<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>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">目标站点</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">载具数量</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="val2">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				index: '',
+				disabled: false,
+				currentData: {},
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _pdaPalletIostorinvIn () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/outbound/empty-vehicle-outstore.vue b/pages/outbound/empty-vehicle-outstore.vue
new file mode 100644
index 0000000..1cc852f
--- /dev/null
+++ b/pages/outbound/empty-vehicle-outstore.vue
@@ -0,0 +1,115 @@
+<template>
+	<view class="zd_container">
+		<!-- 空载具出库 -->
+		<nav-bar :title="title"></nav-bar>
+		<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>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">目标站点</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="val2">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val2: '',
+				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				index: '',
+				disabled: false,
+				currentData: {},
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _pdaPalletIostorinvIn () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/outbound/line-transfer.vue b/pages/outbound/line-transfer.vue
new file mode 100644
index 0000000..7603bd2
--- /dev/null
+++ b/pages/outbound/line-transfer.vue
@@ -0,0 +1,135 @@
+<template>
+	<view class="zd_container">
+		<!-- 产线转运 -->
+		<nav-bar :title="title"></nav-bar>
+		<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>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">站点类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">目标站点</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input" v-model="val2">
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">目标区域</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
+				index: '',
+				disabled: false,
+				currentData: {},
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _pdaPalletIostorinvIn () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/outbound/mater-outstore.vue b/pages/outbound/mater-outstore.vue
new file mode 100644
index 0000000..6499e20
--- /dev/null
+++ b/pages/outbound/mater-outstore.vue
@@ -0,0 +1,169 @@
+<template>
+	<view class="zd_container">
+		<!-- 物料出库 -->
+		<nav-bar :title="title"></nav-bar>
+		<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>
+					<view class="zd-col-17">
+						<search-box v-model="val1" @handleChange="handleChange" />
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">库存信息</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box v-model="val2" @handleChange="handleChange" />
+					</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" @tap="toChek(e)" :class="{'checked': pkId === e.code}">
+								<td>{{e.code}}</td>
+								<td>{{e.form_type}}</td>
+								<td>{{e.remark}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.unit_name}}</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="zd-row submit-bar">
+			<button class="zd-col-6 button-primary" @tap="seachList">查询</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {outStorageOrder, outStorageOrderList} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				id: '',
+				code: '',
+				val1: '',
+				val2: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false,
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 100
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this.id = options.id
+		},
+		created () {
+			this._outStorageOrder()
+		},
+		methods: {
+			/** 下拉框*/
+			async _outStorageOrder () {
+				let res = await outStorageOrder()
+				this.options = [...res]
+			},
+			selectChange (e) {
+				this.index = e
+				if (e) {
+					this.dataList = []
+					this.pageNum = 1
+					this.pkId = ''
+					this._outStorageOrderList(e, this.code)
+				}
+			},
+			handleChange (e) {
+				if (e) {
+					this.dataList = []
+					this.pageNum = 1
+					this.pkId = ''
+					this._outStorageOrderList(this.index, e)
+				}
+			},
+			seachList () {
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+				this._outStorageOrderList(this.index, this.code)
+			},
+			async _outStorageOrderList (index, e) {
+				let res = await outStorageOrderList(this.pageNum + '', this.pageSize + '', index, e)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						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._outStorageOrderList(this.index, this.code)
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toChek (e) {
+				this.pkId = this.pkId === e.code ? '' : e.code
+				this.pkObj = this.pkId === e.code ? e : {}
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateTo({
+						url: '/pages/outbound/bill-out-store?title=单据出库'
+					})
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue
index d97c820..4d2085f 100644
--- a/pages/outbound/out-store-confirm.vue
+++ b/pages/outbound/out-store-confirm.vue
@@ -6,7 +6,7 @@
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">载具编码</span>
+						<span class="filter_label">载具信息</span>
 					</view>
 					<view class="zd-col-24">
 						<search-box
@@ -14,11 +14,60 @@
 						/>
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料名称</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料规格</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料编号</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料批次</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">物料数量</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label filter_input_disabled">出库数量</span>
+					</view>
+					<view class="zd-col-17">
+						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_ioStorageOut">扫码出库确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_ioStorageOut">强制确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_ioStorageOut">出库确认</button>
 		</view>
 	</view>
 </template>
@@ -35,6 +84,7 @@
 		data() {
 			return {
 				code: '',
+				currentData: {},
 				disabled: false
 			};
 		},
diff --git a/pages/outbound/shelf-bind.vue b/pages/outbound/shelf-bind.vue
new file mode 100644
index 0000000..ffa5b4a
--- /dev/null
+++ b/pages/outbound/shelf-bind.vue
@@ -0,0 +1,115 @@
+<template>
+	<view class="zd_container">
+		<!-- 货架绑定 -->
+		<nav-bar :title="title"></nav-bar>
+		<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>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">货架编号</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val2"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">绑定</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">解绑</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStructCount, pdaPalletIostorinvIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				disabled: false,
+				kwData: {}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			handleChange (e) {
+				if (e) {
+					this._getStructCount(e)
+				}
+			},
+			async _getStructCount (e) {
+				try {
+					let res = await getStructCount(e)
+					if (res) {
+						this.kwData = res
+					} else {
+						this.kwData = {}
+					}
+				} catch (e) {
+					this.kwData = {}
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.disabled = false
+			},
+			async _pdaPalletIostorinvIn () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaPalletIostorinvIn(this.val1, this.index)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+
+</style>