diff --git a/pages.json b/pages.json
index ddb6bca..ee6ebda 100644
--- a/pages.json
+++ b/pages.json
@@ -322,70 +322,77 @@
             }
         }
         ,{
-            "path" : "pages/xzhy/kzj-out-store",
+            "path" : "pages/Xzhy/kzj-out-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
         }
         ,{
-            "path" : "pages/xzhy/kzj-in-store",
+            "path" : "pages/Xzhy/kzj-in-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
         }
         ,{
-            "path" : "pages/xzhy/xlx-in-store",
+            "path" : "pages/Xzhy/xlx-in-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
         }
         ,{
-            "path" : "pages/xzhy/kzj-inout-store",
+            "path" : "pages/Xzhy/kzj-inout-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
         }
         ,{
-            "path" : "pages/xzhy/lx-in-store",
+            "path" : "pages/Xzhy/lx-in-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
         }
         ,{
-            "path" : "pages/xzhy/mater-in-store",
+            "path" : "pages/Xzhy/mater-in-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
         }
         ,{
-            "path" : "pages/xzhy/dlx-out-store",
+            "path" : "pages/Xzhy/dlx-out-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
         }
         ,{
-            "path" : "pages/xzhy/tuiku-confirm",
+            "path" : "pages/Xzhy/tuiku-confirm",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
         }
         ,{
-            "path" : "pages/xzhy/dlx-move-store",
+            "path" : "pages/Xzhy/dlx-move-store",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
         }
         ,{
-            "path" : "pages/xzhy/dlx-pan-store",
+            "path" : "pages/Xzhy/dlx-pan-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+        }
+        ,{
+            "path" : "pages/Xzhy/mater-save",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index a25d3aa..5e413ad 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -43,8 +43,8 @@
 				userName: '',
 				menuList: [
 					{title: '通用功能', path: 'RF06', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}]},
-					{title: '小料箱功能', path: 'RF03', sonTree: [{title: '空载具出库', path: '/pages/xzhy/kzj-out-store'}, {title: '空载具入库', path: '/pages/xzhy/kzj-in-store'}, {title: '小料箱入库', path: '/pages/xzhy/xlx-in-store'}]},
-					{title: '大料箱功能', path: 'RF04', sonTree: [{title: '空载具出入库', path: '/pages/xzhy/kzj-inout-store'}, {title: '料箱入库', path: '/pages/xzhy/lx-in-store'}, {title: '物料入库', path: '/pages/xzhy/mater-in-store'}, {title: '大料箱出库', path: '/pages/xzhy/dlx-out-store'}, {title: '退库确认', path: '/pages/xzhy/tuiku-confirm'}, {title: '大料箱移库', path: '/pages/xzhy/dlx-move-store'}, {title: '大料箱盘库', path: '/pages/xzhy/dlx-pan-store'}]},
+					{title: '小料箱功能', path: 'RF03', sonTree: [{title: '空载具出库', path: '/pages/Xzhy/kzj-out-store'}, {title: '空载具入库', path: '/pages/Xzhy/kzj-in-store'}, {title: '小料箱入库', path: '/pages/Xzhy/xlx-in-store'}]},
+					{title: '大料箱功能', path: 'RF04', sonTree: [{title: '空载具出入库', path: '/pages/Xzhy/kzj-inout-store'}, {title: '料箱入库', path: '/pages/Xzhy/lx-in-store'}, {title: '物料入库', path: '/pages/Xzhy/mater-in-store'}, {title: '大料箱出库', path: '/pages/Xzhy/dlx-out-store'}, {title: '退库确认', path: '/pages/Xzhy/tuiku-confirm'}, {title: '大料箱移库', path: '/pages/Xzhy/dlx-move-store'}, {title: '大料箱盘库', path: '/pages/Xzhy/dlx-pan-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: '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: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
diff --git a/pages/xzhy/dlx-move-store.vue b/pages/xzhy/dlx-move-store.vue
index ffff41e..2d8db10 100644
--- a/pages/xzhy/dlx-move-store.vue
+++ b/pages/xzhy/dlx-move-store.vue
@@ -1,20 +1,12 @@
 <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>
+						<span class="filter_label">移出</span>
 					</view>
 					<view class="zd-col-24 filter_select">
 						<search-box
@@ -28,17 +20,22 @@
 					<table>
 						<thead>
 							<tr>
-								<th>任务类型</th>
-								<th>任务编码</th>
-								<th>载具编码</th>
-								<th>状态</th>
-								<th>起点</th>
-								<th>终点</th>
-								<th>创建时间</th>
+								<th>序号</th>
+								<th>点位</th>
+								<th>载具</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>重量(kg)</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.task_code === pkId}">
+								<td>{{i+1}}</td>
 								<td>{{e.task_type}}</td>
 								<td>{{e.task_code}}</td>
 								<td>{{e.vehicle_code}}</td>
@@ -46,6 +43,60 @@
 								<td>{{e.point_code1}}</td>
 								<td>{{e.point_code2}}</td>
 								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</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_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">
+						<search-box
+						v-model="val1"
+						/>
+					</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>重量(kg)</th>
+								<th>生产日期</th>
+								<th>供应商编码</th>
+								<th>供应商名称</th>
+								<th>烘干次数</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList2" :key="i" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
+								<td>{{i+1}}</td>
+								<td>{{e.task_type}}</td>
+								<td>{{e.task_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.status}}</td>
+								<td>{{e.point_code1}}</td>
+								<td>{{e.point_code2}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -54,10 +105,8 @@
 			<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" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
-			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">确认移库</button>
+			<!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button> -->
 		</view>
 	</view>
 </template>
@@ -74,10 +123,10 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				index: '',
 				val1: '',
+				val2: '',
 				dataList: [],
+				dataList2: [],
 				pkId: '',
 				reload: false,
 				status: 'more',
@@ -94,19 +143,8 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._getStatusEnum()
 		},
 		methods: {
-			async _getStatusEnum () {
-				let res = await getStatusEnum()
-				this.options = [...res]
-				this.options.map(el => {
-					this.$set(el, 'text', el.label)
-				})
-			},
-			selectChange (e) {
-				this.index = e
-			},
 			searchList () {
 				this.dataList = []
 				this.pageNum = 1
diff --git a/pages/xzhy/dlx-out-store.vue b/pages/xzhy/dlx-out-store.vue
index ffff41e..b447f29 100644
--- a/pages/xzhy/dlx-out-store.vue
+++ b/pages/xzhy/dlx-out-store.vue
@@ -1,12 +1,12 @@
 <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>
+						<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>
@@ -14,7 +14,7 @@
 				</view>
 				<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 filter_select">
 						<search-box
@@ -28,17 +28,25 @@
 					<table>
 						<thead>
 							<tr>
-								<th>任务类型</th>
-								<th>任务编码</th>
-								<th>载具编码</th>
-								<th>状态</th>
-								<th>起点</th>
-								<th>终点</th>
-								<th>创建时间</th>
+								<th>序号</th>
+								<th>单据号</th>
+								<th>单据类型</th>
+								<th>点位</th>
+								<th>载具</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>重量(kg)</th>
+								<th>出库重量(kg)</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.task_code === pkId}">
+								<td>{{i+1}}</td>
 								<td>{{e.task_type}}</td>
 								<td>{{e.task_code}}</td>
 								<td>{{e.vehicle_code}}</td>
@@ -46,6 +54,12 @@
 								<td>{{e.point_code1}}</td>
 								<td>{{e.point_code2}}</td>
 								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -54,10 +68,8 @@
 			<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" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
-			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">确认入库</button>
+			<button class="zd-col-6 button-primary" @tap="searchList">查询</button>
 		</view>
 	</view>
 </template>
@@ -77,6 +89,7 @@
 				options: [],
 				index: '',
 				val1: '',
+				val2: '',
 				dataList: [],
 				pkId: '',
 				reload: false,
diff --git a/pages/xzhy/dlx-pan-store.vue b/pages/xzhy/dlx-pan-store.vue
index ffff41e..e9c6871 100644
--- a/pages/xzhy/dlx-pan-store.vue
+++ b/pages/xzhy/dlx-pan-store.vue
@@ -1,20 +1,12 @@
 <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>
+						<span class="filter_label">单据</span>
 					</view>
 					<view class="zd-col-24 filter_select">
 						<search-box
@@ -28,17 +20,25 @@
 					<table>
 						<thead>
 							<tr>
-								<th>任务类型</th>
-								<th>任务编码</th>
-								<th>载具编码</th>
+								<th>序号</th>
 								<th>状态</th>
-								<th>起点</th>
-								<th>终点</th>
-								<th>创建时间</th>
+								<th>点位</th>
+								<th>载具</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>重量(kg)</th>
+								<th>盘点重量(kg)</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.task_code === pkId}">
+								<td>{{i+1}}</td>
+								<td>{{e.task_type}}</td>
 								<td>{{e.task_type}}</td>
 								<td>{{e.task_code}}</td>
 								<td>{{e.vehicle_code}}</td>
@@ -46,6 +46,10 @@
 								<td>{{e.point_code1}}</td>
 								<td>{{e.point_code2}}</td>
 								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -54,10 +58,8 @@
 			<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" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
-			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">扫码盘点</button>
+			<button class="zd-col-6 button-primary" @tap="searchList">查询</button>
 		</view>
 	</view>
 </template>
@@ -74,9 +76,8 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				index: '',
 				val1: '',
+				val2: '',
 				dataList: [],
 				pkId: '',
 				reload: false,
@@ -94,19 +95,8 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._getStatusEnum()
 		},
 		methods: {
-			async _getStatusEnum () {
-				let res = await getStatusEnum()
-				this.options = [...res]
-				this.options.map(el => {
-					this.$set(el, 'text', el.label)
-				})
-			},
-			selectChange (e) {
-				this.index = e
-			},
 			searchList () {
 				this.dataList = []
 				this.pageNum = 1
diff --git a/pages/xzhy/kzj-inout-store.vue b/pages/xzhy/kzj-inout-store.vue
index ffff41e..da33436 100644
--- a/pages/xzhy/kzj-inout-store.vue
+++ b/pages/xzhy/kzj-inout-store.vue
@@ -1,63 +1,43 @@
 <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>
+						<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-24 filter_select">
+					<view class="zd-col-17">
 						<search-box
 						v-model="val1"
 						/>
 					</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>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
-								<td>{{e.task_type}}</td>
-								<td>{{e.task_code}}</td>
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.status}}</td>
-								<td>{{e.point_code1}}</td>
-								<td>{{e.point_code2}}</td>
-								<td>{{e.create_time}}</td>
-							</tr>
-						</tbody>
-					</table>
+				<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"
+						/>
+					</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>
-			<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" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
-			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<!-- <button class="zd-col-6 button-default" @tap="clearUp">清空</button> -->
+			<button class="zd-col-11 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_vehicleInConfirm">绑定</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_vehicleInConfirm">解绑</button>
 		</view>
 	</view>
 </template>
@@ -65,7 +45,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getStatusEnum, schBaseTask, saveCheckTask} from '@/utils/getData2.js'
+	import {getPdaSect, getPointCodeByVehicleCode, vehicleInConfirm} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -74,103 +54,84 @@
 		data() {
 			return {
 				title: '',
+				val1: '',
+				val2: '',
 				options: [],
 				index: '',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				reload: false,
-				status: 'more',
-				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
-				},
-				totalCount: 0,
-				pageNum: 1,
-				pageSize: 10,
 				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._getStatusEnum()
+		},
+		created () {
+			this._getPdaSect()
 		},
 		methods: {
-			async _getStatusEnum () {
-				let res = await getStatusEnum()
-				this.options = [...res]
-				this.options.map(el => {
-					this.$set(el, 'text', el.label)
-				})
+			handleChange (e) {
+				if (e) {
+					this._getPointCodeByVehicleCode()
+				}
+			},
+			async _getPdaSect () {
+				try {
+					let res = await getPdaSect()
+					if (res) {
+						this.options = res.data
+					} else {
+						this.options = []
+					}
+				} catch (e) {
+					this.options = []
+				}
 			},
 			selectChange (e) {
 				this.index = e
 			},
-			searchList () {
-				this.dataList = []
-				this.pageNum = 1
-				this._schBaseTask()
+			clearUp () {
+				this.val1 = ''
+				this.index = ''
+				this.disabled = false
 			},
-			async _schBaseTask () {
-				let res = await schBaseTask(this.pageNum + '', this.pageSize + '', this.index, this.val1)
-				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
+			async _getPointCodeByVehicleCode () {
+				try {
+					let res = await getPointCodeByVehicleCode(this.val1)
+					if (res.code === '200') {
+						this.val2 = res.data
 					} else {
-						this.dataList = []
-					}
-					if (this.totalCount == this.dataList.length) {
-						this.reload = false
-						this.status = 'noMore'
 					}
+				} catch (e) {
 				}
 			},
-			onReachBottom () {
-				if (this.totalCount > this.dataList.length) {
-					this.status = 'loading'
-					setTimeout(() => {
-						this.pageNum++
-						this._schBaseTask()
-					}, 1000)
-				} else { //停止加载
-					this.status = 'noMore'
-				}
-			},
-			toCheck (e) {
-				this.pkId = e.e.task_code === this.pkId ? '' : e.task_code
-			},
-			async toSure (status) {
+			async _vehicleInConfirm () {
 				this.disabled = true
-				if (!this.pkId) {
+				if (!this.val1 || !this.val2 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await saveCheckTask(this.pkId, status)
+					let res = await vehicleInConfirm(this.val1, this.index, this.val2)
 					if (res.code === '200') {
-						this.index = ''
-						this.val1 = ''
-						this.dataList = []
-						this.pkId = ''
 						uni.showToast({
-							title: res.desc,
+							title: res.message,
 							icon: 'none'
 						})
+						this.clearUp()
 					} else {
 						uni.showToast({
-							title: res.desc,
+							title: res.message,
 							icon: 'none'
 						})
+						this.disabled = false
 					}
-					this.disabled = false
 				} catch (e) {
 					this.disabled = false
 				}
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>
+
+<style lang="stylus">
+
+</style>
diff --git a/pages/xzhy/lx-in-store.vue b/pages/xzhy/lx-in-store.vue
index ffff41e..0e3ca44 100644
--- a/pages/xzhy/lx-in-store.vue
+++ b/pages/xzhy/lx-in-store.vue
@@ -1,12 +1,12 @@
 <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>
+						<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>
@@ -14,7 +14,7 @@
 				</view>
 				<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 filter_select">
 						<search-box
@@ -22,23 +22,41 @@
 						/>
 					</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">
+						<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>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>重量(kg)</th>
+								<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.task_code === pkId}">
+								<td>{{i+1}}</td>
 								<td>{{e.task_type}}</td>
 								<td>{{e.task_code}}</td>
 								<td>{{e.vehicle_code}}</td>
@@ -46,6 +64,12 @@
 								<td>{{e.point_code1}}</td>
 								<td>{{e.point_code2}}</td>
 								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -54,10 +78,8 @@
 			<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" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
-			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">确认入库</button>
+			<!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button> -->
 		</view>
 	</view>
 </template>
@@ -77,6 +99,7 @@
 				options: [],
 				index: '',
 				val1: '',
+				val2: '',
 				dataList: [],
 				pkId: '',
 				reload: false,
diff --git a/pages/xzhy/mater-in-store.vue b/pages/xzhy/mater-in-store.vue
index ffff41e..b6c4a21 100644
--- a/pages/xzhy/mater-in-store.vue
+++ b/pages/xzhy/mater-in-store.vue
@@ -1,12 +1,12 @@
 <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>
+						<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>
@@ -14,7 +14,7 @@
 				</view>
 				<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 filter_select">
 						<search-box
@@ -22,23 +22,41 @@
 						/>
 					</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">
+						<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>物料编码</th>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>重量(kg)</th>
+								<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.task_code === pkId}">
+								<td>{{i+1}}</td>
 								<td>{{e.task_type}}</td>
 								<td>{{e.task_code}}</td>
 								<td>{{e.vehicle_code}}</td>
@@ -46,6 +64,12 @@
 								<td>{{e.point_code1}}</td>
 								<td>{{e.point_code2}}</td>
 								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -54,10 +78,8 @@
 			<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" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
-			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">确认入库</button>
+			<!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button> -->
 		</view>
 	</view>
 </template>
@@ -77,6 +99,7 @@
 				options: [],
 				index: '',
 				val1: '',
+				val2: '',
 				dataList: [],
 				pkId: '',
 				reload: false,
diff --git a/pages/xzhy/mater-save.vue b/pages/xzhy/mater-save.vue
new file mode 100644
index 0000000..46b2df5
--- /dev/null
+++ b/pages/xzhy/mater-save.vue
@@ -0,0 +1,161 @@
+<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">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">入库数量(KG)</span>
+					</view>
+					<view class="zd-col-16">
+						<NumberInput v-model="qty" />
+					</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>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.task_code === pkId}">
+								<td>{{e.task_type}}</td>
+								<td>{{e.task_type}}</td>
+								<td>{{e.task_code}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.status}}</td>
+								<td>{{e.status}}</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-16 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure">确定入库</button>
+			<button class="zd-col-6 button-primary" @tap="searchList">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getStatusEnum, schBaseTask, saveCheckTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				dataList: [],
+				pkId: '',
+				qty: '',
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._schBaseTask()
+			},
+			async _schBaseTask () {
+				let res = await schBaseTask(this.pageNum + '', this.pageSize + '', this.index, this.val1)
+				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._schBaseTask()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = e.e.task_code === this.pkId ? '' : e.task_code
+			},
+			async toSure (status) {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await saveCheckTask(this.pkId, status)
+					if (res.code === '200') {
+						this.index = ''
+						this.val1 = ''
+						this.dataList = []
+						this.pkId = ''
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					} else {
+						uni.showToast({
+							title: res.desc,
+							icon: 'none'
+						})
+					}
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/xzhy/tuiku-confirm.vue b/pages/xzhy/tuiku-confirm.vue
index ffff41e..9000dcd 100644
--- a/pages/xzhy/tuiku-confirm.vue
+++ b/pages/xzhy/tuiku-confirm.vue
@@ -1,44 +1,69 @@
 <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>
+						<span class="filter_label">载具</span>
 					</view>
 					<view class="zd-col-24 filter_select">
 						<search-box
 						v-model="val1"
+						@handleChange="handleChange"
 						/>
 					</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.material_spec" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">剩余物料(KG)</span>
+					</view>
+					<view class="zd-col-16">
+						<NumberInput v-model="qty" />
+					</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>
+								<th>物料名称</th>
+								<th>批号</th>
+								<th>重量(kg)</th>
+								<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.task_code === pkId}">
+								<td>{{i+1}}</td>
 								<td>{{e.task_type}}</td>
 								<td>{{e.task_code}}</td>
 								<td>{{e.vehicle_code}}</td>
@@ -46,6 +71,12 @@
 								<td>{{e.point_code1}}</td>
 								<td>{{e.point_code2}}</td>
 								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_time}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -54,10 +85,8 @@
 			<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" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
-			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">确认退回</button>
+			<!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button> -->
 		</view>
 	</view>
 </template>
@@ -65,7 +94,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getStatusEnum, schBaseTask, saveCheckTask} from '@/utils/getData2.js'
+	import {schBaseTask, saveCheckTask} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -74,9 +103,9 @@
 		data() {
 			return {
 				title: '',
-				options: [],
-				index: '',
 				val1: '',
+				qty: '',
+				currentData: {},
 				dataList: [],
 				pkId: '',
 				reload: false,
@@ -94,18 +123,12 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._getStatusEnum()
 		},
 		methods: {
-			async _getStatusEnum () {
-				let res = await getStatusEnum()
-				this.options = [...res]
-				this.options.map(el => {
-					this.$set(el, 'text', el.label)
-				})
-			},
-			selectChange (e) {
-				this.index = e
+			handleChange (e) {
+				if (e) {
+					this.searchList()
+				}
 			},
 			searchList () {
 				this.dataList = []
diff --git a/pages/xzhy/xlx-in-store.vue b/pages/xzhy/xlx-in-store.vue
index 1ccb44a..acbfd67 100644
--- a/pages/xzhy/xlx-in-store.vue
+++ b/pages/xzhy/xlx-in-store.vue
@@ -78,10 +78,8 @@
 			<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" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">强制完成</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('90')">取消</button>
-			<button class="zd-col-5 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="toSure('80')">确认入库</button>
+			<!-- <button class="zd-col-6 button-primary" @tap="searchList">查询</button> -->
 		</view>
 	</view>
 </template>