diff --git a/components/NumberInput.vue b/components/NumberInput.vue
new file mode 100644
index 0000000..5a3e3f5
--- /dev/null
+++ b/components/NumberInput.vue
@@ -0,0 +1,34 @@
+<template>
+  <input
+    class="filter_input"
+    type="number"
+    :value="value"
+    :placeholder="placeholder"
+    @input="onInput"
+	@confirm="onInput"
+  />
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: [Number, String],
+      default: '',
+    },
+	placeholder: String
+  },
+  methods: {
+    onInput(event) {
+      // 获取输入值
+      const value = event.detail ? event.detail.value : event.target.value;
+      // 格式化输入值
+      let formattedValue = value.replace(/[^0-9.]/g, '')
+	  formattedValue = parseFloat(formattedValue)
+	  formattedValue = formattedValue > 0 ? formattedValue : ''
+      this.$emit('input', formattedValue);
+	  event.target.value = formattedValue
+    }
+  },
+};
+</script>
diff --git a/pages.json b/pages.json
index a980ffb..97755fb 100644
--- a/pages.json
+++ b/pages.json
@@ -25,7 +25,7 @@
 		    }  
 		}
         ,{
-            "path" : "pages/manage/ckqr",
+            "path" : "pages/manage/test",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
@@ -33,7 +33,63 @@
             
         }
         ,{
-            "path" : "pages/manage/test",
+            "path" : "pages/manage/wlzp",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/ddzy",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/zprk",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/rgjl",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/sgyk",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/zygl",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/dwgx",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/common/cxwl",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 267e2ba..d884dac 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -32,7 +32,13 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '出库确认', icon: 'RF02', path: '/pages/manage/ckqr'}
+					{title: '物料组盘', icon: 'RF01', path: '/pages/manage/wlzp'},
+					{title: '定点作业', icon: 'RF02', path: '/pages/manage/ddzy'},
+					{title: '组盘入库', icon: 'RF03', path: '/pages/manage/zprk'},
+					{title: '人工叫料', icon: 'RF04', path: '/pages/manage/rgjl'},
+					{title: '手工移库', icon: 'RF05', path: '/pages/manage/sgyk'},
+					{title: '作业管理', icon: 'RF06', path: '/pages/manage/zygl'},
+					{title: '点位更新', icon: 'RF07', path: '/pages/manage/dwgx'}
 				],
 				show: false,
 				secM: []
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 6817745..4a99fa6 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -67,9 +67,6 @@
 				})
 			},
 			async toLogin() {
-				uni.redirectTo({
-					url: '/pages/home/home'
-				})
 				this.disabled = true
 				if (this.user === '') {
 					uni.showToast({
diff --git a/pages/manage/ckqr.vue b/pages/manage/ckqr.vue
deleted file mode 100644
index 58e89d8..0000000
--- a/pages/manage/ckqr.vue
+++ /dev/null
@@ -1,121 +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-5">
-						<span class="filter_label">RFID</span>
-					</view>
-					<view class="zd-col-14 filter_select">
-						<input type="text" class="filter_input" v-model="val1">
-					</view>
-					<view class="zd-col-5 zd-row jcflexend">
-						<button type="primary" size="mini" style="margin-right:0;text-align: right;" @tap="writeData">读取</button>
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">托盘</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<input type="text" class="filter_input" v-model="val2">
-					</view>
-				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">站点</span>
-					</view>
-					<view class="zd-col-14 filter_select">
-						<input type="text" class="filter_input" v-model="val3">
-					</view>
-					<view class="zd-col-5 zd-row jcflexend">
-						<button type="primary" size="mini" style="margin-right:0;text-align: right;">查询</button>
-					</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.checked}">
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.pcsn}}</td>
-								<td>{{e.num}}</td>
-								<td>{{e.qty}}</td>
-								<td>{{e.code}}</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-15 button-primary" :class="{'button-info': !val1 || !val2 || !val3}" :disabled="disabled" @tap="_mlTask">确认出库</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {mlTask} from '@/utils/getData.js'
-	
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				val3: '',
-				dataList: [],
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		methods: {
-			writeData () {
-			},
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.val3 = ''
-			},
-			async _mlTask () {
-				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.val3) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await mlTask(this.val1, this.val2, this.val3)
-					this.disabled = false
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/pages/manage/common/cxwl.vue b/pages/manage/common/cxwl.vue
new file mode 100644
index 0000000..102521f
--- /dev/null
+++ b/pages/manage/common/cxwl.vue
@@ -0,0 +1,129 @@
+<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">
+						<input type="text" class="filter_input" 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>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.material_id === pkId}" @tap="toCheck(e)">
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_code}}</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 {getMaterialList} from '@/utils/getData.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this.searchList()
+		},
+		methods: {
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._getMaterialList()
+			},
+			async _getMaterialList () {
+				let res = await getMaterialList( this.val1, this.pageNum + '', this.pageSize + '')
+				// this.dataList = res.data
+				this.totalCount = res.totalElements
+				if (res.totalElements > 0) {
+					const dataMap = res.data
+					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._getMaterialList()
+					}, 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 : {}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.dataList = []
+				this.pageNum = 1
+				this.pkId = ''
+			},
+			toSure () {
+				if (this.pkId) {
+					this.$store.dispatch('setPublicObj', this.pkObj)
+					uni.navigateBack()
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/manage/ddzy.vue b/pages/manage/ddzy.vue
new file mode 100644
index 0000000..9d547c5
--- /dev/null
+++ b/pages/manage/ddzy.vue
@@ -0,0 +1,150 @@
+<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="val3"
+						/>
+					</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">
+						<search-box
+						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/getData.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val3: '',
+				val2: '',
+				options: [{text:'站点', value:'1'},{text:'区域',value: '2'}],
+				index: '2',
+				// 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
+						this.index2 = res[4].value
+					} else {
+						this.options2 =[]
+					}
+				} catch (e) {
+					this.options2 = []
+				}
+			},
+			selectChange (e) {
+				this.index = e
+			},
+			selectChange2 (e) {
+				this.index2 = e
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val3 = ''
+				this.index2 = ''
+				this.disabled = false
+				this.kwData = {}
+			},
+			async _transferConfirm () {
+				this.disabled = true
+				if (!this.val3 || !this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await transferConfirm(this.val3, 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/manage/dwgx.vue b/pages/manage/dwgx.vue
new file mode 100644
index 0000000..8afccdf
--- /dev/null
+++ b/pages/manage/dwgx.vue
@@ -0,0 +1,151 @@
+<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-12">
+						<search-box v-model="val2"/>
+					</view>
+					<button class="mini-btn" type="primary" size="mini" style="margin-right: 0" @tap="_schPointGetPoint">查询</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">
+								<td>{{i+1}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.unit_code}}</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-8 button-primary" :class="{'button-info': !val1 || val2}" :disabled="disabled" @tap="_schPointBinding">绑定</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || val2}" :disabled="disabled" @tap="_schPointDissect">清载具</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {schPointGetPoint, schPointBinding, schPointDissect} from '@/utils/getData.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toEmpty () {
+				this.val1 = ''
+				this.val2 = ''
+				this.dataList = []
+			},
+			async _schPointGetPoint () {
+				try {
+					let res = await schPointGetPoint(this.val1, this.val2)
+					if (res.status === '200') {
+						this.dataList = [...res.data]
+					}
+				} catch(e) {
+					this.dataList = []
+				}
+			},
+			async _schPointBinding () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await schPointBinding(this.val1, this.val2)
+					if (res.status === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.toEmpty()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _schPointDissect () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await schPointDissect(this.val1, this.val2)
+					if (res.status === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.toEmpty()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/manage/rgjl.vue b/pages/manage/rgjl.vue
new file mode 100644
index 0000000..b6f56b3
--- /dev/null
+++ b/pages/manage/rgjl.vue
@@ -0,0 +1,213 @@
+<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.struct_code}}</td>
+								<td>{{e.storagevehicle_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.material_code}}</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-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/getData.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()
+			setTimeout(() => {
+				this.seachList()
+			},2000)
+		},
+		methods: {
+			async _getRegion () {
+				try {
+					let res = await getRegion('YZHJ')
+					if (res) {
+						this.options = res
+						this.index = res[0].value
+					} 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) {
+				if (e.material_code === 'KH001') {
+					return
+				}
+				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
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.pkId = ''
+				this.pkObj = {}
+				this.dataList = []
+			}
+		}
+	}
+</script>
diff --git a/pages/manage/sgyk.vue b/pages/manage/sgyk.vue
new file mode 100644
index 0000000..f2495ac
--- /dev/null
+++ b/pages/manage/sgyk.vue
@@ -0,0 +1,135 @@
+<template>
+	<view class="zd_container">
+		<!-- 手工移库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">移出货位</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box v-model="val1"/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">移出载具</span>
+					</view>
+					<view class="zd-col-12">
+						<search-box v-model="val2"/>
+					</view>
+					<button class="mini-btn" type="primary" size="mini" style="margin-right: 0" @tap="_movestorQuerydtl">查询</button>
+				</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="val3"/>
+					</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">
+								<td>{{i+1}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.unit_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</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 || !val2 || !val3}" :disabled="disabled" @tap="_movestorMove">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {movestorQuerydtl, movestorMove} from '@/utils/getData.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _movestorQuerydtl () {
+				try {
+					let res = await movestorQuerydtl(this.val1, this.val2)
+					if (res.status === '200') {
+						this.dataList = [...res.data]
+					}
+				} catch(e) {
+					this.dataList = []
+				}
+			},
+			toEmpty (e) {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.dataList = []
+			},
+			async _movestorMove () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.val3) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await movestorMove(this.val1, this.val2, this.val3)
+					if (res.status === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this._movestorQuerydtl()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/manage/wlzp.vue b/pages/manage/wlzp.vue
new file mode 100644
index 0000000..9991d11
--- /dev/null
+++ b/pages/manage/wlzp.vue
@@ -0,0 +1,145 @@
+<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"/>
+					</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">
+						<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">
+						<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">
+						<search-box v-model="val1"/>
+					</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/getData.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			NumberInput
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				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/manage/common/cxwl?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.val3, 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/manage/zprk.vue b/pages/manage/zprk.vue
new file mode 100644
index 0000000..4141873
--- /dev/null
+++ b/pages/manage/zprk.vue
@@ -0,0 +1,184 @@
+<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/getData.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/manage/zygl.vue b/pages/manage/zygl.vue
new file mode 100644
index 0000000..af95625
--- /dev/null
+++ b/pages/manage/zygl.vue
@@ -0,0 +1,147 @@
+<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>
+			<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" @tap="toChek(e)" :class="{'checked': pkId === e.task_code}">
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.point_code1}}</td>
+								<td>{{e.point_code2}}</td>
+								<td>{{e.task_status}}</td>
+								<td>{{e.task_code}}</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-5 button-primary" @tap="_schTaskQueryTask">查询</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_schTaskAgainTask">重新下发</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_forceConfirm">强制完成</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {schTaskQueryTask, schTaskAgainTask, forceConfirm} from '@/utils/getData.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toEmpty () {
+				this.val1 = ''
+				this.dataList = []
+			},
+			async _schTaskQueryTask () {
+				try {
+					let res = await schTaskQueryTask(this.val1)
+					if (res.status === '200') {
+						this.dataList = [...res.data]
+					}
+				} catch(e) {
+					this.dataList = []
+				}
+			},
+			toChek (e) {
+				this.pkId = this.pkId === e.task_code ? '' : e.task_code
+				this.pkObj = this.pkId === e.task_code ? e : {}
+			},
+			async _schTaskAgainTask () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await schTaskAgainTask(this.pkId)
+					if (res.status === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this._schTaskQueryTask()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _forceConfirm () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await forceConfirm(this.pkId)
+					if (res.status === '200') {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this._schTaskQueryTask()
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.disabled = false
+					}
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png
index 7fb4f12..af989ff 100644
Binary files a/static/image/menu/RF01.png and b/static/image/menu/RF01.png differ
diff --git a/static/image/menu/RF02.png b/static/image/menu/RF02.png
index 30c871f..ab42ca3 100644
Binary files a/static/image/menu/RF02.png and b/static/image/menu/RF02.png differ
diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png
index af989ff..18a06e7 100644
Binary files a/static/image/menu/RF03.png and b/static/image/menu/RF03.png differ
diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png
index d648d05..b33885f 100644
Binary files a/static/image/menu/RF04.png and b/static/image/menu/RF04.png differ
diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
index ab42ca3..1bc47ed 100644
Binary files a/static/image/menu/RF05.png and b/static/image/menu/RF05.png differ
diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png
index ee6ef08..e18e35a 100644
Binary files a/static/image/menu/RF07.png and b/static/image/menu/RF07.png differ
diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png
deleted file mode 100644
index a65670b..0000000
Binary files a/static/image/menu/RF08.png and /dev/null differ
diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
deleted file mode 100644
index d2b969b..0000000
Binary files a/static/image/menu/RF09.png and /dev/null differ
diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
deleted file mode 100644
index df4e2f4..0000000
Binary files a/static/image/menu/RF10.png and /dev/null differ
diff --git a/static/image/menu/RF11.png b/static/image/menu/RF11.png
deleted file mode 100644
index 1bc47ed..0000000
Binary files a/static/image/menu/RF11.png and /dev/null differ
diff --git a/utils/getData.js b/utils/getData.js
index 116167f..dbfc5f7 100644
--- a/utils/getData.js
+++ b/utils/getData.js
@@ -21,12 +21,89 @@ export const handLogin = (user, password) => request({
 	}
 })
 
