diff --git a/common/style/layout.css b/common/style/layout.css
index 615cd2c..94f77f2 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -84,6 +84,7 @@ uni-button:after {
 }
 .filter_item {
 	display: flex;
+	align-items: center;
 	width: 100%;
 	margin-bottom: 10rpx;
 }
@@ -110,6 +111,23 @@ uni-button:after {
 .filter_label_1 {
 	line-height: 30rpx;
 }
+.filter_search {
+	width: 100rpx;
+	height: 70rpx;
+	line-height: 70rpx;
+	font-size: 28rpx;
+	color: #323232;
+	text-align: center;
+	background-color: #fff;
+	border: 1px solid #ff6a00;
+	border-radius: 10rpx;
+	margin-left: 30rpx;
+}
+.filter_search_disabled {
+	background-color: #dcdfe6;
+	border: 1px solid #dcdfe6;
+	color: #fff;
+}
 .filter_input_wraper {
 	flex: 1;
 	height: 80rpx;
diff --git a/pages.json b/pages.json
index d241153..9b6e893 100644
--- a/pages.json
+++ b/pages.json
@@ -66,6 +66,12 @@
 		    	"navigationStyle": "custom"
 		    }  
 		}
+		,{
+		    "path" : "pages/ProductManage/ZjInStore",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
 		,{
 		    "path" : "pages/ProductManage/ZjOutStore",
 		    "style": {
@@ -156,6 +162,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/ProductManage/ZjInStore",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/ProductManage/ZjInStore.vue b/pages/ProductManage/ZjInStore.vue
new file mode 100644
index 0000000..c67ba89
--- /dev/null
+++ b/pages/ProductManage/ZjInStore.vue
@@ -0,0 +1,161 @@
+<template>
+	<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">设备</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">点位</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+					<view class="filter_search" :class="{'filter_search_disabled': !val1}" @tap="_devicePointQuery">查询</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">区域</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></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>生产日期</th>
+								
+								
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.mfg_order_name === pkId}">
+								<td>{{Number(i) + 1}}</td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.delivery_code}}</td>
+								<td>{{e.is_child_ps_ok}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_inConfirm">上空轴</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 {devicePointQuery, queryProductArea, queryMaterialInfo5, inConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+			this._queryProductArea()
+			this._queryMaterialInfo()
+		},
+		methods: {
+			/** 选择器 */
+			selectChange1(e) {
+				this.index = e
+			},
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 点位下拉框查询 */
+			async _devicePointQuery () {
+				if (!this.val1) {
+					uni.showToast({
+						title: '请输入设备号',
+						icon: 'none'
+					})
+					return
+				}
+				let res = await devicePointQuery(this.val1)
+				this.options1 = [...res.data]
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options2 = [...res.data]
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				let res = await queryMaterialInfo5(this.val1, this.index2)
+				this.dataList = [...res.data]	
+			},
+			/** 确认 */
+			async _inConfirm () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await inConfirm(this.index1, this.pkObj)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this._queryMaterialInfo()
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.mfg_order_name ? '' : e.mfg_order_name
+				this.pkObj = this.pkId === e.mfg_order_name ? e : {}
+			}
+		}
+	}
+</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
+		z-index 102
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+</style>
diff --git a/pages/ProductManage/ZjOutStore.vue b/pages/ProductManage/ZjOutStore.vue
index 94db6d4..72610f3 100644
--- a/pages/ProductManage/ZjOutStore.vue
+++ b/pages/ProductManage/ZjOutStore.vue
@@ -4,19 +4,31 @@
 		<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_label">设备</view>
 					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
+						<input type="text" class="filter_input" v-model="val1">
 					</view>
 				</view>
+				<view class="filter_item">
+					<view class="filter_label">点位</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+					<view class="filter_search" :class="{'filter_search_disabled': !val1}" @tap="_devicePointQuery">查询</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>
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label filter_label_1"></span>
+					</view>
+					<view class="filter_input_wraper filter_input_wraper_1">
+						<view class="iconfont icon_unchecked" :class="{'icon_checked': isV === '1'}" @tap="isVirtual">&#xe66b;</view>
+						<view class="filter_input_wraper_inn_text">末次下卷</view>
 					</view>
 				</view>
 			</view>
