diff --git a/pages.json b/pages.json
index 54578d8..bf4edfe 100644
--- a/pages.json
+++ b/pages.json
@@ -25,383 +25,23 @@
 		    }  
 		}
         ,{
-            "path" : "pages/manage/cbj-carry",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
+		    "path" : "pages/lines/zp-line",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
         }
         ,{
-            "path" : "pages/manage/press-carry",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
+		    "path" : "pages/lines/hj-line",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
         }
         ,{
-            "path" : "pages/manage/mater-scrap",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/man-sort",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/task-manage",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/inst-manage",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/yzhnml-carry",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/vehicle-unbind",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/group-task",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/entry/group-to-store",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/entry/empty-tray-to-store",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/tray-out-store",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/out-store-confirm",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/in/store-info",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/pick/pick-task",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/task/task-manage",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom",
-                "enablePullDownRefresh": true,
-                "onReachBottomDistance": 50
-            }
-            
-        }
-        ,{
-            "path" : "pages/entry/document",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom",
-                "enablePullDownRefresh": true,
-                "onReachBottomDistance": 50
-            }
-            
-        }
-        ,{
-            "path" : "pages/pick/pick-list",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/check/check-task",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/entry/mater-group-to-store",
-            "style" :                                                                                    
-            {
-               "navigationStyle": "custom" 
-            }
-            
-        }
-        ,{
-            "path" : "pages/mode/switch-in-out",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/common/mater-list",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom",
-                "enablePullDownRefresh": true,
-                "onReachBottomDistance": 50
-            }
-            
-        }
-        ,{
-            "path" : "pages/mode/pick",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/mode/command",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/bill-out-store",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/bill-list",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom",
-                "enablePullDownRefresh": true,
-                "onReachBottomDistance": 50
-            }
-            
-        }
-        ,{
-            "path" : "pages/entry/qualified-to-store",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/transfer/tray-transfer",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/stock-out-store",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/stock-list",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom",
-                "enablePullDownRefresh": true,
-                "onReachBottomDistance": 50
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/produce-out-store-2nd",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/pick-confirm-2nd",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/shelf-bind-2nd",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/mater-outstore",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/line-callmater",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/outbound/shelf-bind",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "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/entry/empty-vehicle-instore",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/carry/call-carry",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
+		    "path" : "pages/lines/zp-line-dtd",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
+		}
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/entry/bill-to-store.vue b/pages/entry/bill-to-store.vue
deleted file mode 100644
index 7396a23..0000000
--- a/pages/entry/bill-to-store.vue
+++ /dev/null
@@ -1,343 +0,0 @@
-<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-9">
-						<span class="filter_label">入库单类型</span>
-					</view>
-					<view class="zd-col-24 filter_select">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
-						<span class="filter_label">单据编码</span>
-					</view>
-					<view class="zd-col-12">
-						<search-box v-model="code" @handleChange="handleChange1" @handleDel="handleDel1" />
-					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="toSearch">查询</button>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
-						<span class="filter_label filter_input_disabled">物料名称</span>
-					</view>
-					<view class="zd-col-18">
-						<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-6">
-						<span class="filter_label filter_input_disabled">物料规格</span>
-					</view>
-					<view class="zd-col-18">
-						<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-6">
-						<span class="filter_label filter_input_disabled">单位</span>
-					</view>
-					<view class="zd-col-18">
-						<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-6">
-						<span class="filter_label">物料批次</span>
-					</view>
-					<view class="zd-col-18">
-						<input type="text" class="filter_input" v-model="currentData.pcsn">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
-						<span class="filter_label">物料数量</span>
-					</view>
-					<view class="zd-col-18">
-						<input type="number" class="filter_input" v-model="val1">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
-						<span class="filter_label">载具编码</span>
-					</view>
-					<view class="zd-col-18">
-						<search-box v-model="val2" @handleChange="handleChange2" @handleDel="handleDel2" />
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-6">
-						<span class="filter_label">仓库编码</span>
-					</view>
-					<view class="zd-col-18 filter_select">
-						<!-- <search-box v-model="currentData.stor_code"/> -->
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
-			</view>
-			<view class="filter_label">当前库位可用数：</view>
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
-					</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': !val1 || !val1 || !index || !index1}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
-		</view>
-		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
-			<view class="pop-line"></view>
-			<view class="msg_content">
-				<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" :class="{'checked': e.material_code === pkId}" @tap="toCheck(e)">
-									<td>{{i+1}}</td>
-									<td>{{e.material_code}}</td>
-									<td>{{e.material_name}}</td>
-									<td>{{e.qty}}</td>
-									<td>{{e.unit_name}}</td>
-									<td>{{e.bill_status}}</td>
-									<td>{{e.pcsn}}</td>
-									
-								</tr>
-							</tbody>
-						</table>
-					</view>
-				</view>
-			</view>
-			<view class="zd-row submit-bar">
-				<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
-				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="confirmModal">确定</button>
-			</view>
-		</view>
-		<view v-if="show" class="msg_mask"></view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getStructCount, inStorageOrder, getBillNoInfo, storList, inStorageConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				code: '',
-				show: false,
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				currentData: {},
-				val1: null,
-				val2: null,
-				options: [],
-				index: '',
-				disabled: false,
-				options1: [],
-				index1: '',
-				kwData: {}
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-			this._inStorageOrder()
-			this._storList()
-		},
-		methods: {
-			/** 下拉框*/
-			async _inStorageOrder () {
-				let res = await inStorageOrder()
-				this.options1 = [...res]
-			},
-			selectChange1 (e) {
-				this.index1 = e
-			},
-			handleChange1 (e) {
-				if (e) {
-					this._getBillNoInfo(e)
-				}
-			},
-			handleDel1 () {
-				this.pkId = ''
-				this.currentData = {}
-				this.index = ''
-				this.val1 = ''
-				this.val2 = ''
-			},
-			toSearch () {
-				if (this.code) {
-					this._getBillNoInfo(this.code)
-				} else {
-					uni.showToast({
-						title: '请扫码',
-						icon: 'none'
-					})
-				}
-			},
-			async _getBillNoInfo (e) {
-				try {
-					let res = await getBillNoInfo(e, this.index1)
-					if (res && res.length) {
-						this.dataList = [...res]
-						this.pkId = ''
-						this.pkObj = {}
-						this.currentData = {}
-						this.index = ''
-						this.val1 = null
-						this.val2 = null
-						this.show = true
-					}
-				} catch (e) {}
-			},
-			toCheck (e) {
-				if (e.status === '80') {
-					return
-				}
-				this.pkId = this.pkId === e.material_code ? '' : e.material_code
-				this.pkObj = this.pkId === e.material_code ? e : {}
-			},
-			confirmModal () {
-				if (!this.pkId) {
-					uni.showToast({
-						title: '请选择一行',
-						icon: 'none'
-					})
-					return
-				}
-				this.show = false
-				this.currentData = this.pkObj
-				this.val1 = this.currentData.qty
-				this.val2 = this.currentData.vehicle_code
-				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.val2.charAt(0).toUpperCase() === 'T') {
-						this.index ='FStockPallet'
-					} else {
-						this.index ='FStockId'
-					}
-				}
-			},
-			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)
-					})
-				}
-			},
-			handleChange2 (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 = {}
-				}
-			},
-			handleDel2 () {
-				this.index = ''
-			},
-			toEmpty () {
-				this.code = ''
-				this.pkId = ''
-				this.currentData = {}
-				this.index = ''
-				this.val1 = null
-				this.val2 = null
-				this.index1 = ''
-				this.disabled = false
-				this.kwData = {}
-			},
-			async _inStorageConfirm () {
-				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.index || !this.index1) {
-					this.disabled = false
-					return
-				}
-				try {
-					let obj = Object.assign(this.currentData, {qty: this.val1, vehicle_code: this.val2, stor_code: this.index, form_type: this.index1})
-					let res = await inStorageConfirm(obj)
-					if (res.code === '200') {
-						this.index = ''
-						this.val1 = null
-						this.val2 = null
-					}
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.msg_wrapper
-	height: calc(100% - var(--status-bar-height) - 72rpx)
-</style>
diff --git a/pages/entry/check-to-store.vue b/pages/entry/check-to-store.vue
deleted file mode 100644
index a1e79fb..0000000
--- a/pages/entry/check-to-store.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-<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="vehicleCode" @handleChange="handleChange" @handleDel="toEmpty"/>
-					</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">
-						<NumberInput v-model="sWeight" />
-					</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="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="qty" />
-					</view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-7">
-						<span class="filter_label">仓库编码</span>
-					</view>
-					<view class="zd-col-17 filter_select">
-						<input type="text" class="filter_input" v-model="storCode" disabled>
-					</view>
-				</view>
-			</view>
-			<view class="filter_label">当前库位可用数：</view>
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
-					</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) === '{}' || !vehicleCode || !sWeight || !pcsn || !qty}" :disabled="disabled" @tap="_checkMaterConfirm">盘点确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import NumberInput from '@/components/NumberInput.vue'
-	import {getStructCount, storList, queryMaterByVehicleCode, checkMaterConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			NumberInput
-		},
-		data() {
-			return {
-				title: '',
-				vehicleCode: '',
-				currentData: {},
-				sWeight: null,
-				pcsn: null,
-				qty: null,
-				storCode: null,
-				options: [],
-				disabled: false,
-				kwData: {}
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-			this._storList()
-		},
-		onShow () {
-			if (this.$store.getters.publicObj !== '') {
-				this.currentData.material_id = this.$store.getters.publicObj.material_id
-				this.currentData.material_code = this.$store.getters.publicObj.material_code
-				this.currentData.material_name = this.$store.getters.publicObj.material_name
-				this.currentData.material_spec = this.$store.getters.publicObj.material_spec
-				this.currentData.unit_name = this.$store.getters.publicObj.unit_name
-				this.sWeight = null
-				this.pcsn = null
-				this.qty = null
-				this.$store.dispatch('setPublicObj', '')
-			}
-		},
-		methods: {
-			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 () {
-				if (!this.vehicleCode) {
-					uni.showToast({
-						title: '请先扫描载具编码',
-						icon: 'none'
-					})
-					return
-				}
-				uni.navigateTo({
-					url: '/pages/common/mater-list?title=查询物料'
-				})
-			},
-			handleChange (e) {
-				if (e) {
-					this._queryMaterByVehicleCode(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 = {}
-				}
-			},
-			async _queryMaterByVehicleCode (e) {
-				try {
-					let res = await queryMaterByVehicleCode(e)
-					if (res && res.code === '200') {
-						this.currentData = res.content[0]
-						this.sWeight = this.currentData.single_weight
-						this.pcsn = this.currentData.pcsn
-						this.qty = this.currentData.qty
-						this.options.map(el => {
-							if (el.value === this.currentData.stor_code) {
-								this.storCode = el.text
-							}
-						})
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toEmpty () {
-				this.currentData = {}
-				this.vehicleCode = ''
-				this.sWeight = null
-				this.pcsn = null
-				this.qty = null
-				this.storCode = null
-				this.disabled = false
-				this.kwData = {}
-			},
-			async _checkMaterConfirm () {
-				this.disabled = true
-				if (JSON.stringify(this.currentData) === '{}' || !this.vehicleCode || !this.sWeight || !this.pcsn || !this.qty) {
-					this.disabled = false
-					return
-				}
-				try {
-					let obj = Object.assign(this.currentData, {single_weight: this.sWeight, pcsn: this.pcsn, qty: this.qty})
-					let res = await checkMaterConfirm(obj)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-					this.disabled = false
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/entry/document.vue b/pages/entry/document.vue
deleted file mode 100644
index 21ca2d3..0000000
--- a/pages/entry/document.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-<template>
-	<view class="zd_container">
-		<!-- 关联单据 -->
-		<nav-bar :title="title" :inner="true"></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-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>计划数量</th>
-								<th>未入库数量</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{i+1}}</td>
-								<td>{{e.source_form_type}}</td>
-								<td>{{e.source_form_date}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.assign_qty}}</td>
-								<td>{{e.qty}}</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-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
-			<button class="zd-col-8 button-primary" @tap="toSure">组盘确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {FormTypes, pmFormData} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				options: [],
-				index: '',
-				val1: '',
-				dataList: [],
-				pkId: '',
-				reload: false,
-				status: 'more',
-				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
-				},
-				totalCount: 0,
-				pageNum: 1,
-				pageSize: 10
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-			this._FormTypes()
-		},
-		methods: {
-			async _FormTypes () {
-				let res = await FormTypes()
-				this.options = [...res]
-				this.options.map(el => {
-					this.$set(el, 'text', el.lable)
-				})
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			searchList () {
-				this.dataList = []
-				this.pageNum = 1
-				this._pmFormData()
-			},
-			async _pmFormData () {
-				let res = await pmFormData(this.pageNum + '', this.pageSize + '', this.val1, this.index)
-				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._pmFormData()
-					}, 1000)
-				} else { //停止加载
-					this.status = 'noMore'
-				}
-			},
-			toEmpty () {
-				this.index = ''
-				this.val1 = ''
-				this.dataList = []
-				this.pageNum = 1
-			},
-			toSure () {
-				if (this.dataList.length) {
-					this.$store.dispatch('setPublicArr', this.dataList)
-					uni.navigateBack()
-				}
-			}
-		}
-	}
-</script>
diff --git a/pages/entry/empty-tray-to-store.vue b/pages/entry/empty-tray-to-store.vue
deleted file mode 100644
index d09060d..0000000
--- a/pages/entry/empty-tray-to-store.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<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>
-			<view class="filter_label">当前库位可用数：</view>
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
-					</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,
-				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.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-
-</style>
diff --git a/pages/entry/empty-vehicle-instore.vue b/pages/entry/empty-vehicle-instore.vue
deleted file mode 100644
index 42b9a2f..0000000
--- a/pages/entry/empty-vehicle-instore.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<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="val2"
-						@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="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-24 filter_select">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></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 || !val2 || !index}" :disabled="disabled" @tap="_emptyconfirmIn">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getSect, emptyconfirmIn} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				options: [{text:'托盘', value:'1'},{text:'料箱',value: '2'},{text:'货架',value: '3'}],
-				index: '',
-				// options2: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
-				options2: [],
-				index2: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._getSect()
-		},
-		methods: {
-			handleChange (e) {
-				if (e) {
-					this._getReturnMaterial(e)
-				}
-			},
-			async _getSect () {
-				try {
-					let res = await getSect()
-					if (res) {
-						this.options2 = res
-					} else {
-						this.options2 =[]
-					}
-				} catch (e) {
-					this.options2 = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			selectChange2 (e) {
-				this.index2 = e
-			},
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.index = ''
-				this.index2 = ''
-				this.disabled = false
-			},
-			async _emptyconfirmIn () {
-				this.disabled = true
-				if (!this.val1 ||!this.val2 || !this.index) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await emptyconfirmIn(this.val1, this.val2, this.index2, '1', this.index)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-
-</style>
diff --git a/pages/entry/group-to-store.vue b/pages/entry/group-to-store.vue
deleted file mode 100644
index 592bec6..0000000
--- a/pages/entry/group-to-store.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<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-8">
-						<span class="filter_label">合格证编码</span>
-					</view>
-					<view class="zd-col-16">
-						<search-box
-						v-model="val1"
-						@handleChange="handleChange1"
-						/>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-8">
-						<span class="filter_label">载具编码</span>
-					</view>
-					<view class="zd-col-16">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">订单号</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.MONumber}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">组织</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.StockOrgId}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">货主</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.OwnerId_Id}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">物料编码</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">物料名称</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.material_name}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">物料规格</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.material_spec}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">单位</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.unit_name}}</span></view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-8"><span class="filter_label">物料数量</span></view>
-					<view class="zd-col-16">
-						<input type="number" class="filter_input" v-model="val3">
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-8"><span class="filter_label">仓库编码</span></view>
-					<view class="zd-col-16 filter_select">
-						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
-					</view>
-				</view>
-			</view>
-		</view>
-		<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': !val2 || !val3 || !index}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {storList, getCertificateInfo, inStorageConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				val3: '',
-				currentData: {},
-				options: [],
-				index: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-			this._storList()
-		},
-		methods: {
-			async _storList () {
-				let res = await storList()
-				if (res.code === '200') {
-					this.options = [...res.content]
-					this.options.map(el => {
-						this.$set(el, 'text', el.label)
-					})
-				}
-			},
-			handleChange1 (e) {
-				this._getCertificateInfo(e)
-			},
-			async _getCertificateInfo (e) {
-				let res = await getCertificateInfo(e)
-				this.currentData = res
-				if (JSON.stringify(this.currentData) !== '{}') {
-					this.val3 = this.currentData.qty
-				}
-			},
-			toEmpty () {
-				this.val1 = ''
-				this.val2 = ''
-				this.val3 = ''
-				this.currentData = {}
-				this.index = ''
-				this.disabled = false
-			},
-			async _inStorageConfirm () {
-				this.disabled = true
-				if (!this.val2 || !this.val3 || !this.index) {
-					this.disabled = false
-					return
-				}
-				try {
-					let obj = Object.assign(this.currentData, {vehicle_code: this.val2, stor_code: this.index, qty: this.val3})
-					let res = await inStorageConfirm(obj)
-					if (res.code === '200') {
-						this.toEmpty()
-					}
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/entry/groupplate-instore.vue b/pages/entry/groupplate-instore.vue
deleted file mode 100644
index 2fd738e..0000000
--- a/pages/entry/groupplate-instore.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<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="val2"
-						@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="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.material_code" 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.qty" 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.pcsn" 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 || !val2 || !index}" :disabled="disabled" @tap="_confirmIn">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getSect, getVehicleMaterial, confirmIn} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				// options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
-				options: [],
-				index: '',
-				disabled: false,
-				currentData: {}
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._getSect()
-		},
-		methods: {
-			async _getSect () {
-				try {
-					let res = await getSect()
-					if (res) {
-						this.options = res
-					} else {
-						this.options =[]
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			handleChange (e) {
-				if (e) {
-					this._getVehicleMaterial(e)
-				}
-			},
-			async _getVehicleMaterial (e) {
-				try {
-					let res = await getVehicleMaterial(this.val1, this.val2, this.index)
-					if (res) {
-						this.currentData = res
-					} else {
-						this.currentData = {}
-					}
-				} catch (e) {
-					this.currentData = {}
-				}
-			},
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.index = ''
-				this.disabled = false
-				this.currentData = {}
-			},
-			async _confirmIn () {
-				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.index) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await confirmIn(this.val1, this.val2, this.index)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-
-</style>
diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue
deleted file mode 100644
index b3baa93..0000000
--- a/pages/entry/mater-group-to-store.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<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">
-						<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">
-						<NumberInput v-model="currentData.single_weight" />
-					</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 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 filter_select">
-						<!-- <search-box v-model="currentData.stor_code"/> -->
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
-			</view>
-			<view class="filter_label">当前库位可用数：</view>
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
-					</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.message,
-						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
deleted file mode 100644
index 709180a..0000000
--- a/pages/entry/mater-group.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<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"/>
-					</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"/>
-					</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_name" @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.material_code" 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="_groupPlate">组盘确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import NumberInput from '@/components/NumberInput.vue'
-	import {groupPlate} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			NumberInput
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				currentData: {},
-				options: [],
-				index: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		onShow() {
-			if (this.$store.getters.publicObj !== '') {
-				this.currentData = this.$store.getters.publicObj
-			}
-		},
-		methods: {
-			toJump () {
-				uni.navigateTo({
-					url: '/pages/common/mater-list?title=查询物料'
-				})
-			},
-			toEmpty () {
-				this.currentData = {}
-				this.index = ''
-				this.disabled = false
-			},
-			async _groupPlate () {
-				this.disabled = true
-				if (JSON.stringify(this.currentData) === '{}') {
-					this.disabled = false
-					return
-				}
-				try {
-					this.currentData.stor_code = this.index
-					let res = await groupPlate(this.currentData.material_id, this.currentData.pcsn, this.currentData.qty, this.val2, this.val1)
-					uni.showToast({
-						title: res.message,
-						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
deleted file mode 100644
index 4b2ae22..0000000
--- a/pages/entry/pick-yl-return-store.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<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.material_code" 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.qty" 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.pcsn" 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="_confirmReturnMaterial">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getSect, getReturnMaterial, confirmReturnMaterial} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				// options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
-				options: [],
-				index: '',
-				disabled: false,
-				currentData: {}
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._getSect()
-		},
-		methods: {
-			handleChange (e) {
-				if (e) {
-					this._getReturnMaterial(e)
-				}
-			},
-			async _getReturnMaterial (e) {
-				try {
-					let res = await getReturnMaterial(this.val1)
-					if (res) {
-						this.currentData = res.data
-					} else {
-						this.currentData = {}
-					}
-				} catch (e) {
-					this.currentData = {}
-				}
-			},
-			async _getSect () {
-				try {
-					let res = await getSect()
-					if (res) {
-						this.options = res
-					} else {
-						this.options =[]
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			clearUp () {
-				this.val1 = ''
-				this.index = ''
-				this.disabled = false
-			},
-			async _confirmReturnMaterial () {
-				this.disabled = true
-				if (!this.val1 || !this.index) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await confirmReturnMaterial(this.index, this.currentData)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-
-</style>
diff --git a/pages/entry/qualified-to-store.vue b/pages/entry/qualified-to-store.vue
deleted file mode 100644
index 8246b0b..0000000
--- a/pages/entry/qualified-to-store.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-<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-8">
-						<span class="filter_label">合格证编码</span>
-					</view>
-					<view class="zd-col-16">
-						<search-box
-						v-model="val1"
-						@handleChange="handleChange1"
-						/>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-8">
-						<span class="filter_label">载具编码</span>
-					</view>
-					<view class="zd-col-16">
-						<search-box
-						v-model="val2"
-						 @handleChange="handleChange2"
-						 @handleDel="handleDel2"
-						/>
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">订单号</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.moNumber}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">源单信息</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.srcBillNo}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">物料编码</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">物料名称</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.material_name}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">物料规格</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.material_spec}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8"><span class="filter_label">单位</span></view>
-					<view class="zd-col-16"><span class="filter_input">{{currentData.unit_name}}</span></view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-8"><span class="filter_label">单重</span></view>
-					<view class="zd-col-16">
-						<input type="number" class="filter_input" v-model="currentData.single_weight">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-8"><span class="filter_label">批次</span></view>
-					<view class="zd-col-16">
-						<input type="text" class="filter_input" v-model="currentData.pcsn">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-8"><span class="filter_label">物料数量</span></view>
-					<view class="zd-col-16">
-						<input type="number" class="filter_input" v-model="val3">
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-8"><span class="filter_label">仓库编码</span></view>
-					<view class="zd-col-16 filter_select">
-						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
-					</view>
-				</view>
-			</view>
-			<view class="filter_label">当前库位可用数：</view>
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">高库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.g}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">中库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.z}}个</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_label" style="font-size: 24rpx;">低库位</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 28rpx; color: #ff6a00; font-weight: 700;">{{kwData.d}}个</span>
-					</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': !val2 || !val3 || !index}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getStructCount, storList, getCertificateInfo, inStorageConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				val3: '',
-				currentData: {},
-				options: [],
-				index: '',
-				disabled: false,
-				kwData: {}
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-			this._storList()
-		},
-		methods: {
-			async _storList () {
-				let res = await storList()
-				if (res.code === '200') {
-					this.options = [...res.content]
-					this.options.map(el => {
-						this.$set(el, 'text', el.label)
-					})
-				}
-			},
-			handleChange1 (e) {
-				this._getCertificateInfo(e)
-			},
-			async _getCertificateInfo (e) {
-				let res = await getCertificateInfo(e)
-				this.currentData = res
-				if (JSON.stringify(this.currentData) !== '{}') {
-					this.val3 = this.currentData.qty
-				}
-			},
-			handleChange2 (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 = {}
-				}
-			},
-			handleDel2 () {
-				this.index = ''
-			},
-			toEmpty () {
-				this.val1 = ''
-				this.val2 = ''
-				this.val3 = ''
-				this.currentData = {}
-				this.index = ''
-				this.disabled = false
-				this.kwData = {}
-			},
-			async _inStorageConfirm () {
-				this.disabled = true
-				if (!this.val2 || !this.val3 || !this.index) {
-					this.disabled = false
-					return
-				}
-				try {
-					let obj = Object.assign(this.currentData, {vehicle_code: this.val2, stor_code: this.index, qty: this.val3, bar_code: this.val1})
-					let res = await inStorageConfirm(obj)
-					if (res.code === '200') {
-						this.val3 = ''
-					}
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 29d7909..637ef79 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -41,21 +41,11 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
-					{title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]},
-					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
-					{title: '出库管理', path: 'RF02', sonTree: [{title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]},
-					// {title: '入库管理', path: 'RF01', sonTree: [{title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
-					// {title: '出库管理', path: 'RF02', sonTree: [{title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]}
-					// {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: '/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'}]},
-					// {title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]},
-					// {title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}
+					{title: '装配线', path: 'RF04', sonTree: [{title: '装配线', path: '/pages/lines/zp-line'}]},
+					{title: '焊接线', path: 'RF07', sonTree: [{title: '焊接线', path: '/pages/lines/hj-line'}]},
+					{title: '装配线点到点', path: 'RF02', sonTree: [{title: '装配线点到点', path: '/pages/lines/zp-line-dtd'}]},
 				],
-				menu: [{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}],
+				// menu: [{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}],
 				show: false,
 				secM: [],
 				icon: '',
diff --git a/pages/lines/hj-line.vue b/pages/lines/hj-line.vue
new file mode 100644
index 0000000..e9f8e90
--- /dev/null
+++ b/pages/lines/hj-line.vue
@@ -0,0 +1,154 @@
+<template>
+	<view class="zd_container">
+		<!-- 焊接线 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper xzbox">
+				<view class="ozxbox"><span>起点：</span><span>{{start.device_name}}</span></view>
+			</view>
+			<view class="zd_wrapper ocon">
+				<view class="obox" v-for="(e, i) in arrList" :key="i" :class="{'checked': e.device_code === pkId1}" @tap="toCheck1(e)">
+					{{ e.device_name }}
+				</view>
+			</view>
+		</view>
+		<view class="zd_content">
+			<view class="zd_wrapper xzbox">
+				<view class="ozxbox"><span>终点：</span><span>{{end.device_name}}</span></view>
+			</view>
+			<view class="zd_wrapper ocon">
+				<view class="obox" v-for="(e, i) in arrList" :key="i" :class="{'checked': e.device_code === pkId2}" @tap="toCheck2(e)">
+					{{ e.device_name }}
+				</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': !pkId1 || !pkId2}" :disabled="disabled" @tap="_createTask1">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import { createTask2} from '@/utils/getData01.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				pkId: '',
+				pkId1: '',
+				pkId2: '',
+				start: '',
+				end: '',
+				arrList: [
+					{
+						device_code:'HJX1',
+						device_name: '缓存区A'
+					},
+					{
+						device_code:'HJX2',
+						device_name: '缓存区B'
+					},
+					{
+						device_code:'HJX3',
+						device_name: '焊接线3'
+					},
+					{
+						device_code:'HJX4',
+						device_name: '焊接线4'
+					},
+					{
+						device_code:'HJX5',
+						device_name: '焊接线5'
+					},
+					{
+						device_code:'HJX6',
+						device_name: '焊接线6'
+					}
+				],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toCheck1 (e) {
+				if (e.device_code === this.end.device_code) {
+					this.pkId1 = ''
+					this.start = ''
+					return
+				}
+				this.pkId1 = e.device_code
+				this.start = e
+			},
+			toCheck2 (e) {
+				if (e.device_code === this.start.device_code) {
+					this.pkId2 = ''
+					this.end = ''
+					return
+				}
+				this.pkId2 = e.device_code
+				this.end = e
+			},
+			clearUp () {
+				this.start = ''
+				this.end = ''
+				this.pkId1 = ''
+				this.pkId2 = ''
+			},
+			async _createTask1 () {
+				this.disabled = true
+				if (!this.pkId1 || this.pkId2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await createTask2(this.start.device_code, this.end.device_code)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+.ocon
+	display flex
+	flex-wrap wrap
+.obox
+	width 140px
+	height 60px
+	line-height 60px
+	text-align center
+	background #ff0
+	// border 1px solid #666
+	border-radius 3px
+	background #eee
+	margin-right 5px
+	margin-bottom 5px
+.checked
+	background #fffbe5
+.zd_content
+	padding 12px 8px 8px 8px
+</style>
diff --git a/pages/lines/zp-line-dtd.vue b/pages/lines/zp-line-dtd.vue
new file mode 100644
index 0000000..c90ab46
--- /dev/null
+++ b/pages/lines/zp-line-dtd.vue
@@ -0,0 +1,154 @@
+<template>
+	<view class="zd_container">
+		<!-- 装配线点到点 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper xzbox">
+				<view class="ozxbox"><span>起点：</span><span>{{start.device_name}}</span></view>
+			</view>
+			<view class="zd_wrapper ocon">
+				<view class="obox" v-for="(e, i) in arrList" :key="i" :class="{'checked': e.device_code === pkId1}" @tap="toCheck1(e)">
+					{{ e.device_name }}
+				</view>
+			</view>
+		</view>
+		<view class="zd_content">
+			<view class="zd_wrapper xzbox">
+				<view class="ozxbox"><span>终点：</span><span>{{end.device_name}}</span></view>
+			</view>
+			<view class="zd_wrapper ocon">
+				<view class="obox" v-for="(e, i) in arrList" :key="i" :class="{'checked': e.device_code === pkId2}" @tap="toCheck2(e)">
+					{{ e.device_name }}
+				</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': !pkId1 || !pkId2}" :disabled="disabled" @tap="_createTask1">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import { createTask3} from '@/utils/getData01.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				pkId: '',
+				pkId1: '',
+				pkId2: '',
+				start: '',
+				end: '',
+				arrList: [
+					{
+						device_code:'ZPXA',
+						device_name: '装配线A'
+					},
+					{
+						device_code:'ZPXB',
+						device_name: '装配线B'
+					},
+					{
+						device_code:'ZPXC',
+						device_name: '装配线C'
+					},
+					{
+						device_code:'ZPXD',
+						device_name: '装配线D'
+					},
+					{
+						device_code:'ZPXE',
+						device_name: '装配线E'
+					},
+					{
+						device_code:'ZPXF',
+						device_name: '装配线F'
+					}
+				],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toCheck1 (e) {
+				if (e.device_code === this.end.device_code) {
+					this.pkId1 = ''
+					this.start = ''
+					return
+				}
+				this.pkId1 = e.device_code
+				this.start = e
+			},
+			toCheck2 (e) {
+				if (e.device_code === this.start.device_code) {
+					this.pkId2 = ''
+					this.end = ''
+					return
+				}
+				this.pkId2 = e.device_code
+				this.end = e
+			},
+			clearUp () {
+				this.start = ''
+				this.end = ''
+				this.pkId1 = ''
+				this.pkId2 = ''
+			},
+			async _createTask1 () {
+				this.disabled = true
+				if (!this.pkId1 || !this.pkId2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await createTask3(this.start.device_code, this.end.device_code)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+.ocon
+	display flex
+	flex-wrap wrap
+.obox
+	width 140px
+	height 60px
+	line-height 60px
+	text-align center
+	background #ff0
+	// border 1px solid #666
+	border-radius 3px
+	background #eee
+	margin-right 5px
+	margin-bottom 5px
+.checked
+	background #fffbe5
+.zd_content
+	padding 12px 8px 8px 8px
+</style>
diff --git a/pages/lines/zp-line.vue b/pages/lines/zp-line.vue
new file mode 100644
index 0000000..22e9fec
--- /dev/null
+++ b/pages/lines/zp-line.vue
@@ -0,0 +1,103 @@
+<template>
+	<view class="zd_container">
+		<!-- 装配线 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper ocon">
+				<view class="obox" v-for="(e, i) in arrList" :key="i" :class="{'checked': e.device_code === pkId}" @tap="toCheck(e)">
+					{{ e.device_name }}
+				</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': !pkId}" :disabled="disabled" @tap="_createTask1">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import { createTask1} from '@/utils/getData01.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				pkId: '',
+				arrList: [
+					{
+						device_code:'ZPXA',
+						device_name: '装配线A'
+					},
+					{
+						device_code:'ZPXB',
+						device_name: '装配线B'
+					}
+				],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+		},
+		methods: {
+			toCheck (e) {
+				this.pkId = this.pkId === e.device_code ? '' : e.device_code
+			},
+			clearUp () {
+				this.pkId = ''
+			},
+			async _createTask1 () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await createTask1(this.pkId)
+					if (res.code === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.clearUp()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+.ocon
+	display flex
+	flex-wrap wrap
+.obox
+	width 150px
+	height 60px
+	line-height 60px
+	text-align center
+	background #ff0
+	// border 1px solid #666
+	border-radius 3px
+	background #eee
+	margin-right 5px
+	margin-bottom 5px
+.checked
+	background #fffbe5
+</style>
diff --git a/pages/outbound/bill-list.vue b/pages/outbound/bill-list.vue
deleted file mode 100644
index 59830d9..0000000
--- a/pages/outbound/bill-list.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-	<view class="zd_container">
-		<!-- 单据列表 -->
-		<nav-bar title="单据列表"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-9">
-						<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">
-					<view class="zd-col-7">
-						<span class="filter_label">单据编码</span>
-					</view>
-					<view class="zd-col-24">
-						<search-box
-						v-model="code"
-						@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>
-								<th>物料编码</th>
-								<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.create_time}}</td>
-								<td>{{e.create_name}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.qty}}</td>
-								<td>{{e.plan_qty}}</td>
-								<td>{{e.assign_qty}}</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: '',
-				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/bill-out-store.vue b/pages/outbound/bill-out-store.vue
deleted file mode 100644
index f960b20..0000000
--- a/pages/outbound/bill-out-store.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-	<view class="zd_container">
-		<!-- 单据出库 -->
-		<nav-bar :title="title" :inner="true"></nav-bar>
-		<view class="zd_content">
-			<view v-if="JSON.stringify(currentData) !== '{}'" class="zd_wrapper">
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6"><span class="filter_label">单据编码</span></view>
-					<view class="zd-col-6"><span class="filter_input">{{currentData.code}}</span></view>
-					<view class="zd-col-6"><span class="filter_label">单据类型</span></view>
-					<view class="zd-col-6"><span class="filter_input">{{formTypeName}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6"><span class="filter_label">创建时间</span></view>
-					<view class="zd-col-6"><span class="filter_input">{{currentData.create_time}}</span></view>
-					<view class="zd-col-6"><span class="filter_label">创建人</span></view>
-					<view class="zd-col-6"><span class="filter_input">{{currentData.create_name}}</span></view>
-				</view>
-				<!-- <view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-6"><span class="filter_label">物料编码</span></view>
-					<view class="zd-col-6"><span class="filter_input">{{currentData.material_code}}</span></view>
-					<view class="zd-col-6"><span class="filter_label">单位</span></view>
-					<view class="zd-col-6"><span class="filter_input">{{currentData.unit_name}}</span></view>
-				</view> -->
-				<view class="zd-row border-bottom">
-					<view class="zd-col-6"><span class="filter_label">仓库</span></view>
-					<view class="zd-col-6 filter_select">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-					<view class="zd-col-6"><span class="filter_label">车间</span></view>
-					<view class="zd-col-6 filter_select">
-						<uni-data-select v-model="currentData.product_area" :localdata="options2"></uni-data-select>
-					</view>
-				</view>
-				<view class="zd-row jcflexstart">
-					<view class="zd-col-6">
-						<span class="filter_label">加急单据</span>
-					</view>
-					<view class="relative zd-col-6">
-						<switch :checked="isChecked" color="#4e6ef2" style="transform:scale(0.8); transform-origin: left;"/>
-						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
-					</view>
-				</view>
-			</view>
-			<view v-if="JSON.stringify(currentData) !== '{}'" class="grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
-								<th class="td_3">
-									<view class="td_3">
-										物料名称
-									</view>
-								</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">
-								<td @tap="toCheck(e)"><uni-icons :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></td>
-								<td class="td_3">{{e.material_name}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.plan_qty}}</td>
-								<td>{{e.qty}}</td>
-								<td>{{e.sto_qty}}</td>
-								<td><input type="number" class="sin_input" v-model="e.now_assign_qty" @blur="handleBlur(e)"></td>
-								<td>{{e.assign_qty}}</td>
-								<td>{{e.actual_qty}}</td>
-								<td><input type="text" class="sin_input" v-model="e.pcsn"></td>
-								<td>{{e.unit_name}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-6 button-primary" @tap="toEmpty">返回</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_outStorageConfirm">出库确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {outStorageOrder, outStorageConfirm, outStorageOrderConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				currentData: {},
-				dataList: [],
-				disabled: false,
-				options1: [{value: 'FStockPallet', text: '托盘库'}, {value: 'FStockId', text: '料箱库'}],
-				index1: '',
-				options2: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}],
-				allCheck: false,
-				formTypeName: '',
-				isChecked: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		onShow () {
-			if (this.$store.getters.publicObj !== '') {
-				this.currentData = this.$store.getters.publicObj
-				this._outStorageOrder()
-				this.dataList = [...this.currentData.children]
-				this.dataList.map(el => {
-					this.$set(el, 'now_assign_qty', el.qty)
-					this.$set(el, 'checked', false)
-				})
-				this.index1 = this.currentData.stor_code
-				this.$store.dispatch('setPublicObj', '')
-			}
-		},
-		methods: {
-			setWStatus () {
-				this.isChecked = !this.isChecked
-			},
-			// 出库单类型
-			async _outStorageOrder () {
-				let res = await outStorageOrder()
-				res.map(el => {
-					if (el.value === this.currentData.form_type) {
-						this.formTypeName = el.text
-					}
-				})
-			},
-			selectChange1 (e) {
-				if (e) {
-					this._outStorageOrderConfirm(e)
-				}
-			},
-			async _outStorageOrderConfirm (e) {
-				try {
-					let res = await outStorageOrderConfirm(this.currentData.code, e)
-					if (res.code === '200') {
-						if (res.content.length > 0) {
-							this.currentData = res.content[0]
-							this.dataList = [...this.currentData.children]
-							this.dataList.map(el => {
-								this.$set(el, 'now_assign_qty', el.qty)
-								this.$set(el, 'checked', false)
-							})
-						}
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-					}
-				} catch (e) {
-					console.log(e)
-				}
-			},
-			handleBlur (e) {
-				if (e.now_assign_qty < 0 || e.now_assign_qty > e.qty) {
-					e.now_assign_qty = e.qty
-				}
-				if (parseFloat(e.sto_qty) < parseFloat(e.now_assign_qty) && e.checked) {
-					e.checked = false
-				}
-			},
-			toEmpty () {
-				uni.navigateBack()
-			},
-			toAllCheck () {
-				this.allCheck = !this.allCheck
-				this.dataList.map(el => {
-					el.checked = this.allCheck
-				})
-			},
-			toCheck (e) {
-				if (parseFloat(e.sto_qty) < parseFloat(e.now_assign_qty)) {
-					return
-				}
-				e.checked = !e.checked
-				let arr = this.dataList.filter(el => el.checked === true)
-				this.allCheck = arr.length === this.dataList.length
-			},
-			async _outStorageConfirm () {
-				this.disabled = true
-				if (JSON.stringify(this.currentData) === '{}') {
-					this.disabled = false
-					return
-				}
-				let arr = this.dataList.filter(el => el.checked === true)
-				let urgent = this.isChecked ? '1' : '0'
-				let obj = Object.assign(this.currentData, {children: arr, stor_code: this.index1, urgent: urgent})
-				try {
-					let res = await outStorageConfirm(obj)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.toEmpty()
-					}
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_input
-	font-size 26rpx
-.filter_label
-	font-size: 26rpx;
-.slide_new
-	// padding-bottom 110px
-.slide_new table td
-	overflow visible
-/deep/ .uni-select__input-text
-	width calc(100% - 25px)
-/deep/ .zd_icon_wraper
-	width 25px
-/deep/ .uni-icons
-	vertical-align: bottom;
-</style>
\ No newline at end of file
diff --git a/pages/outbound/ctu-vehicle-outstore.vue b/pages/outbound/ctu-vehicle-outstore.vue
deleted file mode 100644
index fa53446..0000000
--- a/pages/outbound/ctu-vehicle-outstore.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<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|| !val2}" :disabled="disabled" @tap="_vehicleOutConfirm">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getSect, vehicleOutConfirm} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '1',
-				// options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
-				options: [],
-				index: '',
-				disabled: false,
-				currentData: {},
-				kwData: {}
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._getSect()
-		},
-		methods: {
-			async _getSect () {
-				try {
-					let res = await getSect()
-					if (res) {
-						this.options = res
-					} else {
-						this.options =[]
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			clearUp () {
-				this.val1 = ''
-				this.index = ''
-				this.disabled = false
-				this.kwData = {}
-			},
-			async _vehicleOutConfirm () {
-				this.disabled = true
-				if (!this.val1 || !this.index || !this.val2) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await vehicleOutConfirm(this.index, this.val1, this.val2)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							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
deleted file mode 100644
index dcd5a52..0000000
--- a/pages/outbound/empty-vehicle-outstore.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<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="val1">
-					</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="_vehicleOutConfirm">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getSect, vehicleOutConfirm} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				// options: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
-				options: [],
-				index: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._getSect()
-		},
-		methods: {
-			async _getSect () {
-				try {
-					let res = await getSect()
-					if (res) {
-						this.options = res
-					} else {
-						this.options =[]
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			clearUp () {
-				this.val1 = ''
-				this.index = ''
-				this.disabled = false
-			},
-			async _vehicleOutConfirm () {
-				this.disabled = true
-				if (!this.val1 || !this.index) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await vehicleOutConfirm(this.index, this.val1)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-
-</style>
diff --git a/pages/outbound/line-callmater.vue b/pages/outbound/line-callmater.vue
deleted file mode 100644
index efeed0b..0000000
--- a/pages/outbound/line-callmater.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<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">
-						<search-box 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" @blur="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>
-								<th>单位</th>
-								<th>物料规格</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === e.group_id}">
-								<td>{{e.material_name}}</td>
-								<td>{{e.qty}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.struct_code}}</td>
-								<td>{{e.qty_unit_name}}</td>
-								<td>{{e.material_spec}}</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': !dataList.length}" @tap="_callMaterialConfirm">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getRegion, linegetMaterialDtl, callMaterialConfirm} from '@/utils/getData3.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._getRegion()
-		},
-		methods: {
-			async _getRegion () {
-				try {
-					let res = await getRegion('YZHJ')
-					if (res) {
-						this.options = res
-					} else {
-						this.options =[]
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			handleChange (e) {
-				if (e) {
-					this.dataList = []
-					this.pageNum = 1
-					this.pkId = ''
-					this._linegetMaterialDtl()
-				}
-			},
-			seachList () {
-				this.dataList = []
-				this.pageNum = 1
-				this.pkId = ''
-				this._linegetMaterialDtl()
-			},
-			async _linegetMaterialDtl () {
-				let res = await linegetMaterialDtl(this.index, this.val2)
-				if (res.code === '200') {
-					this.dataList = res.data
-					// 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._linegetMaterialDtl()
-					}, 1000)
-				} else { //停止加载
-					this.status = 'noMore'
-				}
-			},
-			toChek (e) {
-				this.pkId = this.pkId === e.group_id ? '' : e.group_id
-				this.pkObj = this.pkId === e.group_id ? e : {}
-			},
-			async _callMaterialConfirm () {
-				this.disabled = true
-				if (!this.dataList.length) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await callMaterialConfirm(this.index, this.val1, this.pkObj)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
diff --git a/pages/outbound/line-transfer.vue b/pages/outbound/line-transfer.vue
deleted file mode 100644
index 075eab2..0000000
--- a/pages/outbound/line-transfer.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<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"
-						/>
-					</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" v-show="index !== '2'">
-					<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" v-show="index == '2'">
-					<view class="zd-col-7">
-						<span class="filter_label">目标区域</span>
-					</view>
-					<view class="zd-col-24 filter_select">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></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="_transferConfirm">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getSect, getRegion, transferConfirm} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				options: [{text:'站点', value:'1'},{text:'区域',value: '2'}],
-				index: '',
-				// options2: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
-				options2: [],
-				index2: '',
-				disabled: false,
-				currentData: {},
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._getRegion()
-		},
-		methods: {
-			async _getRegion () {
-				try {
-					let res = await getRegion()
-					if (res) {
-						this.options2 = res
-					} else {
-						this.options2 =[]
-					}
-				} catch (e) {
-					this.options2 = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			selectChange2 (e) {
-				this.index2 = e
-			},
-			clearUp () {
-				this.val1 = ''
-				this.index = ''
-				this.index2 = ''
-				this.disabled = false
-				this.kwData = {}
-			},
-			async _transferConfirm () {
-				this.disabled = true
-				if (!this.val1 || !this.index) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await transferConfirm(this.val1, this.val2, this.index2)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							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
deleted file mode 100644
index 38a7a92..0000000
--- a/pages/outbound/mater-outstore.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<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">
-						<search-box 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" @blur="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>
-								<th>单位</th>
-								<th>物料规格</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === e.group_id}">
-								<td>{{e.material_name}}</td>
-								<td>{{e.qty}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.struct_code}}</td>
-								<td>{{e.qty_unit_name}}</td>
-								<td>{{e.material_spec}}</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': !dataList.length}" @tap="_materialConfirm">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getSect, getMaterialDtl, materialConfirm} from '@/utils/getData3.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._getSect()
-		},
-		methods: {
-			async _getSect () {
-				try {
-					let res = await getSect('XB')
-					if (res) {
-						this.options = res
-					} else {
-						this.options =[]
-					}
-				} catch (e) {
-					this.options = []
-				}
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			handleChange (e) {
-				if (e) {
-					this.dataList = []
-					this.pageNum = 1
-					this.pkId = ''
-					this._getMaterialDtl()
-				}
-			},
-			seachList () {
-				this.dataList = []
-				this.pageNum = 1
-				this.pkId = ''
-				this._getMaterialDtl()
-			},
-			async _getMaterialDtl () {
-				let res = await getMaterialDtl(this.index, this.val2)
-				if (res.code === '200') {
-					this.dataList = res.data
-					// 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._getMaterialDtl()
-					}, 1000)
-				} else { //停止加载
-					this.status = 'noMore'
-				}
-			},
-			toChek (e) {
-				this.pkId = this.pkId === e.group_id ? '' : e.group_id
-				this.pkObj = this.pkId === e.group_id ? e : {}
-			},
-			async _materialConfirm () {
-				this.disabled = true
-				if (!this.dataList.length) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await materialConfirm(this.index, this.val1, this.pkObj)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue
deleted file mode 100644
index e5d2a11..0000000
--- a/pages/outbound/out-store-confirm.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-<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">
-						<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_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.material_code" 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.pcsn" 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.qty" 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" :class="{'hightlight': currentData.qty !== currentData.frozen_qty}" v-model="currentData.frozen_qty" 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-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id}" :disabled="disabled" @tap="_confirm('2')">强制确认</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !this.currentData.group_id}" :disabled="disabled" @tap="_confirm('1')">出库确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {iosOutgetVehicleMaterial, confirm} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				currentData: {},
-				disabled: false,
-				isDiff: false,
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-		},
-		methods: {
-			clearUp () {
-				this.code = ''
-				this.disabled = false
-			},
-			handleChange (e) {
-				if (e) {
-					this._iosOutgetVehicleMaterial(e)
-				}
-			},
-			async _iosOutgetVehicleMaterial (e) {
-				try {
-					let res = await iosOutgetVehicleMaterial(e)
-					if (res.code === '200') {
-						this.currentData = res.data[0]
-					} else {
-						this.currentData = {}
-					}
-				} catch (e) {
-					this.currentData = {}
-				}
-			},
-			async _confirm (type) {
-				this.disabled = true
-				if (!this.val1 || !this.currentData.group_id) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await confirm(this.currentData.group_id, this.val1, type)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-.hightlight
-	color #f00
-</style>
diff --git a/pages/outbound/pick-confirm-2nd.vue b/pages/outbound/pick-confirm-2nd.vue
deleted file mode 100644
index ec91f63..0000000
--- a/pages/outbound/pick-confirm-2nd.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<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-8">
-						<span class="filter_label">产线站点编号</span>
-					</view>
-					<view class="zd-col-16">
-						<search-box
-						v-model="val1"
-						@handleChange="handleChange1"
-						/>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-8">
-						<span class="filter_label">取货确认状态</span>
-					</view>
-					<view class="zd-col-16">
-						<span v-show="val1" class="filter_input" style="font-size: 34rpx; color: #ff6a00; font-weight: 700;">{{status === '1' ? '已确认取货' : '未确认取货'}}</span>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-6 button-primary" @tap="toEmpty">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_takeConfirm">扫码取货确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getPointStatus, takeConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				status: null,
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		methods: {
-			handleChange1 (e) {
-				this._getPointStatus(e)
-			},
-			// 产线站点编码验证
-			async _getPointStatus (e) {
-				try {
-					let res = await getPointStatus(e)
-					if (res) {
-						this.val1 = res.code
-						this.status = res.point_location
-					}
-				} catch (e) {
-					this.val1 = ''
-					this.status = null
-				}
-			},
-			toEmpty () {
-				this.val1 = ''
-				this.status = null
-				this.disabled = false
-			},
-			async _takeConfirm () {
-				this.disabled = true
-				if (!this.val1) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await takeConfirm(this.val1)
-					if (res.code === '200') {
-						this.toEmpty()
-					}
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
diff --git a/pages/outbound/produce-out-store-2nd.vue b/pages/outbound/produce-out-store-2nd.vue
deleted file mode 100644
index 073bd06..0000000
--- a/pages/outbound/produce-out-store-2nd.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<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-8">
-						<span class="filter_label">产线站点编号</span>
-					</view>
-					<view class="zd-col-16">
-						<search-box
-						v-model="val1"
-						@handleChange="handleChange1"
-						/>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-8">
-						<span class="filter_label">出库单据编号</span>
-					</view>
-					<view class="zd-col-16 zd-row relative">
-						<link-scan
-						:editValue="editValue"
-						v-model="val2"
-						@handleChange="handleChange2"
-						@linkDel="toDel"
-						/>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-8">
-						<span class="filter_label">已选物料数</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 34rpx; color: #ff6a00; font-weight: 700;">{{selectedNum}}</span>
-					</view>
-					<view class="zd-col-8">
-						<span class="filter_label">可选物料数</span>
-					</view>
-					<view class="zd-col-4">
-						<span class="filter_input" style="font-size: 34rpx; color: #4e6ef2; font-weight: 700;">{{selectedNum !== null ? (9 - selectedNum) : null}}</span>
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>选择</th>
-								<th class="td_3"><view class="td_3">物料名称</view></th>
-								<th>物料编码</th>
-								<th>物料状态</th>
-								<th>数量</th>
-								<th>单位</th>
-								<th>单据编码</th>
-								<th>载具号</th>
-								<th>批次号</th>
-								<th><view style="width: 150px;">出库进度</view></th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>
-									<uni-icons v-show="e.status === '1'" @tap="toCheck(e)" :type="e.checked ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons>
-									<uni-icons v-show="e.status !== '1'" type="smallcircle-filled" size="24" color="#fff"></uni-icons>
-								</td>
-								<td class="td_3">{{e.material_name}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_status}}</td>
-								<td>{{e.qty}}</td>
-								<td>{{e.unit_name}}</td>
-								<td>{{e.prd_ppbom_no}}</td>
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.pcsn}}</td>
-								<td style="width: 150px;line-height: 28rpx;white-space: unset;">{{e.remark}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</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': checkData.length === 0}" :disabled="disabled" @tap="_ctuOutConfirm">出库物料提交</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import LinkScan from '@/components/LinkScan.vue'
-	import {queryTargetPoint, getCtuOrderList, ctuOutConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			LinkScan
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				editValue: [], // 出库单据编号集合
-				selectedNum: null, // 已选物料数
-				dataList: [],
-				disabled: false,
-				checkData: []
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		methods: {
-			handleChange1 (e) {
-				this._queryTargetPoint(e)
-			},
-			// 产线站点编码验证
-			async _queryTargetPoint (e) {
-				try {
-					let res = await queryTargetPoint(e)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.val1 = res.site_code
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.val1 = ''
-					}
-				} catch (e) {
-					this.val1 = ''
-				}
-			},
-			handleChange2 (e) {
-				if (this.editValue.indexOf(e) === -1) {
-				  this._getCtuOrderList(e)
-				} else {
-					uni.showToast({
-						title: '出库单据编号已存在',
-						icon: 'none'
-					})
-				}
-				setTimeout(() => {
-					this.val2 = null
-				}, 300)
-			},
-			async _getCtuOrderList (e) {
-				try {
-					let res = await getCtuOrderList(this.val1, e)
-					if (res.code === '200') {
-						this.checkData = []
-						for (let i = 0; i < res.content.length; i++) {
-							if (this.selectedNum < 9 && res.content[i].status === '1') {
-								this.$set(res.content[i], 'checked', true)
-								this.selectedNum += 1
-							} else {
-								this.$set(res.content[i], 'checked', false)
-							}
-						}
-						this.dataList = [...this.dataList, ...res.content]
-						let arr = this.dataList.filter(el => el.checked === true)
-						this.checkData = arr
-						if (res.data !== null) {
-							this.editValue.push(res.data)
-						}
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-					}
-				} catch (e) {
-					console.log(e)
-				}
-			},
-			toCheck (e) {
-				if (!e.checked && this.selectedNum >= 9) {
-					return
-				} else if (!e.checked && this.selectedNum < 9) {
-					e.checked = true
-					this.selectedNum++
-				} else if (e.checked) {
-					e.checked = false
-					this.selectedNum--
-				}
-				let arr = this.dataList.filter(el => el.checked === true)
-				this.checkData = arr
-			},
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.selectedNum = null
-				this.dataList = []
-				this.disabled = false
-				this.checkData = []
-				this.editValue = []
-			},
-			async _ctuOutConfirm () {
-				this.disabled = true
-				if (this.checkData.length === 0) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await ctuOutConfirm(this.val1, this.editValue.toString(), this.checkData)
-					if (res.code === '200') {
-						this.clearUp()
-					}
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toDel () {
-				this.editValue = []
-				this.selectedNum = null
-				this.dataList = []
-				this.checkData = []
-			}
-		}
-	}
-</script>
diff --git a/pages/outbound/shelf-bind-2nd.vue b/pages/outbound/shelf-bind-2nd.vue
deleted file mode 100644
index a3f151f..0000000
--- a/pages/outbound/shelf-bind-2nd.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-<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-8">
-						<span class="filter_label">地面站点编号</span>
-					</view>
-					<view class="zd-col-16">
-						<search-box
-						v-model="val1"
-						@handleChange="handleChange"
-						/>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-8">
-						<span class="filter_label">货架编号</span>
-					</view>
-					<view class="zd-col-16">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>站点编码</th>
-								<th>站点名称</th>
-								<th>绑定状态</th>
-								<th>任务锁定</th>
-								<th>绑定货架号</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.code}}</td>
-								<td>{{e.name}}</td>
-								<td>{{e.remark}}</td>
-								<td>{{$getStatusText({ '00': '未锁定', '10': '入库锁', '20': '出库锁' }, e.lock_type)}}</td>
-								<td>{{e.vehicle_code}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-5 button-primary" @tap="toEmpty">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_pointUnbind">CTU站点解绑</button>
-			<button v-if="dataList.length > 0 && dataList[0].lock_type === '00'" class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('1')">货架绑定</button>
-			<button v-if="dataList.length > 0 && dataList[0].lock_type !== '00'" class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="toSure('0')">货架解绑</button>
-			<button v-if="!dataList.length" class="zd-col-8 button-primary button-info">货架绑定/解绑</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getPointStatus, bindOrUnbind, pointUnbind} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				disabled: false,
-				dataList: []
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		methods: {
-			handleChange (e) {
-				if (e) {
-					this._getPointStatus(e)
-				}
-			},
-			async _getPointStatus (e) {
-				try {
-					let res = await getPointStatus(e)
-					this.dataList = []
-					this.dataList.push(res)
-					this.val2 = res.vehicle_code
-				} catch (e) {
-					this.dataList = []
-				}
-			},
-			toEmpty () {
-				this.val1 = ''
-				this.val2 = ''
-				this.disabled = false
-				this.dataList = []
-			},
-			toSure (type) {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled = false
-					return
-				}
-				this._bindOrUnbind(type)
-			},
-			async _bindOrUnbind (type) {
-				try {
-					let res = await bindOrUnbind(this.val1, this.val2, type)
-					if (res.code === '200') {
-						this._getPointStatus(this.val1)
-					}
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			async _pointUnbind () {
-				try {
-					this.disabled = true
-					if (!this.val1 || !this.val2) {
-						this.disabled = false
-						return
-					}
-					let res = await pointUnbind(this.val1, this.val2)
-					if (res.code === '200') {
-						this._getPointStatus(this.val1)
-					}
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
diff --git a/pages/outbound/shelf-bind.vue b/pages/outbound/shelf-bind.vue
deleted file mode 100644
index 47370ff..0000000
--- a/pages/outbound/shelf-bind.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<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"
-						/>
-					</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 || !val2}" :disabled="disabled" @tap="_bindOrUnbind('1')">绑定</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_bindOrUnbind('0')">解绑</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {bindOrUnbind} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				disabled: false,
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-		},
-		methods: {
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.disabled = false
-			},
-			async _bindOrUnbind (type) {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await bindOrUnbind(this.val1, this.val2, type)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-
-</style>
diff --git a/pages/outbound/stock-list.vue b/pages/outbound/stock-list.vue
deleted file mode 100644
index 2c2c6d4..0000000
--- a/pages/outbound/stock-list.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-	<view class="zd_container">
-		<!-- 库存出库 -->
-		<nav-bar :title="title" :inner="true"></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 filter_select">
-						<uni-data-select v-model="index" :localdata="options"></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 filter_select">
-						<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 filter_select">
-						<input type="text" class="filter_input" v-model="val3">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">仓位编码</span>
-					</view>
-					<view class="zd-col-17 filter_select">
-						<input type="text" class="filter_input" v-model="val4">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">物料批次</span>
-					</view>
-					<view class="zd-col-17 filter_select">
-						<input type="text" class="filter_input" 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>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.id === pkId}" @tap="toCheck(e)">
-								<td>{{e.stor_code}}</td>
-								<td>{{e.struct_code}}</td>
-								<td>{{e.vehicle_code}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.qty}}</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-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
-			<button class="zd-col-8 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 {structattrPage} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				options: [{value: 'FStockPallet', text: '托盘库'}, {value: 'FStockId', text: '料箱库'}],
-				index: 'FStockId',
-				val2: '',
-				val3: '',
-				val4: '',
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				reload: false,
-				status: 'more',
-				contentText: {
-					contentdown: '查看更多',
-					contentrefresh: '加载中',
-					contentnomore: '没有更多'
-				},
-				totalCount: 0,
-				pageNum: 1,
-				pageSize: 10
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		methods: {
-			searchList () {
-				this.dataList = []
-				this.pageNum = 1
-				this._structattrPage()
-			},
-			async _structattrPage () {
-				let res = await structattrPage(this.pageNum + '', this.pageSize + '', this.index, this.val1, true, this.val2, this.val3, this.val4)
-				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._structattrPage()
-					}, 1000)
-				} else { //停止加载
-					this.status = 'noMore'
-				}
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.id ? '' : e.id
-				this.pkObj = this.pkId === e.id ? e : {}
-			},
-			toEmpty () {
-				this.index = ''
-				this.val1 = ''
-				this.dataList = []
-				this.pageNum = 1
-				this.pkId = ''
-			},
-			toSure () {
-				if (this.pkId) {
-					this.$store.dispatch('setPublicObj', this.pkObj)
-					uni.navigateBack()
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-</style>
diff --git a/pages/outbound/stock-out-store.vue b/pages/outbound/stock-out-store.vue
deleted file mode 100644
index 4f89040..0000000
--- a/pages/outbound/stock-out-store.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<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">
-						<input type="text" class="filter_input" v-model="val1" @tap="toJump">
-					</view>
-				</view>
-			</view>
-			<view v-if="JSON.stringify(currentData) !== '{}'" class="zd_wrapper">
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-7"><span class="filter_label">库位</span></view>
-					<view class="zd-col-17"><span class="filter_input">{{currentData.struct_code}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-7"><span class="filter_label">载具编码</span></view>
-					<view class="zd-col-17"><span class="filter_input">{{currentData.vehicle_code}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-7"><span class="filter_label">物料编码</span></view>
-					<view class="zd-col-17"><span class="filter_input">{{currentData.material_code}}</span></view>
-				</view>
-				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-7"><span class="filter_label">批号</span></view>
-					<view class="zd-col-17"><span class="filter_input">{{currentData.pcsn}}</span></view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-7"><span class="filter_label">车间</span></view>
-					<view class="zd-col-17 filter_select">
-						<uni-data-select v-model="currentData.product_area" :localdata="options1"></uni-data-select>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-7"><span class="filter_label">出库库存</span></view>
-					<view class="zd-col-17">
-						<input type="number" v-model="currentData.qty" class="filter_input">
-					</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="_outStorageMaterConfirm">确认出库</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {outStorageMaterConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				currentData: {},
-				options1: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}],
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		onShow () {
-			if (this.$store.getters.publicObj !== '') {
-				this.currentData = this.$store.getters.publicObj
-				if (this.currentData.stor_code === 'FStockPallet') {
-					this.val1 = '托盘库'
-				} else if (this.currentData.stor_code === 'FStockId') {
-					this.val1 = '料箱库'
-				}
-				if (!this.currentData.product_area) {
-					this.currentData.product_area = 'A1'
-				}
-				this.$store.dispatch('setPublicObj', '')
-			}
-		},
-		methods: {
-			toJump () {
-				uni.navigateTo({
-					url: '/pages/outbound/stock-list?title=库存列表'
-				})
-			},
-			async _outStorageMaterConfirm () {
-				this.disabled = true
-				if (JSON.stringify(this.currentData) === '{}') {
-					this.disabled = false
-					return
-				}
-				let obj = Object.assign(this.currentData, {now_assign_qty: this.currentData.qty})
-				try {
-					let res = await outStorageMaterConfirm(obj)
-					if (res.code === '200') {
-						this.toEmpty()
-					}
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toEmpty () {
-				this.val1 = ''
-				this.currentData = {}
-				this.disabled = false
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.button-primary, .button-default
-	_fj(center)
-	font-size 26rpx
-	height 88rpx
-	line-height 30rpx
-</style>
diff --git a/pages/outbound/tray-out-store.vue b/pages/outbound/tray-out-store.vue
deleted file mode 100644
index d821db9..0000000
--- a/pages/outbound/tray-out-store.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<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="index1" :localdata="options1" @change="selectChange1"></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="number" class="filter_input" v-model="qty">
-					</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="index2" :localdata="options2" @change="selectChange2"></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': !qty || !index1 || !index2}" :disabled="disabled" @tap="_pdaPalletIostorinvOut">托盘库出库</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {targetPoint, pdaPalletIostorinvOut} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				options1: [{text:'堆叠托盘', value:'11111111'},{text:'料箱',value: '22222222'},{text:'白色EPH',value: '33333333'}],
-				index1: '',
-				qty: '',
-				options2: [],
-				index2: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-			this._targetPoint()
-		},
-		methods: {
-			selectChange1 (e) {
-				this.index1 = e
-			},
-			selectChange2 (e) {
-				this.index2 = e
-			},
-			async _targetPoint () {
-				let res = await targetPoint()
-				this.options2 = [...res]
-				this.options2.map(el => {
-					this.$set(el, 'text', el.label)
-				})
-			},
-			clearUp () {
-				this.qty = ''
-				this.index1 = ''
-				this.index2 = ''
-				this.disabled = false
-			},
-			async _pdaPalletIostorinvOut () {
-				this.disabled = true
-				if (!this.qty || !this.index1 || !this.index2) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await pdaPalletIostorinvOut(this.index1, this.qty, this.index2)
-					if (res.code === '200') {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.clearUp()
-					} else {
-						uni.showToast({
-							title: res.message,
-							icon: 'none'
-						})
-						this.disabled = false
-					}
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-
-</style>
diff --git a/utils/getData01.js b/utils/getData01.js
new file mode 100644
index 0000000..941ae6a
--- /dev/null
+++ b/utils/getData01.js
@@ -0,0 +1,44 @@
+import request from './request.js'
+
+// 版本更新测试
+export const pdaUpdate = () => request({
+	url:'api/pda/update'
+})
+// export const pdaUpdate = () => {
+// 	let res = {
+// 		versionName: '1.0.1',
+// 		url: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk'
+// 	}
+// 	return res
+// }
+
+// 登录
+export const handLogin = (user, password) => request({
+	url:'api/bigScreenScreen/login',
+	data: {
+		user: user,
+		password: password
+	}
+})
+
+/**
+ * 装配线页面确认
+ */
+export const createTask1 = (code) => request({
+	url:'api/pda/createTask1',
+	data: {start_code: code}
+})
+/**
+ * 2、焊接线页面确认
+ */
+export const createTask2 = (scode, ncode) => request({
+	url:'api/pda/createTask2',
+	data: {start_code: scode, next_code: ncode}
+})
+/**
+ * 2、3、装配线点到点
+ */
+export const createTask3 = (scode, ncode) => request({
+	url:'api/pda/createTask3',
+	data: {start_code: scode, next_code: ncode}
+})