diff --git a/pages.json b/pages.json
index 2862ce2..19e14c5 100644
--- a/pages.json
+++ b/pages.json
@@ -527,6 +527,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/SecondPhase/slitting/UpperShaftCut",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/slitting/UpperShaftCut.vue b/pages/SecondPhase/slitting/UpperShaftCut.vue
new file mode 100644
index 0000000..629e569
--- /dev/null
+++ b/pages/SecondPhase/slitting/UpperShaftCut.vue
@@ -0,0 +1,138 @@
+<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">区域</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">点位</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :searchInput="true" :localdata="newoptions" @change="selectChange" @handleChange="handleChange" @showSelector="showSelector"></uni-data-select>
+					</view>
+				</view>
+				<view class="msg_item">暂存A位：{{obj.a_point}}</view>
+				<view class="msg_item">暂存B位：{{obj.b_point}}</view>
+				<view class="msg_item">提示：{{obj.tip}}</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index}" :disabled="disabled" @tap="_doUpShaftToSlitter">上轴</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {queryProductArea} from '@/utils/getData2.js'
+	import {getCutCacheAgvPoints, getUpShaftTip, doUpShaftToSlitter} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				newoptions: [],
+				options2: [],
+				index2: '',
+				obj: {a_point: '-', b_point: '-', tip: '-'},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._queryProductArea()
+		},
+		methods: {
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options2 = [...res.data]
+			},
+			selectChange2(e) {
+				this.index2 = e
+				if (e) {
+					this._getCutCacheAgvPoints(e)
+				} else {
+					this.index = ''
+				}
+			},
+			async _getCutCacheAgvPoints (e) {
+				let res = await getCutCacheAgvPoints(e)
+				this.options = [...res]
+				this.newoptions = [...res]
+			},
+			selectChange (e) {
+				this.index = e
+				if (e) {
+					this._getUpShaftTip()
+				} else {
+					this.obj = {a_point: '-', b_point: '-', tip: '-'}
+				}
+			},
+			async _getUpShaftTip () {
+				try {
+					let res = await getUpShaftTip(this.index)
+					this.obj = res.data
+				} catch (e) {
+					console.log(e)
+				}
+			},
+			handleChange (e) {
+				if (e){
+					this.index = ''
+					this.newoptions = this.selectMatchItem(this.options, e)
+				} else {
+					this.newoptions = this.options
+				}
+			},
+			/** 模糊匹配 */
+			selectMatchItem (lists, keyWord) {
+				let resArr = []
+				lists.filter((item) => {
+					if (item.text.indexOf(keyWord) > -1) {
+						resArr.push(item)
+					}
+				})
+				return resArr
+			},
+			showSelector () {
+				this.newoptions = this.options
+			},
+			async _doUpShaftToSlitter () {
+				this.disabled = true
+				if (!this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await doUpShaftToSlitter(this.index)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index = ''
+				this.index2 = ''
+				this.options = []
+				this.obj = {a_point: '-', b_point: '-', tip: '-'}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/utils/getData3.js b/utils/getData3.js
index 03a58cd..123ce1a 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -298,4 +298,15 @@ export const printTable = (pcsn, code, type) => request({
 export const doSubRollWeightBinding = (cn, pw, rw) => request({
 	url:'api/pda/slitter/doSubRollWeightBinding',
 	data: {container_name: cn, paper_weight: pw, roll_weight: rw}
+})
+/**
+ * 分切上轴
+ */
+export const getUpShaftTip = (code) => request({
+	url:'api/pda/slitter/getUpShaftTip',
+	data: {point_code: code}
+})
+export const doUpShaftToSlitter = (code) => request({
+	url:'api/pda/slitter/doUpShaftToSlitter',
+	data: {point_code: code}
 })
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 102b69e..613fb76 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -90,7 +90,8 @@ export const allAuthority = () => {
 				{menu_id: '8', title: '分切子卷维护', path: '/pages/SecondPhase/slitting/ZjSave'},
 				{menu_id: '8', title: '备货区管理', path: '/pages/SecondPhase/slitting/StockingArea'},
 				{menu_id: '8', title: 'AGV放行', path: '/pages/SecondPhase/slitting/AGVPass'},
-				{menu_id: '8', title: '子卷重量维护', path: '/pages/SecondPhase/slitting/SubRollWeight'}
+				{menu_id: '8', title: '子卷重量维护', path: '/pages/SecondPhase/slitting/SubRollWeight'},
+				{menu_id: '8', title: '分切上轴', path: '/pages/SecondPhase/slitting/UpperShaftCut'}
 			]},
 			{menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [
 				{menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},
@@ -134,7 +135,7 @@ export const authority = () => {
 					{title: '空木箱入库',sonTree: [{title: '空木箱入库'}]},
 					{title: '发货区',sonTree: [{title: '发货区解绑'}]},
 					{title: '生产管理',sonTree: [{title: '生箔生产进度'},{title: '生箔工序'},{title: '烘烤工序'},{title: '表处工序'},{title: '人工烘烤'},{title: '子卷质检'}, {title: '子卷装箱'}, {title: '标签打印'}]},
-					{title: '分切管理', sonTree: [{title: '分切上料'},{title: '分切下料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'},{title: '穿拔轴初始化'},{title: '纸管绑定'},{title: '分切暂存下料'},{title: '分切暂存清除'},{title: '气胀轴库维护'}, {title: '分切子卷维护'}, {title: '备货区管理'}, {title: 'AGV放行'}, {title: '子卷重量维护'}]},
+					{title: '分切管理', sonTree: [{title: '分切上料'},{title: '分切下料'},{title: '空轴套管'},{title: '空轴配送'},{title: '空轴进站'},{title: '子卷出站'},{title: '穿拔轴初始化'},{title: '纸管绑定'},{title: '分切暂存下料'},{title: '分切暂存清除'},{title: '气胀轴库维护'}, {title: '分切子卷维护'}, {title: '备货区管理'}, {title: 'AGV放行'}, {title: '子卷重量维护'}, {title: '分切上轴'}]},
 					{title: '点位管理', sonTree: [{title: '点位管理'},{title: '异常出库解锁'},{title: '人工放行'}]},
 					{title: '成品入库', sonTree: [{title: '退货口入库'},{title: '异常口入库'},{title: '木箱称重'}]},
 					{title: '立库库存', sonTree: [{title: '空木箱库存'}]}