@@ -75,7 +87,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryProductArea, queryMaterialInfo4, outConfirm} from '@/utils/getData2.js'
+	import {devicePointQuery, queryProductArea, queryMaterialInfo4, outConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -84,10 +96,11 @@
 		data() {
 			return {
 				val1: '',
-				val2: '',
-				options: [],
-				index: '',
-				qty: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				isV: '0',
 				dataList: [],
 				disabled: false,
 				checkArr: []
@@ -98,18 +111,37 @@
 			this._queryMaterialInfo()
 		},
 		methods: {
+			/** 末次下卷 */
+			isVirtual () {
+				this.isV = this.isV === '0' ? '1' : '0'
+			},
 			/** 选择器 */
-			selectChange(e) {
+			selectChange1(e) {
 				this.index = e
 			},
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 点位下拉框查询 */
+			async _devicePointQuery () {
+				if (!this.val1) {
+					uni.showToast({
+						title: '请输入设备号',
+						icon: 'none'
+					})
+					return
+				}
+				let res = await devicePointQuery(this.val1)
+				this.options1 = [...res.data]
+			},
 			/** 生产区域下拉框查询 */
 			async _queryProductArea () {
 				let res = await queryProductArea()
-				this.options = [...res.data]
+				this.options2 = [...res.data]
 			},
 			/** 初始化查询 */
 			async _queryMaterialInfo () {
-				let res = await queryMaterialInfo4(this.val1, this.index)
+				let res = await queryMaterialInfo4(this.val1, this.index2)
 				res.data.map(el => {
 					this.$set(el, 'checked', false)
 				})
@@ -123,13 +155,14 @@
 					return
 				}
 				try {
-					let res = await outConfirm(this.val1, this.checkArr)
+					let res = await outConfirm(this.index1, this.checkArr, this.isV)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
 					this.disabled = false
 					this.checkArr = []
+					this.isV = '0'
 					this._queryMaterialInfo()
 				} catch (e) {
 					this.disabled = false
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5137b80..1fe344d 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,7 +24,7 @@
 	export default {
 		data() {
 			return {
-				menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/EmptyPipeOutStore', name: '空管出库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '生产入库'}, {url: '/pages/WarehouseManage/ProdDeliveryConfirm', name: '生产区发货确认'}, {url: '/pages/WarehouseManage/XuniDelivery', name: '虚拟区发货'}, {url: '/pages/WarehouseManage/EmptyInStore', name: '空载具入库'}, {url: '/pages/WarehouseManage/EmptyOutStore', name: '空载具出库'}]
+				menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/EmptyPipeOutStore', name: '空管出库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjInStore', name: '子卷进站'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '生产入库'}, {url: '/pages/WarehouseManage/ProdDeliveryConfirm', name: '生产区发货确认'}, {url: '/pages/WarehouseManage/XuniDelivery', name: '虚拟区发货'}, {url: '/pages/WarehouseManage/EmptyInStore', name: '空载具入库'}, {url: '/pages/WarehouseManage/EmptyOutStore', name: '空载具出库'}]
 			};
 		},
 		mounted () {
diff --git a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
index 524a096..85877ca 100644
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -204,7 +204,8 @@
 			},
 
 			toggleSelector() {
-				this.showSelector = !this.showSelector
+				this.showSelector = !this.showSelector
+				this.$emit('showSelector', this.showSelector)
 			},
 			formatItemName(item) {
 				let {
diff --git a/utils/getData2.js b/utils/getData2.js
index d4e874c..bfd4987 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -79,6 +79,33 @@ export const shippingConfirm = (rows, code) => request({
 	}
 })
 
+/**
+ * 子卷进站
+ */
+// 1.1分切计划初始化查询
+export const queryMaterialInfo5 = (code, area) => request({
+	url:'api/pda/in/queryMaterialInfo',
+	data: {
+		device_code: code,
+		product_area: area
+	}
+})
+// 1.2子卷入站
+export const inConfirm = (code, rows) => request({
+	url:'api/pda/in/confirm',
+	data: {
+		point_code: code,
+		cut_rows: rows
+	}
+})
+// 1.3点位查询
+export const devicePointQuery = (code) => request({
+	url:'api/pda/in/devicePointQuery',
+	data: {
+		device_code: code
+	}
+})
+
 /**
  * 子卷出站
  */
@@ -86,16 +113,17 @@ export const shippingConfirm = (rows, code) => request({
 export const queryMaterialInfo4 = (code, area) => request({
 	url:'api/pda/out/queryMaterialInfo',
 	data: {
-		point_code: code,
+		device_code: code,
 		product_area: area
 	}
 })
 // 1.2子卷出站
-export const outConfirm = (code, rows) => request({
+export const outConfirm = (code, rows, is) => request({
 	url:'api/pda/out/confirm',
 	data: {
 		point_code: code,
-		cut_rows: rows
+		cut_rows: rows,
+		is_last: is
 	}
 })