From 69420db68d174e02f5e39a3b95aa82012eaf652d Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 18 Apr 2024 15:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=E6=B7=BB=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E5=88=87=E7=AE=A1=E7=90=86=E3=80=81=E7=82=B9=E4=BD=8D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  57 +++
 pages/SecondPhase/point/ErrorOutUnlock.vue    |  80 +++++
 pages/SecondPhase/point/PointManage.vue       |  95 +++++
 .../SecondPhase/slitting/SlittingFeeding.vue  | 331 +++++++++++++++++
 pages/SecondPhase/slitting/ZjCasing.vue       | 289 +++++++++++++++
 pages/SecondPhase/slitting/ZjDelivery.vue     | 333 +++++++++++++++++
 pages/SecondPhase/slitting/ZjInStore.vue      | 178 ++++++++++
 pages/SecondPhase/slitting/ZjOutStore.vue     | 334 ++++++++++++++++++
 utils/mork2.js                                |  15 +-
 9 files changed, 1710 insertions(+), 2 deletions(-)
 create mode 100644 pages/SecondPhase/point/ErrorOutUnlock.vue
 create mode 100644 pages/SecondPhase/point/PointManage.vue
 create mode 100644 pages/SecondPhase/slitting/SlittingFeeding.vue
 create mode 100644 pages/SecondPhase/slitting/ZjCasing.vue
 create mode 100644 pages/SecondPhase/slitting/ZjDelivery.vue
 create mode 100644 pages/SecondPhase/slitting/ZjInStore.vue
 create mode 100644 pages/SecondPhase/slitting/ZjOutStore.vue

diff --git a/pages.json b/pages.json
index e0df45e..57d8b01 100644
--- a/pages.json
+++ b/pages.json
@@ -326,6 +326,63 @@
             }
             
         }
