diff --git a/common/style/layout.styl b/common/style/layout.styl
index c5961d5..d1cf7c4 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -85,6 +85,11 @@ uni-button:after {
 	white-space: pre-wrap;
 	overflow-wrap: break-word;
 }
+.filter_picker {
+	line-height: 80rpx;
+	font-size: 28rpx;
+	color: #606266;
+}
 .filter_input_disabled {
 	background-color: #eee;
 }
@@ -98,6 +103,11 @@ uni-button:after {
 	justify-content: flex-start;
 	align-items: center;
 }
+.filter_unit {
+	font-size: 28rpx;
+	color: #ff6a00;
+	font-weight: bold; 
+}
 .tab-line {
 	_wh(32rpx, 10rpx)
 	background-color #fff
@@ -272,8 +282,11 @@ uni-button:after {
 	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
 }
 .button-default {
+	display: grid;
+	place-items: center; /* 垂直和水平居中 */
 	font-size: 34rpx;
-	line-height: 88rpx;
+	line-height: 34rpx;
+	height: 88rpx;
 	color: #ff6a00;
 	text-align: center;
 	letter-spacing: 4rpx;
diff --git a/pages/General/distribution-box.vue b/pages/General/distribution-box.vue
index 239d03a..8bd8659 100644
--- a/pages/General/distribution-box.vue
+++ b/pages/General/distribution-box.vue
@@ -1,19 +1,159 @@
 <template>
-	<view>
-		
+	<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-6">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-18">
+						<search-box v-model="code1"/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">所属机台</span>
+					</view>
+					<view class="zd-col-13">
+						<input type="text" class="filter_input">
+					</view>
+					<button class="mini-btn" type="primary" size="mini" @tap="toJump('machine-order?title=机台工单维护')">查询</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" 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">
+						<search-box v-model="code2"/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">重量</span>
+					</view>
+					<view class="zd-col-16">
+						<input type="number" class="filter_input">
+					</view>
+					<view class="zd-col-2"><span class="filter_unit">KG</span></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>重量(kg)</th>
+								<th>生产日期</th>
+								<th>供应商编码</th>
+								<th>供应商名称</th>
+								<th>规格</th>
+								<th>型号</th>
+								<th>有效期(天)</th>
+								<th>执行标准</th>
+								<th>品质类型</th>
+								<th>烘干次数</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<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>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !code1}" :disabled="disabled">确认组箱</button>
+		</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: '',
+				code1: '',
+				code2: '',
+				code3: '',
+				options: [],
+				index: '',
+				dataList: [],
+				disabled: false
 			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/General/${name}`
+				})
+			},
+			/** 下拉框*/
+			async _inStorageOrder () {
+				let res = await inStorageOrder()
+				this.options1 = [...res]
+			},
+			handleChange1 (e) {
+				if (e) {
+					this._getBillNoInfo(e)
+				}
+			},
+			toEmpty () {
+				this.code1 = ''
+			},
+			async _inStorageConfirm () {
+				this.disabled = true
+				if (!this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await inStorageConfirm()
+					if (res.code === '200') {
+						this.index = ''
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/General/line-transfer.vue b/pages/General/line-transfer.vue
index 239d03a..8100e49 100644
--- a/pages/General/line-transfer.vue
+++ b/pages/General/line-transfer.vue
@@ -1,19 +1,99 @@
 <template>
-	<view>
-		
+	<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-6">
+						<span class="filter_label">起点</span>
+					</view>
+					<view class="zd-col-18">
+						<search-box v-model="code1"/>
+					</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="code2"/>
+					</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">
+						<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-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-18 button-primary" :class="{'button-info': !code1}" :disabled="disabled">生成任务</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getDate} from '@/utils/utils.js'
+	import {getStructCount, inStorageOrder, getBillNoInfo, storList, inStorageConfirm} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				title: '',
+				code1: '',
+				code2: '',
+				options: [{value: '1', text: '小料箱'}, {value: '2', text: '大料箱或其他'}],
+				index: '',
+				disabled: false
 			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			/** 下拉框*/
+			async _inStorageOrder () {
+				let res = await inStorageOrder()
+				this.options1 = [...res]
+			},
+			handleChange1 (e) {
+				if (e) {
+					this._getBillNoInfo(e)
+				}
+			},
+			toEmpty () {
+				this.code1 = ''
+			},
+			async _inStorageConfirm () {
+				this.disabled = true
+				if (!this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await inStorageConfirm()
+					if (res.code === '200') {
+						this.index = ''
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/General/machine-order.vue b/pages/General/machine-order.vue
index 239d03a..9548808 100644
--- a/pages/General/machine-order.vue
+++ b/pages/General/machine-order.vue
@@ -1,19 +1,157 @@
 <template>
-	<view>
-		
+	<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-6">
+						<span class="filter_label">日期</span>
+					</view>
+					<view class="zd-col-18 filter_picker">
+						<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
+							<view class="uni-input">{{date}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">关键字</span>
+					</view>
+					<view class="zd-col-14">
+						<input type="text" placeholder="输入物料关键字" class="filter_input" v-model="keyword" @focus="handleFocus">
+					</view>
+					<button class="mini-btn" type="primary" size="mini" @tap="searchList">查询</button>
+				</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.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.unit_id}}</td>
+								<td>{{e.single_weight}}</td>
+								<td>{{e.pcsn}}</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-24 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 {getDate} from '@/utils/utils.js'
+	import {groupMaterList} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
+			const currentDate = getDate({
+				format: true
+			})
 			return {
-				
+				title: '',
+				keyword: null,
+				date: currentDate,
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
 			};
+		},
+		computed: {
+			startDate() {
+				return getDate('start');
+			},
+			endDate() {
+				return getDate('end');
+			}
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleFocus () {
+				this.keyword = null
+			},
+			bindDateChange: function(e) {
+				this.date = e.detail.value
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._groupMaterList()
+			},
+			async _groupMaterList () {
+				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', this.val1)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._groupMaterList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/General/material.vue b/pages/General/material.vue
index 239d03a..c622f10 100644
--- a/pages/General/material.vue
+++ b/pages/General/material.vue
@@ -1,19 +1,131 @@
 <template>
-	<view>
-		
+	<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-5">
+						<span class="filter_label">关键字</span>
+					</view>
+					<view class="zd-col-14">
+						<input type="text" placeholder="输入物料关键字" class="filter_input" v-model="keyword" @focus="handleFocus">
+					</view>
+					<button class="mini-btn" type="primary" size="mini" @tap="searchList">查询</button>
+				</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.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.unit_id}}</td>
+								<td>{{e.single_weight}}</td>
+								<td>{{e.pcsn}}</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-24 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 {groupMaterList} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				title: '',
+				keyword: null,
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
 			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleFocus () {
+				this.keyword = null
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._groupMaterList()
+			},
+			async _groupMaterList () {
+				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', this.val1)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._groupMaterList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/General/operation.vue b/pages/General/operation.vue
index 239d03a..bae061e 100644
--- a/pages/General/operation.vue
+++ b/pages/General/operation.vue
@@ -1,19 +1,176 @@
 <template>
-	<view>
-		
+	<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-5">
+						<span class="filter_label">日期</span>
+					</view>
+					<view class="zd-col-9 filter_picker">
+						<picker mode="date" :value="date1" :start="startDate" :end="endDate" @change="bindDateChange1">
+							<view class="uni-input">{{date1}}</view>
+						</picker>
+					</view>
+					<view class="zd-col-1"><span>-</span></view>
+					<view class="zd-col-9 filter_picker">
+						<picker mode="date" :value="date2" :start="startDate" :end="endDate" @change="bindDateChange2">
+							<view class="uni-input">{{date2}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">关键字</span>
+					</view>
+					<view class="zd-col-14">
+						<input type="text" placeholder="载具号/点位号/作业号" class="filter_input" v-model="keyword" @focus="handleFocus">
+					</view>
+					<button class="mini-btn" type="primary" size="mini" @tap="searchList">查询</button>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>作业日期</th>
+								<th>载具号</th>
+								<th>起点</th>
+								<th>终点</th>
+								<th>状态</th>
+								<th>作业号</th>
+								<th>作业类型</th>
+								<th>设备号</th>
+								<th>备注</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.unit_id}}</td>
+								<td>{{e.single_weight}}</td>
+								<td>{{e.pcsn}}</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-24 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 {getDate} from '@/utils/utils.js'
+	import {groupMaterList} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
+			const currentDate = getDate({
+				format: true
+			})
 			return {
-				
+				title: '',
+				keyword: null,
+				date1: currentDate,
+				date2: currentDate,
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
 			};
+		},
+		computed: {
+			startDate() {
+				return getDate('start');
+			},
+			endDate() {
+				return getDate('end');
+			}
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleFocus () {
+				this.keyword = null
+			},
+			bindDateChange1: function(e) {
+				this.date1 = e.detail.value
+			},
+			bindDateChange2: function(e) {
+				this.date2 = e.detail.value
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._groupMaterList()
+			},
+			async _groupMaterList () {
+				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', this.val1)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._groupMaterList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
 		}
 	}
 </script>
 
-<style lang="stylus">
-
-</style>
+<style scoped>
+.filter_picker {
+	text-align: center
+}
+</style>
\ No newline at end of file
diff --git a/pages/General/ops-mgmt.vue b/pages/General/ops-mgmt.vue
index 239d03a..d551341 100644
--- a/pages/General/ops-mgmt.vue
+++ b/pages/General/ops-mgmt.vue
@@ -1,19 +1,109 @@
 <template>
-	<view>
-		
+	<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-5">
+						<span class="filter_label">关键字</span>
+					</view>
+					<view class="zd-col-14">
+						<input type="text" placeholder="载具号/点位号/作业号" class="filter_input" v-model="keyword" @focus="handleFocus">
+					</view>
+					<button class="mini-btn" type="primary" size="mini" @tap="searchList">查询</button>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>载具号</th>
+								<th>起点</th>
+								<th>终点</th>
+								<th>状态</th>
+								<th>作业号</th>
+								<th>作业类型</th>
+								<th>设备号</th>
+								<th>当前步骤</th>
+								<th>异常信息</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.unit_id}}</td>
+								<td>{{e.single_weight}}</td>
+								<td>{{e.pcsn}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" :disabled="disabled">重新下发</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !pkId}" :disabled="disabled">强制完成</button>
+			<button class="zd-col-7 button-primary" @tap="toJump('operation?title=查询作业')">历史查询</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {groupMaterList} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				title: '',
+				keyword: null,
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
 			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleFocus () {
+				this.keyword = null
+			},
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/General/${name}`
+				})
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._groupMaterList()
+			},
+			async _groupMaterList () {
+				let res = await groupMaterList()
+				if (res.code === '200') {
+					this.dataList = [...res]
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/General/pick-place-goods.vue b/pages/General/pick-place-goods.vue
index 239d03a..092ab41 100644
--- a/pages/General/pick-place-goods.vue
+++ b/pages/General/pick-place-goods.vue
@@ -1,19 +1,162 @@
 <template>
-	<view>
-		
+	<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-6">
+						<span class="filter_label">点位/载具</span>
+					</view>
+					<view class="zd-col-18">
+						<search-box v-model="code1"/>
+					</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" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-4">
+						<span class="filter_label filter_input_disabled">任务号</span>
+					</view>
+					<view class="zd-col-8">
+						<input type="text" class="filter_input filter_input_disabled" disabled>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label filter_input_disabled">AGV</span>
+					</view>
+					<view class="zd-col-8">
+						<input type="text" class="filter_input filter_input_disabled" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-4">
+						<span class="filter_label filter_input_disabled">起点</span>
+					</view>
+					<view class="zd-col-8">
+						<input type="text" class="filter_input filter_input_disabled" disabled>
+					</view>
+					<view class="zd-col-4">
+						<span class="filter_label filter_input_disabled">终点</span>
+					</view>
+					<view class="zd-col-8">
+						<input type="text" class="filter_input filter_input_disabled" disabled>
+					</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>重量(kg)</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>{{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>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-9 button-primary" :class="{'button-info': !code1}" :disabled="disabled">确认取货</button>
+			<button class="zd-col-9 button-primary" :class="{'button-info': !code1}" :disabled="disabled">确认放货</button>
+		</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: '',
+				code1: '',
+				code2: '',
+				code3: '',
+				options: [],
+				index: '',
+				dataList: [],
+				disabled: false
 			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/General/${name}`
+				})
+			},
+			/** 下拉框*/
+			async _inStorageOrder () {
+				let res = await inStorageOrder()
+				this.options1 = [...res]
+			},
+			handleChange1 (e) {
+				if (e) {
+					this._getBillNoInfo(e)
+				}
+			},
+			toEmpty () {
+				this.code1 = ''
+			},
+			async _inStorageConfirm () {
+				this.disabled = true
+				if (!this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await inStorageConfirm()
+					if (res.code === '200') {
+						this.index = ''
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/General/pt-update.vue b/pages/General/pt-update.vue
index 239d03a..fbe6b08 100644
--- a/pages/General/pt-update.vue
+++ b/pages/General/pt-update.vue
@@ -1,19 +1,158 @@
 <template>
-	<view>
-		
+	<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-6">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="zd-col-18">
+						<search-box v-model="code1"/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-13">
+						<search-box v-model="code2"/>
+					</view>
+					<button class="mini-btn" type="primary" size="mini">查询</button>
+				</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.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.unit_id}}</td>
+								<td>{{e.single_weight}}</td>
+								<td>{{e.pcsn}}</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-6 button-primary" :class="{'button-info': !pkId}" @tap="toSure">绑定</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" @tap="toSure">清载具</button>
+			<button class="zd-col-6 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 {getDate} from '@/utils/utils.js'
+	import {groupMaterList} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
+			const currentDate = getDate({
+				format: true
+			})
 			return {
-				
+				title: '',
+				keyword: null,
+				date: currentDate,
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
 			};
+		},
+		computed: {
+			startDate() {
+				return getDate('start');
+			},
+			endDate() {
+				return getDate('end');
+			}
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleFocus () {
+				this.keyword = null
+			},
+			bindDateChange: function(e) {
+				this.date = e.detail.value
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._groupMaterList()
+			},
+			async _groupMaterList () {
+				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', this.val1)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._groupMaterList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/General/supplier.vue b/pages/General/supplier.vue
index 239d03a..5bc6734 100644
--- a/pages/General/supplier.vue
+++ b/pages/General/supplier.vue
@@ -1,19 +1,125 @@
 <template>
-	<view>
-		
+	<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-5">
+						<span class="filter_label">关键字</span>
+					</view>
+					<view class="zd-col-14">
+						<input type="text" placeholder="输入供应商关键字" class="filter_input" v-model="keyword" @focus="handleFocus">
+					</view>
+					<button class="mini-btn" type="primary" size="mini" @tap="searchList">查询</button>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>供应商编码</th>
+								<th>供应商名称</th>
+								<th>备注</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_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-24 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 {groupMaterList} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				title: '',
+				keyword: null,
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
 			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleFocus () {
+				this.keyword = null
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._groupMaterList()
+			},
+			async _groupMaterList () {
+				let res = await groupMaterList(this.pageNum + '', this.pageSize + '', this.val1)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._groupMaterList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/General/warehouse-box.vue b/pages/General/warehouse-box.vue
index 228d94e..db7e2d6 100644
--- a/pages/General/warehouse-box.vue
+++ b/pages/General/warehouse-box.vue
@@ -5,131 +5,104 @@
 		<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 class="zd-col-6">
+						<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 class="zd-col-18">
+						<search-box v-model="code1"/>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
-						<span class="filter_label">单据编码</span>
+						<span class="filter_label">物料编码</span>
 					</view>
-					<view class="zd-col-12">
-						<search-box v-model="code" @handleChange="handleChange1" @handleDel="handleDel1" />
+					<view class="zd-col-13">
+						<search-box v-model="code2"/>
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="toSearch">查询</button>
+					<button class="mini-btn" type="primary" size="mini" @tap="toJump('material?title=物料维护')">查询</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>
+						<input type="text" class="filter_input filter_input_disabled" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
-						<span class="filter_label filter_input_disabled">物料规格</span>
+						<span class="filter_label">供应商编码</span>
+					</view>
+					<view class="zd-col-13">
+						<search-box v-model="code3"/>
+					</view>
+					<button class="mini-btn" type="primary" size="mini" @tap="toJump('supplier?title=供应商维护')">查询</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_spec" disabled>
+						<input type="text" class="filter_input filter_input_disabled" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
-						<span class="filter_label filter_input_disabled">单位</span>
+						<span class="filter_label">批次</span>
 					</view>
 					<view class="zd-col-18">
-						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.unit_name" disabled>
+						<input type="text" class="filter_input">
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
-						<span class="filter_label">物料批次</span>
+						<span class="filter_label">生产日期</span>
 					</view>
-					<view class="zd-col-18">
-						<input type="text" class="filter_input" v-model="currentData.pcsn">
+					<view class="zd-col-18 filter_picker">
+						<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
+							<view class="uni-input">{{date}}</view>
+						</picker>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
-						<span class="filter_label">物料数量</span>
+						<span class="filter_label">重量</span>
 					</view>
-					<view class="zd-col-18">
-						<input type="number" class="filter_input" v-model="val1">
+					<view class="zd-col-16">
+						<input type="number" class="filter_input">
 					</view>
+					<view class="zd-col-2"><span class="filter_unit">KG</span></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>
+						<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>
+						<uni-data-select v-model="index" :localdata="options"></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-18">
+						<input type="number" 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': !val1 || !val1 || !index || !index1}" :disabled="disabled" @tap="_inStorageConfirm">组盘确认</button>
+			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-9 button-primary" :class="{'button-info': !code1}" :disabled="disabled">确认组箱</button>
+			<button class="zd-col-9 button-primary" :class="{'button-info': !code1}" :disabled="disabled">标签打印</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 {getDate} from '@/utils/utils.js'
 	import {getStructCount, inStorageOrder, getBillNoInfo, storList, inStorageConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
@@ -137,169 +110,63 @@
 			SearchBox
 		},
 		data() {
+			const currentDate = getDate({
+				format: true
+			})
 			return {
 				title: '',
-				code: '',
-				show: false,
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				currentData: {},
-				val1: null,
-				val2: null,
+				code1: '',
+				code2: '',
+				code3: '',
+				date: currentDate,
 				options: [],
 				index: '',
-				disabled: false,
-				options1: [],
-				index1: '',
-				kwData: {}
+				disabled: false
 			};
 		},
+		computed: {
+			startDate() {
+				return getDate('start');
+			},
+			endDate() {
+				return getDate('end');
+			}
+		},
 		onLoad (options) {
 			this.title = options.title
-			this._inStorageOrder()
-			this._storList()
 		},
 		methods: {
+			toJump (name) {
+				uni.navigateTo({
+					url: `/pages/General/${name}`
+				})
+			},
+			bindDateChange: function(e) {
+				this.date = e.detail.value
+			},
 			/** 下拉框*/
 			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 = {}
+				this.code1 = ''
 			},
 			async _inStorageConfirm () {
 				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.index || !this.index1) {
+				if (!this.index) {
 					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)
+					let res = await inStorageConfirm()
 					if (res.code === '200') {
 						this.index = ''
-						this.val1 = null
-						this.val2 = null
 					}
 					this.disabled = false
 					uni.showToast({
@@ -312,9 +179,4 @@
 			}
 		}
 	}
-</script>
-
-<style lang="stylus" scoped>
-.msg_wrapper
-	height: calc(100% - var(--status-bar-height) - 72rpx)
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 0d6f19d..b001c83 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -46,7 +46,6 @@
 						{title: '入库组箱', path: '/pages/General/warehouse-box'},
 						{title: '配送组箱', path: '/pages/General/distribution-box'},
 						{title: '点对点转运', path: '/pages/General/line-transfer'},
-						{title: '点对点转运', path: '/pages/General/line-transfer'},
 						{title: '确认取放货', path: '/pages/General/pick-place-goods'},
 						{title: '作业管理', path: '/pages/General/ops-mgmt'},
 						{title: '点位更新', path: '/pages/General/pt-update'}
diff --git a/utils/utils.js b/utils/utils.js
index 6f94817..a28107e 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -36,4 +36,23 @@ export const dateFtt = date => {
     }
     return new Date(Date.parse(date))
   }
+  
+  /**
+   * 获取当前日期
+   */
+  export const getDate = type => {
+	  const date = new Date();
+	  let year = date.getFullYear();
+	  let month = date.getMonth() + 1;
+	  let day = date.getDate();
+	  
+	  if (type === 'start') {
+	  	year = year - 10;
+	  } else if (type === 'end') {
+	  	year = year + 10;
+	  }
+	  month = month > 9 ? month : '0' + month;
+	  day = day > 9 ? day : '0' + day;
+	  return `${year}-${month}-${day}`;
+  }
   
\ No newline at end of file