-export const mlTask = (code, vcode, weight, qty) => request({
-	url:'api/pda/mlTask',
-	data: {
-		deviceCode: code,
-		vehicle_code: vcode,
-		weight: weight,
-		qty: qty
-	}
+// 公共接口
+// 仓库列表/区域列表
+export const getSect = (scode, page, size) => request({
+	url:'api/pda/iosIn/getSect',
+	data: {stor_code: scode, page: page, size: size}
+})
+// 区域列表
+export const getRegion = (region, page, size) => request({
+	url:'api/pda/iosIn/getRegion',
+	data: {region: region, page: page, size: size}
+})
+// 获取物料列表
+export const getMaterialList = (search, page, size) => request({
+	url:'api/pda/iosIn/getMaterialList',
+	data: {search: search, page: page, size: size}
+})
+
+// 物料组盘确认
+export const groupPlate = (mid, pcsn, qty, vcode, ecode, siteCode) => request({
+	url:'api/pda/iosIn/groupPlate',
+	data: {material_id: mid, pcsn: pcsn, qty: qty, vehicle_code: vcode, ext_code: ecode, siteCode}
+})
+
+// 定点确认
+export const transferConfirm = (pointCode, scode, siteCode, rcode) => request({
+	url:'api/pda/iosOut/transferConfirm',
+	data: {pointCode: pointCode, storagevehicle_code: scode, siteCode: siteCode, region_code: rcode}
+})
+
+// 组盘入库
+export const getVehicleMaterial = (search) => request({
+	url:'api/pda/iosIn/getVehicleMaterial',
+	data: {search: search}
+})
+export const confirmIn = (vcode, sitecode, sid) => request({
+	url:'api/pda/iosIn/confirmIn',
+	data: {vehicle_code: vcode,  site_code: sitecode, sect_id: sid}
+})
+
+// 人工叫料
+export const linegetMaterialDtl = (rcode, search) => request({
+	url:'api/pda/iosOut/getMaterialDtl',
+	data: {region_code: rcode, search: search}
+})
+export const callMaterialConfirm = (rcode, siteCode, obj) => request({
+	url:'api/pda/iosOut/callMaterialConfirm',
+	data: {region_code: rcode, siteCode: siteCode, obj: obj}
+})
+
+// 手工移库
+export const movestorQuerydtl = (code, vcode) => request({
+	url:'api/pda/movestor/querydtl',
+	data: {struct_code: code, vehicle_code: vcode}
+})
+export const movestorMove = (code, vcode, mcode) => request({
+	url:'api/pda/movestor/move',
+	data: {struct_code: code, vehicle_code: vcode, move_struct_code: mcode}
+})
+
+// 作业管理
+export const schTaskQueryTask = (code) => request({
+	url:'/api/pda/schTask/queryTask',
+	data: {task_code: code}
+})
+export const schTaskAgainTask = (code) => request({
+	url:'api/pda/schTask/againTask',
+	data: {task_code: code}
+})
+export const forceConfirm = (code) => request({
+	url:'api/pda/schTask/forceConfirm',
+	data: {task_code: code}
+})
+
+// 
+export const schPointGetPoint = (code, vcode) => request({
+	url:'/api/pda/schPoint/getPoint',
+	data: {struct_code: code, vehicle_code: vcode}
+})
+export const schPointBinding = (code, vcode) => request({
+	url:'api/pda/schPoint/binding',
+	data: {struct_code: code, vehicle_code: vcode}
+})
+export const schPointDissect = (code, vcode) => request({
+	url:'/api/pda/schPoint/dissect',
+	data: {struct_code: code, vehicle_code: vcode}
 })
\ No newline at end of file
diff --git a/vuex/modules/data.js b/vuex/modules/data.js
new file mode 100644
index 0000000..e2914f9
--- /dev/null
+++ b/vuex/modules/data.js
@@ -0,0 +1,31 @@
+import * as types from '../types'
+const state = {
+	publicObj: '',
+	publicArr: ''
+}
+const getters = {
+	publicObj: state => state.publicObj,
+	publicArr: state => state.publicArr
+}
+const actions = {
+  setPublicObj ({commit}, res) {
+    commit(types.PUBLIC_OBJ, res)
+  },
+  setPublicArr ({commit}, res) {
+    commit(types.PUBLIC_ARR, res)
+  }
+}
+const mutations = {
+	[types.PUBLIC_OBJ] (state, res) {
+	  state.publicObj = res
+	},
+	[types.PUBLIC_ARR] (state, res) {
+	state.publicArr = res
+	}
+}
+export default {
+  state,
+  getters,
+  actions,
+  mutations
+}
\ No newline at end of file
diff --git a/vuex/store.js b/vuex/store.js
index 095161f..f8cd813 100644
--- a/vuex/store.js
+++ b/vuex/store.js
@@ -2,11 +2,13 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 
 import user from './modules/user'
+import data from './modules/data'
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
   modules: {
-    user
+    user,
+	data
   }
 })
diff --git a/vuex/types.js b/vuex/types.js
index 4668940..e66f0dc 100644
--- a/vuex/types.js
+++ b/vuex/types.js
@@ -6,4 +6,9 @@ export const DEL_LOGIN_NAME = 'DEL_LOGIN_NAME'
 export const COM_CONFIG = 'COM_CONFIG'
 export const SAVE_USER_INFO = 'SAVE_USER_INFO'
 export const DEL_USER_INFO = 'DEL_USER_INFO'
-export const SAVE_TOKEN = 'SAVE_TOKEN'
\ No newline at end of file
+export const SAVE_TOKEN = 'SAVE_TOKEN'
+/**
+ * data
+ */
+export const PUBLIC_OBJ = 'PUBLIC_OBJ'
+export const PUBLIC_ARR = 'PUBLIC_ARR'
\ No newline at end of file