diff --git a/pages.json b/pages.json
index 3cb3dfd..77eb7cb 100644
--- a/pages.json
+++ b/pages.json
@@ -726,6 +726,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/SecondPhase/slitting/GdsPrepInOut",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/slitting/GdsPrepInOut.vue b/pages/SecondPhase/slitting/GdsPrepInOut.vue
new file mode 100644
index 0000000..d561b04
--- /dev/null
+++ b/pages/SecondPhase/slitting/GdsPrepInOut.vue
@@ -0,0 +1,141 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="备货出入库"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val1" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">托盘号</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>起点</th>
+								<th>终点</th>
+								<th>任务类型</th>
+								<th>载具号</th>
+								<th>创建时间</th>
+								<th>更新时间</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{e.point_code1}}</td>
+								<td>{{e.point_code2}}</td>
+								<td>{{e.vehicle_type}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.update_time}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">清空</button>
+			<button class="zd-col-5 btn-submit btn-success" @tap="_taskTubeVehicle">刷新数据</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_emptyTubeVehicleOut">托盘移出</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_fullTubeVehicleIn">备货入库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {taskTubeVehicle, fullTubeVehicleIn, emptyTubeVehicleOut} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				dataList: [],
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._taskTubeVehicle()
+		},
+		methods: {
+			/**查询物料下拉框*/
+			async _taskTubeVehicle () {
+				this.dataList = []
+				try {
+					let res = await taskTubeVehicle()
+					if (res && res.status === 200) {
+						this.dataList = [...res.data]
+					} else {
+						this.dataList = []
+					}
+				} catch (e) {
+					this.dataList = []
+				}
+			},
+			async _emptyTubeVehicleOut () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await emptyTubeVehicleOut(this.val1, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.clearUp()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _fullTubeVehicleIn () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await fullTubeVehicleIn(this.val1, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.clearUp()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/utils/getData3.js b/utils/getData3.js
index d46bb36..acbb101 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -615,3 +615,18 @@ export const applyCallShaft = (area, code, row) => request({
 	url:'api/wms/apply/callShaft',
 	data: {area: area, point_code: code, row: row}
 })
+/**
+ * 备货出入库
+ */
+export const taskTubeVehicle = () => request({
+	url:'api/pda/slitter/taskTubeVehicle',
+	data: {}
+})
+export const fullTubeVehicleIn = (point, code) => request({
+	url:'api/pda/slitter/fullTubeVehicleIn',
+	data: {point_code: point, vehicle_code: code}
+})
+export const emptyTubeVehicleOut = (point, code) => request({
+	url:'api/pda/slitter/emptyTubeVehicleOut',
+	data: {point_code: point, vehicle_code: code}
+})
diff --git a/utils/mork2.js b/utils/mork2.js
index 8ef980c..de1caf8 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -107,12 +107,12 @@ export const allAuthority = () => {
 				{menu_id: '8', title: '人工呼叫套轴顺序', path: '/pages/SecondPhase/slitting/CallAxisSeq'},
 				{menu_id: '8', title: '母卷暂存管理', path: '/pages/SecondPhase/slitting/RollCacheManage'},
 				{menu_id: '8', title: '饵料下卷', path: '/pages/SecondPhase/slitting/BaitRoll'},
-				{menu_id: '8', title: '空轴绑定', path: '/pages/SecondPhase/slitting/EmptyAxisBind'},
 				{menu_id: '8', title: '空轴退回', path: '/pages/SecondPhase/slitting/EmptyAxisReturn'},
 				{menu_id: '8', title: '分切暂存维护', path: '/pages/SecondPhase/slitting/CacheSave'},
 				{menu_id: '8', title: '呼叫套轴', path: '/pages/SecondPhase/slitting/CallAxis'},
 				{menu_id: '8', title: '子卷拼单', path: '/pages/SecondPhase/slitting/Zjpindan'},
-				{menu_id: '8', title: '人工呼叫空轴', path: '/pages/SecondPhase/slitting/ManEmptyAxle'}
+				{menu_id: '8', title: '人工呼叫空轴', path: '/pages/SecondPhase/slitting/ManEmptyAxle'},
+				{menu_id: '11', title: '备货出入库', path: '/pages/SecondPhase/slitting/GdsPrepInOut'}
 			]},
 			{menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [
 				{menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'},