+        ,{
+            "path" : "pages/SecondPhase/slitting/SlittingFeeding",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/ZjCasing",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/ZjDelivery",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/ZjInStore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/ZjOutStore",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+		
+        ,{
+            "path" : "pages/SecondPhase/point/PointManage",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/point/ErrorOutUnlock",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/point/ErrorOutUnlock.vue b/pages/SecondPhase/point/ErrorOutUnlock.vue
new file mode 100644
index 0000000..b287214
--- /dev/null
+++ b/pages/SecondPhase/point/ErrorOutUnlock.vue
@@ -0,0 +1,80 @@
+<template>
+	<view class="zd_container">
+		<nav-bar 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" :focused="true" @handleChange="handleChange1" 
+						/>
+					</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"  @handleChange="handleChange2" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-22 btn-submit btn-success letter-30" :class="{'btn-info': !val1 && !val2}" :disabled="disabled1" @tap="_abnormalOut">解锁</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {abnormalOut} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				disabled1: false
+			};
+		},
+		methods: {
+			handleChange1 (e) {
+			},
+			handleChange2 (e) {
+			},
+			async _abnormalOut () {
+				this.disabled1 = true
+				if (!this.val1 && !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await abnormalOut(this.val1, this.val2)
+					this.disabled1 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+	.zd_content
+		padding-bottom 77rpx
+	.slide_new table td:nth-child(1), .slide_new table th:nth-child(1)
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+	.bgyellow td
+		background-color #E9B451
+</style>
diff --git a/pages/SecondPhase/point/PointManage.vue b/pages/SecondPhase/point/PointManage.vue
new file mode 100644
index 0000000..dc5b6e2
--- /dev/null
+++ b/pages/SecondPhase/point/PointManage.vue
@@ -0,0 +1,95 @@
+<template>
+	<view class="zd_container">
+		<nav-bar 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" @handleChange="handleChange1"/>
+					</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 class="filter_item">
+					<view class="filter_label">是否有货</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val3" :class="{'filter_input_disabled': disabled0}" :disabled="disabled0">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-11 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_pointOperate('1')">绑定</button>
+			<button class="zd-col-11 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_pointOperate('2')">解绑</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {pointOperate, pointStatusQuery} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				val3: '',
+				disabled0: true,
+				disabled: false
+			};
+		},
+		methods: {
+			handleChange1 (e) {
+				this._pointStatusQuery(e)
+			},
+			/** 查询 */
+			async _pointStatusQuery (val1) {
+				if (!val1) {
+					return
+				}
+				let res = await pointStatusQuery(val1)
+				this.val2 = res.data.container_name
+				this.val3 = res.data.have_goods
+			},
+			async _pointOperate (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pointOperate(this.val1, this.val2, type)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/SecondPhase/slitting/SlittingFeeding.vue b/pages/SecondPhase/slitting/SlittingFeeding.vue
new file mode 100644
index 0000000..7bccfe3
--- /dev/null
+++ b/pages/SecondPhase/slitting/SlittingFeeding.vue
@@ -0,0 +1,331 @@
+<template>
+	<view class="zd_container">
+		<nav-bar 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="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</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="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>
+								<th>生产日期</th>
+								<th>订单号</th>
+								<th>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
+								<td>{{Number(i) + 1}}</td>
+								<td>{{e.source_container_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</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 submitbar">
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">满轴送回</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">空轴送回</button>
+			<button class="zd-col-5 btn-submit btn-success" @tap="handleSure">人工呼叫</button>
+			<button class="zd-col-3 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button>
+			<button class="zd-col-3 btn-submit btn-success" @tap="searchList">查询</button>
+		</view>
+		<view class="msg_wrapper h-50" :class="active ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd_wrapper zd_wrapper-1">
+					<view class="filter_item filter_item-1">
+						<view class="filter_label">起点</view>
+						<view class="filter_input_wraper">
+							<search-box
+							v-model="val3"
+							@handleChange="handleChange1"
+							/>
+						</view>
+					</view>
+					<view class="filter_item filter_item-1">
+						<view class="filter_label">母卷号</view>
+						<view class="filter_input_wraper">
+							<search-box
+							v-model="val4"
+							/>
+						</view>
+					</view>
+					<view class="filter_item filter_item-1">
+						<view class="filter_label">终点</view>
+						<view class="filter_input_wraper">
+							<search-box
+							v-model="val5"
+							/>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submitbar">
+				<button class="zd-col-11 btn-submit btn-default letter-30" @tap="cancleModal">取消</button>
+				<button class="zd-col-11 btn-submit btn-success letter-30" @tap="modalToSure">确认</button>
+			</view>
+		</view>
+		<view v-if="active" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm, feedingVehicleReturn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				dataList: [],
+				disabled: false,
+				pkId: '',
+				pkObj: {},
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10,
+				active: false,
+				val3: '',
+				val4: '',
+				val5: '',
+				disabled1: false,
+				disabled2: false
+			};
+		},
+		created () {
+			this._queryProductArea()
+		},
+		methods: {
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._feedingQueryMaterialInfo()
+			},
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.data]
+			},
+			/** 初始化查询 */
+			async _feedingQueryMaterialInfo () {
+				let res = await feedingQueryMaterialInfo(this.index, this.val1, this.val2, this.pageNum + '', this.pageSize + '')
+				this.totalCount = res.size
+				if (res.size > 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._feedingQueryMaterialInfo()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			/** 呼叫 */
+			async toSure () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await feedingConfirm(this.pkObj)
+					this.disabled = false
+					this.pkId = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.container_name ? '' : e.container_name
+				this.pkObj = this.pkId === e.container_name ? e : {}
+			},
+			handleSure () {
+				this.active = true
+			},
+			cancleModal () {
+				this.active = false
+				this.val3 = ''
+				this.val4 = ''
+				this.val5 = ''
+			},
+			handleChange1 (e) {
+				this._feedingQueryPoint(e)
+			},
+			/** 扫码起点带出母卷 */
+			async _feedingQueryPoint (e) {
+				let res = await feedingQueryPoint(e)
+				this.val4 = res.content.container_name
+			},
+			/** 人工呼叫 */
+			async modalToSure () {
+				this.disabled1 = true
+				if (!this.val3) {
+					this.disabled1 = false
+					uni.showToast({
+						title: '起点不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.val4) {
+					this.disabled1 = false
+					uni.showToast({
+						title: '母卷号不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.val5) {
+					this.disabled1 = false
+					uni.showToast({
+						title: '终点不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				try {
+					let res = await feedingHandleConfirm(this.val3, this.val4, this.val5)
+					this.disabled1 = false
+					this.active = false
+					this.val3 = ''
+					this.val4 = ''
+					this.val5 = ''
+					this.pkId = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			/** 空轴送回 */
+			async _feedingVehicleReturn (type) {
+				this.disabled2 = true
+				if (!this.val1) {
+					this.disabled2 = false
+					uni.showToast({
+						title: '点位不能为空',
+						icon: 'none'
+					})
+					return
+				}
+				try {
+					let res = await feedingVehicleReturn(this.val1, type)
+					this.disabled2 = false
+					this.active = false
+					this.val1 = ''
+					this.pkId = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="stylus">
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		z-index 102
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+</style>
diff --git a/pages/SecondPhase/slitting/ZjCasing.vue b/pages/SecondPhase/slitting/ZjCasing.vue
new file mode 100644
index 0000000..995812f
--- /dev/null
+++ b/pages/SecondPhase/slitting/ZjCasing.vue
@@ -0,0 +1,289 @@
+<template>
+	<view class="zd_container">
+		<nav-bar 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="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">设备</span>
+					</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_wraper">
+						<span class="filter_label">子卷号</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val4"
+						/>
+					</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="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>
+								<th>生产日期</th>
+								<th>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+								<th>订单号</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
+								<td>{{Number(i) + 1}}</td>
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</td>
+								<td>{{e.mfg_order_name}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled2" @tap="_casingWearConfirm">穿轴确认</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled1" @tap="_casingOutConfirm">拔轴确认</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">套轴确认</button>
+			<button class="zd-col-4 btn-submit btn-success" @tap="searchList">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryDeviceByarea, queryMaterialInfo2, casingConfirm, casingOutConfirm, casingWearConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				val4: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				qty: '',
+				dataList: [],
+				disabled: false,
+				checkArr: [],
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10,
+				disabled1: false,
+				disabled2: false
+			};
+		},
+		created () {
+			this._queryProductArea()
+		},
+		methods: {
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+				if (e) {
+					this._queryDeviceByarea(e)
+				} else {
+					this.index2 = ''
+				}
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options1 = [...res.data]
+			},
+			/** 选择器2 */
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 设备下拉框 */
+			async _queryDeviceByarea (e) {
+				let res = await queryDeviceByarea(e)
+				this.options2 = [...res.data]
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._queryMaterialInfo()
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				let res = await queryMaterialInfo2(this.val1, this.index1, this.index2, this.val4, this.pageNum + '', this.pageSize + '')
+				res.data.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.totalCount = res.size
+				if (res.size > 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._queryMaterialInfo()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			/** 套轴确认 */
+			async _casingConfirm () {
+				this.disabled = true
+				if (!this.checkArr.length || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await casingConfirm(this.checkArr, this.val2, this.val1)
+					this.disabled = false
+					this.checkArr = []
+					this.val1 = ''
+					this.val2 = ''
+					this.val4 = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			/** 拔轴确认 */
+			async _casingOutConfirm () {
+				this.disabled1 = true
+				if (!this.val1 || !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await casingOutConfirm(this.val2, this.val1)
+					this.disabled1 = false
+					this.checkArr = []
+					this.val1 = ''
+					this.val2 = ''
+					this.val4 = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			/** 穿轴确认 */
+			async _casingWearConfirm () {
+				this.disabled2 = true
+				if (!this.val1 || !this.val2) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await casingWearConfirm(this.val2, this.val1)
+					this.disabled2 = false
+					this.checkArr = []
+					this.val1 = ''
+					this.val2 = ''
+					this.val4 = ''
+					this.searchList()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		z-index 102
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+</style>
diff --git a/pages/SecondPhase/slitting/ZjDelivery.vue b/pages/SecondPhase/slitting/ZjDelivery.vue
new file mode 100644
index 0000000..36f9fe4
--- /dev/null
+++ b/pages/SecondPhase/slitting/ZjDelivery.vue
@@ -0,0 +1,333 @@
+<template>
+	<view class="zd_container">
+		<nav-bar 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="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">设备</span>
+					</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_wraper">
+						<span class="filter_label">气涨轴</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</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="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="val3"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<button class="zd-col-22 btn-submit btn-success letter-30" @tap="_queryMaterialInfo">查询</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>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+								<th>订单号</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
+								<td>{{Number(i) + 1}}</td>
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td>{{e.qzzno}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</td>
+								<td>{{e.mfg_order_name}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': !val3}" :disabled="disabled5" @tap="_acrossVehicle">载具横移</button>
+			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': checkArr.length === 0 || checkArr.length > 1}" :disabled="disabled1" @tap="_needVehicle">呼叫载具</button>
+			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled4" @tap="_shippingCheck">配送校验</button>
+			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': !checkArr.length || !val3}" :disabled="disabled2" @tap="_shippingConfirm">配送确认</button>
+			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': !val3 || checkArr.length > 0}" :disabled="disabled3" @tap="_returnVehicle">载具送回</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryDeviceByarea, queryMaterialInfo3, needVehicle, shippingConfirm, returnVehicle, shippingCheck, acrossVehicle} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				val3: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				qty: '',
+				dataList: [],
+				disabled1: false,
+				disabled2: false,
+				disabled3: false,
+				disabled4: false,
+				disabled5: false,
+				checkArr: []
+			};
+		},
+		created () {
+			this._queryProductArea()
+			this._queryMaterialInfo()
+		},
+		methods: {
+			/** 选择器1 */
+			selectChange1(e) {
+				this.index1 = e
+				if (e) {
+					this._queryDeviceByarea(e)
+				} else {
+					this.index2 = ''
+				}
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options1 = [...res.data]
+			},
+			/** 选择器2 */
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 设备下拉框 */
+			async _queryDeviceByarea (e) {
+				let res = await queryDeviceByarea(e)
+				this.options2 = [...res.data]
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				let res = await queryMaterialInfo3(this.val1, this.val2, this.index1, this.index2)
+				if (this.val2) {
+					res.data.map(el => {
+						this.$set(el, 'checked', true)
+					})
+				} else {
+					res.data.map(el => {
+						this.$set(el, 'checked', false)
+					})
+				}
+				this.dataList = [...res.data]
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			},
+			/** 呼叫载具 */
+			async _needVehicle () {
+				this.disabled1 = true
+				if (this.checkArr.length === 0 || this.checkArr.length > 1) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await needVehicle(this.checkArr[0])
+					this.disabled1 = false
+					this.checkArr = []
+					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			/** 确认 */
+			async _shippingConfirm () {
+				this.disabled2 = true
+				if (!this.checkArr.length || !this.val3) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await shippingConfirm(this.checkArr, this.val3, this.val1)
+					this.disabled2 = false
+					this.checkArr = []
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+				}
+			},
+			/** 载具送回 */
+			async _returnVehicle () {
+				this.disabled3 = true
+				if (this.checkArr.length > 0) {
+					this.disabled3 = false
+					return
+				}
+				if (!this.val3) {
+					uni.showToast({
+						title: '请输入起点',
+						icon: 'none'
+					})
+					this.disabled3 = false
+					return
+				}
+				try {
+					let res = await returnVehicle(this.val3, this.val1)
+					this.disabled3 = false
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled3 = false
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+				}
+			},
+			/** 载具横移 */
+			async _acrossVehicle () {
+				this.disabled5 = true
+				if (!this.val3) {
+					uni.showToast({
+						title: '请输入起点',
+						icon: 'none'
+					})
+					this.disabled5 = false
+					return
+				}
+				try {
+					let res = await acrossVehicle(this.val3)
+					this.disabled5 = false
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled5 = false
+				}
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			},
+			/** 配送校验 */
+			async _shippingCheck () {
+				this.disabled4 = true
+				if (!this.val1) {
+					uni.showToast({
+						title: '请输入载具码',
+						icon: 'none'
+					})
+					this.disabled4 = false
+					return
+				}
+				if (!this.val2) {
+					uni.showToast({
+						title: '请输入气涨轴',
+						icon: 'none'
+					})
+					this.disabled4 = false
+					return
+				}
+				try {
+					let res = await shippingCheck(this.val1, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled4 = false
+				} catch (e) {
+					this.disabled4 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		z-index 102
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+</style>
diff --git a/pages/SecondPhase/slitting/ZjInStore.vue b/pages/SecondPhase/slitting/ZjInStore.vue
new file mode 100644
index 0000000..ab6ab73
--- /dev/null
+++ b/pages/SecondPhase/slitting/ZjInStore.vue
@@ -0,0 +1,178 @@
+<template>
+	<view class="zd_container">
+		<nav-bar 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_wraper">
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">点位</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>气涨轴</th>
+								<th>子卷号</th>
+								<th>机台编号</th>
+								<th>分切组</th>
+								<th>位置</th>
+								<th>配送完成</th>
+								<th>生产顺序</th>
+								<th>生产日期</th>
+								<th>订单号</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
+								<td>{{Number(i) + 1}}</td>
+								<td>{{e.qzzno}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.delivery_code}}</td>
+								<td>{{e.is_child_ps_ok}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.mfg_order_name}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index1 || !pkId}" :disabled="disabled" @tap="_inConfirm">上空轴</button>
+			<button class="zd-col-6 btn-submit btn-success letter-30" @tap="_queryMaterialInfo">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {devicePointQuery, queryProductArea, queryDeviceByarea, queryMaterialInfo5, inConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				options3: [],
+				index3: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+			this._queryProductArea()
+			this._queryMaterialInfo()
+		},
+		methods: {
+			/** 选择器 */
+			selectChange1(e) {
+				this.index = e
+			},
+			selectChange2(e) {
+				this.index2 = e
+				if (e) {
+					this._queryDeviceByarea(e)
+				} else {
+					this.index3 = ''
+				}
+			},
+			/** 点位下拉框查询 */
+			async _devicePointQuery (e) {
+				let res = await devicePointQuery(e)
+				this.options1 = [...res.data]
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options2 = [...res.data]
+			},
+			/** 选择器3 */
+			selectChange3(e) {
+				this.index3 = e
+				if (e) {
+					this._devicePointQuery(e)
+				} else {
+					this.index1 = ''
+				}
+			},
+			/** 设备下拉框 */
+			async _queryDeviceByarea (e) {
+				let res = await queryDeviceByarea(e)
+				this.options3 = [...res.data]
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				let res = await queryMaterialInfo5(this.index3, this.index2)
+				this.dataList = [...res.data]	
+			},
+			/** 确认 */
+			async _inConfirm () {
+				this.disabled = true
+				if (!this.index1) {
+					uni.showToast({
+						title: '点位不能为空',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await inConfirm(this.index1, this.pkObj)
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this.index1 = ''
+					this.index3 = ''
+					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.container_name ? '' : e.container_name
+				this.pkObj = this.pkId === e.container_name ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/SecondPhase/slitting/ZjOutStore.vue b/pages/SecondPhase/slitting/ZjOutStore.vue
new file mode 100644
index 0000000..03e6812
--- /dev/null
+++ b/pages/SecondPhase/slitting/ZjOutStore.vue
@@ -0,0 +1,334 @@
+<template>
+	<view class="zd_container">
+		<nav-bar 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_wraper">
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index5" :localdata="options5" @change="selectChange5"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">点位</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label filter_label_1"></span>
+					</view>
+					<view class="filter_input_wraper filter_input_wraper_1">
+						<view class="iconfont icon_unchecked" :class="{'icon_checked': isV === '1'}" @tap="isVirtual">&#xe66b;</view>
+						<view class="filter_input_wraper_inn_text">末次下卷</view>
+					</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>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+								<th>订单号</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'checked': e.checked}">
+								<td>{{Number(i) + 1}}</td>
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td>{{e.qzzno}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</td>
+								<td>{{e.mfg_order_name}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !index1 || checkArr.length > 0}" :disabled="disabled3" @tap="_disuseConfirm">废箔下卷</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !index1 || !checkArr.length}" :disabled="disabled1" @tap="_outConfirm">子卷出站</button>
+			<button class="zd-col-6 btn-submit btn-success" @tap="showModal">出站配送</button>
+			<button class="zd-col-5 btn-submit btn-success" @tap="_queryMaterialInfo">查询</button>
+		</view>
+		<view class="msg_wrapper h-50" :class="active ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd_wrapper zd_wrapper-1">
+					<view class="filter_item filter_item-1">
+						<view class="filter_label">区域</view>
+						<view class="filter_input_wraper">
+							<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
+						</view>
+					</view>
+					<view class="zd-row">
+						<view class="zd-col-19">
+							<view class="filter_item filter_item-1">
+								<view class="filter_label">缓存点位</view>
+								<view class="filter_input_wraper">
+									<uni-data-select v-model="index4" :localdata="options4" @change="selectChange4"></uni-data-select>
+								</view>
+							</view>
+						</view>
+						<view class="zd-col-4">
+							<button class="btn-submit btn-success" @tap="_conveyPointQuery">查询</button>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submitbar">
+				<button class="zd-col-11 btn-submit btn-default letter-30" @tap="cancleModal">取消</button>
+				<button class="zd-col-11 btn-submit btn-success letter-30" :class="{'btn-info': !index4}" :disabled="disabled2" @tap="_conveyConfirm">确认</button>
+			</view>
+		</view>
+		<view v-if="active" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {devicePointQuery, queryProductArea, queryDeviceByarea, queryMaterialInfo4, outConfirm, conveyPointQuery, conveyConfirm, disuseConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				options3: [],
+				index3: '',
+				options4: [],
+				index4: '',
+				options5: [],
+				index5: '',
+				isV: '0',
+				dataList: [],
+				disabled1: false,
+				disabled2: false,
+				disabled3: false,
+				checkArr: [],
+				active: false
+			};
+		},
+		created () {
+			this._queryProductArea()
+			this._queryMaterialInfo()
+		},
+		methods: {
+			/** 末次下卷 */
+			isVirtual () {
+				this.isV = this.isV === '0' ? '1' : '0'
+			},
+			/** 选择器 */
+			selectChange1(e) {
+				this.index = e
+			},
+			selectChange2(e) {
+				this.index2 = e
+				if (e) {
+					this._queryDeviceByarea(e)
+				} else {
+					this.index5 = ''
+				}
+			},
+			selectChange3(e) {
+				this.index3 = e
+			},
+			selectChange4(e) {
+				this.index4 = e
+			},
+			/** 点位下拉框查询 */
+			async _devicePointQuery (e) {
+				let res = await devicePointQuery(e)
+				this.options1 = [...res.data]
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options2 = [...res.data]
+				this.options3 = [...res.data]
+			},
+			/** 选择器5 */
+			selectChange5(e) {
+				this.index5 = e
+				if (e) {
+					this._devicePointQuery(e)
+				} else {
+					this.index1 = ''
+				}
+			},
+			/** 设备下拉框 */
+			async _queryDeviceByarea (e) {
+				let res = await queryDeviceByarea(e)
+				this.options5 = [...res.data]
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				let res = await queryMaterialInfo4(this.index5, this.index2)
+				res.data.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList = [...res.data]	
+			},
+			/** 子卷出站 */
+			async _outConfirm () {
+				this.disabled1 = true
+				if (!this.index1) {
+					uni.showToast({
+						title: '点位不能为空',
+						icon: 'none'
+					})
+					this.disabled1 = false
+					return
+				}
+				if (!this.checkArr.length) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await outConfirm(this.index1, this.checkArr, this.isV)
+					this.disabled1 = false
+					this.checkArr = []
+					this.isV = '0'
+					this.index1 = ''
+					this.index5 = ''
+					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			/** 废箔下卷 */
+			async _disuseConfirm () {
+				this.disabled3 = true
+				if (!this.index1) {
+					uni.showToast({
+						title: '点位不能为空',
+						icon: 'none'
+					})
+					this.disabled3 = false
+					return
+				}
+				if (this.checkArr.length > 0) {
+					this.disabled3 = false
+					return
+				}
+				try {
+					let res = await disuseConfirm(this.index1)
+					this.disabled3 = false
+					this.checkArr = []
+					this.index1 = ''
+					this.index5 = ''
+					this._queryMaterialInfo()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled3 = false
+				}
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			},
+			/** 缓存点位查询 */
+			async _conveyPointQuery () {
+				let res = await conveyPointQuery(this.index3)
+				this.options4 = [...res.data]
+			},
+			/** 显示弹窗 */
+			showModal () {
+				this.active = true
+				this.index3 = this.index2
+			},
+			cancleModal () {
+				this.disabled2 = false
+				this.index3 = ''
+				this.index4 = ''
+				this.active = false
+			},
+			/** 出站配送接口 */
+			async _conveyConfirm () {
+				this.disabled2 = true
+				if (!this.index4) {
+					uni.showToast({
+						title: '请选择缓存点位',
+						icon: 'none'
+					})
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await conveyConfirm(this.index4)
+					this.disabled2 = false
+					this.index3 = ''
+					this.index4 = ''
+					this.active = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+					this.index3 = ''
+					this.index4 = ''
+					this.active = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		z-index 102
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+</style>
diff --git a/utils/mork2.js b/utils/mork2.js
index 5aa46a9..1a47a37 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -65,13 +65,24 @@ export const authority = () => {
 			{menu_id: '3', path: 'RF12', title: '发货区', sonTree: [
 				{menu_id: '1', title: '发货区解绑', path: '/pages/SecondPhase/DeliveryUnbind'}
 			]},
-			{menu_id: '1', path: 'RF01', title: '生产管理', sonTree: [
+			{menu_id: '4', path: 'RF01', title: '生产管理', sonTree: [
 				{menu_id: '1', title: '生箔生产进度', path: '/pages/SecondPhase/production/SboProdProgress'},
 				{menu_id: '2', title: '生箔工序', path: '/pages/SecondPhase/production/SboProcess'},
 				{menu_id: '3', title: '烘烤工序', path: '/pages/SecondPhase/production/BakeProcess'},
 				{menu_id: '4', title: '表处工序', path: '/pages/SecondPhase/production/SurfaceProcess'},
 				{menu_id: '5', title: '人工烘烤', path: '/pages/SecondPhase/production/ManmadeBake'}
-			]}
+			]},
+			{menu_id: '5', path: 'RF03', title: '分切管理', sonTree: [
+				{menu_id: '1', title: '分切上料', path: '/pages/SecondPhase/slitting/SlittingFeeding'},
+				{menu_id: '2', title: '空轴套管', path: '/pages/SecondPhase/slitting/ZjCasing'},
+				{menu_id: '3', title: '空轴配送', path: '/pages/SecondPhase/slitting/ZjDelivery'},
+				{menu_id: '4', title: '空轴进站', path: '/pages/SecondPhase/slitting/ZjInStore'},
+				{menu_id: '5', title: '子卷出站', path: '/pages/SecondPhase/slitting/ZjOutStore'},
+			]},
+			{menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [
+				{menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},
+				{menu_id: '2', title: '异常出库解锁', path: '/pages/SecondPhase/point/ErrorOutUnlock'}
+			]},
 		]
 		}
 	}}