From 6022b63c4d6ec2f697df61a259d21283506b6b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Fri, 6 Sep 2024 16:25:51 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E8=A3=85=E7=AE=B1=E6=9A=82=E5=AD=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86/=E5=88=86=E5=88=87=E4=B8=8A=E6=96=99/?=
 =?UTF-8?q?=E5=88=86=E5=88=87=E4=B8=8B=E6=96=99/=E5=AD=90=E5=8D=B7?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A/=E7=94=9F=E7=AE=94=E5=B7=A5=E5=BA=8F/?=
 =?UTF-8?q?=E7=83=98=E7=83=A4=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl          |  14 ++-
 pages.json                        |  42 ++++++-
 pages/manage/axis-bind.vue        |   3 +-
 pages/manage/bake-process.vue     | 161 ++++++++++++++++++++++++++
 pages/manage/modify-process.vue   | 127 ---------------------
 pages/manage/pack-storage.vue     | 117 +++++++++++++++++++
 pages/manage/raw-foil-progess.vue | 152 ++++++++++++++++++++++++
 pages/manage/roll-manage.vue      |   3 +-
 pages/manage/split-cut.vue        | 116 +++++++++++++++++++
 pages/manage/split-feed.vue       | 184 ++++++++++++++++++++++++++++++
 pages/manage/sub-vol-bind.vue     | 114 ++++++++++++++++++
 pages/manage/weight-bind.vue      |   1 -
 utils/getData2.js                 |  84 +++++++++++++-
 utils/mork2.js                    |   5 +-
 14 files changed, 985 insertions(+), 138 deletions(-)
 create mode 100644 pages/manage/bake-process.vue
 delete mode 100644 pages/manage/modify-process.vue
 create mode 100644 pages/manage/pack-storage.vue
 create mode 100644 pages/manage/raw-foil-progess.vue
 create mode 100644 pages/manage/split-cut.vue
 create mode 100644 pages/manage/split-feed.vue
 create mode 100644 pages/manage/sub-vol-bind.vue

diff --git a/common/style/layout.styl b/common/style/layout.styl
index d49c5f7..b56584a 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -29,7 +29,7 @@ uni-button:after {
 	height: auto;
 	background-color: #fff;
 	border-radius: 24rpx;
-	padding: 22rpx;
+	padding: 22rpx 22rpx 8rpx 22rpx;
 	margin-bottom: 20rpx;
 	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
 }
@@ -44,16 +44,23 @@ uni-button:after {
 }
 .filter_label {
 	display: block;
-	line-height: 80rpx;
+	line-height: 40rpx;
 	font-size: 28rpx;
 	color: #323232;
 	font-weight: bold;
 	letter-spacing: 4rpx;
-	padding-left: 10rpx;
+	padding: 20rpx 0 20rpx 0;
 	/* text-align:justify;
 	text-align-last: justify;
 	text-justify: inter-ideograph; */
 }
+.filter_msg {
+	font-size: 28rpx;
+	line-height: 30rpx;
+	color: #ff6a00;
+	text-align: right;
+	padding: 20rpx 0 20rpx 0;
+}
 /** 筛选选择器样式 */
 .filter_picker .uni-input {
 	width: 100%;
@@ -248,6 +255,7 @@ uni-button:after {
 .button-primary_s {
 	font-size: 26rpx;
 	line-height: 60rpx;
+	margin: 0;
 }
 .button-info, .submit-button[disabled] {
 	background-color: #c9c9c9;
diff --git a/pages.json b/pages.json
index 4044db6..7609972 100644
--- a/pages.json
+++ b/pages.json
@@ -75,7 +75,47 @@
             
         }
         ,{
-            "path" : "pages/manage/modify-process",
+            "path" : "pages/manage/pack-storage",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/split-feed",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/split-cut",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/sub-vol-bind",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/raw-foil-progess",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/bake-process",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
diff --git a/pages/manage/axis-bind.vue b/pages/manage/axis-bind.vue
index d667e03..ed92db0 100644
--- a/pages/manage/axis-bind.vue
+++ b/pages/manage/axis-bind.vue
@@ -46,8 +46,7 @@
 						</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 class="td_2">{{e.source_container_name}}</td>
+								<td>{{e.source_container_name}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.point_code}}</td>
 								<td>{{e.split_group}}</td>
diff --git a/pages/manage/bake-process.vue b/pages/manage/bake-process.vue
new file mode 100644
index 0000000..1d5a43c
--- /dev/null
+++ b/pages/manage/bake-process.vue
@@ -0,0 +1,161 @@
+<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">
+						<input v-model="val2" type="text" class="filter_input" @blur="handleConfirm" @confirm="handleConfirm">
+					</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 v-model="val3" type="number" class="filter_input">
+					</view>
+					<view class="zd-col-2 filter_label">度</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-7">
+						<span class="filter_label">时间</span>
+					</view>
+					<view class="zd-col-17">
+						<uni-datetime-picker
+							type="datetime"
+							:value="time"
+							@change="dateChange"
+						/>
+					</view>
+				</view>
+			</view>
+			<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 filter_msg">{{obj.roll_type}}</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">烘烤状态</span>
+					</view>
+					<view class="zd-col-17 filter_msg">{{obj.is_baking}}</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-7">
+						<span class="filter_label">提示</span>
+					</view>
+					<view class="zd-col-17 filter_msg">{{obj.msg}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2 || !val3}" :disabled="disabled" @tap="_doModifyRawInfos">修改信息</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_bakingQuality('1')">质检合格</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_bakingQuality('2')">再次烘烤</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getHotTempPointInfo, bakingQuality, doModifyRawInfos} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				time: '',
+				obj: {roll_type: '-', is_baking: '-', msg: '-'},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.time = ''
+				this.obj = {roll_type: '-', is_baking: '-', msg: '-'}
+				this.disabled = false
+			},
+			handleConfirm () {
+				if (this.val2) {
+					this._getHotTempPointInfo()
+				}
+			},
+			async _getHotTempPointInfo () {
+				let res = await getHotTempPointInfo(this.val1, this.val2)
+				this.obj = res
+			},
+			async _bakingQuality (type) {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await bakingQuality(this.val1, type)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			dateChange (e) {
+				this.time = e
+			},
+			async _doModifyRawInfos () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.val3) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await doModifyRawInfos(this.val1, this.val2, this.val3, this.time)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+>>>.uni-date-x--border
+	border-color: transparent;
+</style>
diff --git a/pages/manage/modify-process.vue b/pages/manage/modify-process.vue
deleted file mode 100644
index 5df7a5a..0000000
--- a/pages/manage/modify-process.vue
+++ /dev/null
@@ -1,127 +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">载具号</span>
-					</view>
-					<view class="zd-col-19">
-						<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>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.order_code}}</td>
-								<td>
-									<view class="td_select">
-										<uni-data-select v-model="e.region_code" :localdata="options" @change="selectChange"></uni-data-select>
-									</view>
-								</td>
-								<td>
-									<uni-datetime-picker
-										type="datetime"
-										v-model="e.due_date"
-										@change="changeLog"
-									/>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_fabOrders">查询</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !dataList.length}" :disabled="disabled" @tap="_updateOrder">入库确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	// import {regionList, fabOrders} from '@/utils/mork2.js'
-	import {regionList, fabOrders, updateOrder} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				options: [],
-				index: '',
-				disabled: false,
-				dataList: [],
-				show: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-			this._regionList()
-		},
-		methods: {
-			async _regionList () {
-				let res = await regionList()
-				this.options = [...res.content]
-				this.options.map(el => {
-					this.$set(el, 'text', el.label)
-				})
-			},
-			async _fabOrders () {
-				let res = await fabOrders(this.val1)
-				this.dataList = [...res.content]
-			},
-			selectChange (val) {
-			},
-			changeLog (e) {
-			},
-			clearUp () {
-				this.dataList = []
-				this.disabled = false
-			},
-			async _updateOrder () {
-				this.disabled = true
-				if (!this.dataList.length) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await updateOrder(this.dataList)
-					this.clearUp()
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.zd_content
-	height: calc(100% - var(--status-bar-height) - 212rpx);
-	padding: 20rpx 14rpx 0 14rpx;
-.grid-wraper
-	height: 100%;
-	overflow: auto;
-.slide_new table td, .slide_new table th
-	overflow: visible;
-</style>
diff --git a/pages/manage/pack-storage.vue b/pages/manage/pack-storage.vue
new file mode 100644
index 0000000..9f6fef7
--- /dev/null
+++ b/pages/manage/pack-storage.vue
@@ -0,0 +1,117 @@
+<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 filter_select">
+						<zxz-uni-data-select v-model="index" filterable :localdata="options"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">载具号</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">子卷号</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !index || !val1}" :disabled="disabled" @tap="_setEmptyVehicle">绑定空架</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val2}" :disabled="disabled" @tap="_doClearPoint">清除</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getZxPointList, setEmptyVehicle, doClearPoint} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				val1: '',
+				val2: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._getZxPointList()
+		},
+		methods: {
+			async _getZxPointList () {
+				let res = await getZxPointList()
+				this.options = [...res]
+			},
+			clearUp () {
+				this.index = ''
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled = false
+			},
+			async _setEmptyVehicle () {
+				this.disabled = true
+				if (!this.index || !this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await setEmptyVehicle(this.index, this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _doClearPoint () {
+				this.disabled = true
+				if (!this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await doClearPoint(this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+</style>
diff --git a/pages/manage/raw-foil-progess.vue b/pages/manage/raw-foil-progess.vue
new file mode 100644
index 0000000..91ad317
--- /dev/null
+++ b/pages/manage/raw-foil-progess.vue
@@ -0,0 +1,152 @@
+<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">
+						<input v-model="val2" type="text" class="filter_input">
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-7">
+						<span class="filter_label">呼叫收卷辊</span>
+					</view>
+					<view class="relative zd-col-17">
+						<switch :checked="isChecked" color="#6798ef" style="transform:scale(0.8)"/>
+						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-3 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_needEmptyVehicle">呼叫空辊</button>
+			<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_necessaryEmptyVehicle">空辊回库</button>
+			<button class="zd-col-5 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_needEmptyAxisv2">生箔下料</button>
+			<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_confirmBlanking">准备就绪</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {needEmptyVehicle, necessaryEmptyVehicle, needEmptyAxisv2, confirmBlanking} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				isChecked: false,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			setWStatus () {
+				this.isChecked = !this.isChecked
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.isChecked = false
+				this.disabled = false
+			},
+			async _needEmptyVehicle () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await needEmptyVehicle(this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _necessaryEmptyVehicle () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await necessaryEmptyVehicle(this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _needEmptyAxisv2 () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let checked = this.isChecked ? '1' : '0'
+					let res = await needEmptyAxisv2(this.val1, this.val2, checked)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _confirmBlanking () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await confirmBlanking(this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.button-primary
+	font-size: 28rpx;
+</style>
diff --git a/pages/manage/roll-manage.vue b/pages/manage/roll-manage.vue
index c3c6bc1..eaa764e 100644
--- a/pages/manage/roll-manage.vue
+++ b/pages/manage/roll-manage.vue
@@ -53,7 +53,7 @@
 		data() {
 			return {
 				title: '',
-				va1: '',
+				val1: '',
 				val2: '',
 				options: [],
 				index: '',
@@ -112,5 +112,4 @@
 </script>
 
 <style lang="stylus">
-@import '../../common/style/mixin.styl';
 </style>
diff --git a/pages/manage/split-cut.vue b/pages/manage/split-cut.vue
new file mode 100644
index 0000000..ed6c4cd
--- /dev/null
+++ b/pages/manage/split-cut.vue
@@ -0,0 +1,116 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row">
+					<view class="zd-col-7">
+						<span class="filter_label">设备</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<zxz-uni-data-select v-model="index" :localdata="options" @change="selectChange"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+			<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 filter_msg">{{obj.up}}</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">下轴子卷号</span>
+					</view>
+					<view class="zd-col-17 filter_msg">{{obj.down}}</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-7">
+						<span class="filter_label">提示</span>
+					</view>
+					<view class="zd-col-17 filter_msg">{{obj.msg}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-8 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index}" :disabled="disabled" @tap="_slitterDown">确认下卷</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getSlitterDeviceBox, querySlitterDeviceSubVolumeInfos, slitterDown} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				obj: {up: '-', down: '-', msg: '-'},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._getSlitterDeviceBox()
+		},
+		methods: {
+			async _getSlitterDeviceBox () {
+				let res = await getSlitterDeviceBox()
+				this.options = [...res]
+			},
+			selectChange (e) {
+				this._querySlitterDeviceSubVolumeInfos(e)
+			},
+			async _querySlitterDeviceSubVolumeInfos (e) {
+				try {
+					let res = await querySlitterDeviceSubVolumeInfos(e)
+					this.obj = res.data
+				} catch (e) {
+					console.log(e)
+				}
+			},
+			clearUp () {
+				this.index = ''
+				this.obj = {up: '-', down: '-', msg: '-'}
+				this.disabled = false
+			},
+			async _slitterDown () {
+				this.disabled = true
+				if (!this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await slitterDown(this.index)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.zd_content
+	height: calc(100% - var(--status-bar-height) - 212rpx);
+	padding: 20rpx 14rpx 0 14rpx;
+.grid-wraper
+	height: 100%;
+	overflow: auto;
+.slide_new table td, .slide_new table th
+	overflow: visible;
+</style>
diff --git a/pages/manage/split-feed.vue b/pages/manage/split-feed.vue
new file mode 100644
index 0000000..7a45127
--- /dev/null
+++ b/pages/manage/split-feed.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-5">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="zd-col-14">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+					<button class="zd-col-4 button-primary button-primary_s" @tap="_queryOrderInfo">查询</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>纸筒/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>{{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>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-3 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_slitvehicleReturn">空轴送回</button>
+			<button class="zd-col-5 button-primary" :class="{'button-info': !val1 || !pkId}" :disabled="disabled" @tap="_slitcallSlitterRoll">呼叫母卷</button>
+			<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_slitsendSlitterRoll">母卷送回</button>
+			<button class="zd-col-5 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_slitallowCoiling">确认上料</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryOrderInfo, slitvehicleReturn, slitcallSlitterRoll, slitsendSlitterRoll, slitallowCoiling} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._queryOrderInfo()
+		},
+		methods: {
+			async _queryOrderInfo () {
+				let res = await queryOrderInfo()
+				this.dataList = [...res.data]
+			},
+			toCheck (e) {
+				this.pkId = e.container_name === this.pkId ? '' : e.container_name
+				this.pkObj = e.container_name === this.pkId ? e : {}
+			},
+			clearUp () {
+				this.index = ''
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled = false
+			},
+			async _slitvehicleReturn () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await slitvehicleReturn(this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _slitcallSlitterRoll () {
+				this.disabled = true
+				if (!this.pkId || !this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await slitcallSlitterRoll(this.pkObj.workorder_id, this.val1, this.pkObj.zc_point, this.pkObj.resource_name)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _slitsendSlitterRoll () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await slitsendSlitterRoll(this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _slitallowCoiling () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await slitallowCoiling(this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.button-primary
+	font-size: 28rpx;
+</style>
diff --git a/pages/manage/sub-vol-bind.vue b/pages/manage/sub-vol-bind.vue
new file mode 100644
index 0000000..0c4c913
--- /dev/null
+++ b/pages/manage/sub-vol-bind.vue
@@ -0,0 +1,114 @@
+<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 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1" @change="selectChange"></zxz-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 filter_select">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">子卷号</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-8 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index2 || !val1}" :disabled="disabled" @tap="_bindSlitterSubVolumeInfo">子卷绑定</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getSlitterDeviceBox, devicePointQuery, bindSlitterSubVolumeInfo} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				val1: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+			this._getSlitterDeviceBox()
+		},
+		methods: {
+			async _getSlitterDeviceBox () {
+				let res = await getSlitterDeviceBox()
+				this.options1 = [...res]
+			},
+			selectChange (e) {
+				this.index2 = ''
+				this._devicePointQuery(e)
+			},
+			async _devicePointQuery (e) {
+				let res = await devicePointQuery(e)
+				this.options2 = [...res]
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+				this.val1 = ''
+				this.disabled = false
+			},
+			async _bindSlitterSubVolumeInfo () {
+				this.disabled = true
+				if (!this.index2 || !this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await bindSlitterSubVolumeInfo(this.index2, this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+.zd_content
+	height: calc(100% - var(--status-bar-height) - 212rpx);
+	padding: 20rpx 14rpx 0 14rpx;
+.grid-wraper
+	height: 100%;
+	overflow: auto;
+.slide_new table td, .slide_new table th
+	overflow: visible;
+</style>
diff --git a/pages/manage/weight-bind.vue b/pages/manage/weight-bind.vue
index ee46839..51aeb92 100644
--- a/pages/manage/weight-bind.vue
+++ b/pages/manage/weight-bind.vue
@@ -58,7 +58,6 @@
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._vehicleType()
 		},
 		methods: {
 			async _doSubVolumeBindingWeight () {
diff --git a/utils/getData2.js b/utils/getData2.js
index 8284b9c..fc1b12c 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -96,4 +96,86 @@ export const toCleanCutCacheInventory = (code) => request({
 export const doSubVolumeBindingWeight = (cn, roll, paper) => request({
 	url:'api/pda/nbj/doSubVolumeBindingWeight',
 	data: {container_name: cn, roll_weight: roll, paper_weight: paper}
-})
\ No newline at end of file
+})
+// 装箱暂存管理
+export const getZxPointList = () => request({
+	url:'api/pda/encasement/getZxPointList',
+	data: {}
+})
+export const setEmptyVehicle = (code, vcode) => request({
+	url:'api/pda/encasement/setEmptyVehicle',
+	data: {point_code: code, vehicle_code: vcode}
+})
+export const doClearPoint = (code) => request({
+	url:'api/pda/encasement/doClearPoint',
+	data: {point_code: code}
+})
+// 分切上料
+export const queryOrderInfo = () => request({
+	url:'api/pda/slitter/queryOrderInfo',
+	data: {}
+})
+export const slitvehicleReturn = (code) => request({
+	url:'api/pda/slitter/vehicleReturn',
+	data: {point_code: code}
+})
+export const slitcallSlitterRoll = (id, code, zc, rn) => request({
+	url:'api/pda/slitter/callSlitterRoll',
+	data: {workorder_id: id, point_code: code, zc_point: zc, resource_name: rn}
+})
+export const slitsendSlitterRoll = (code) => request({
+	url:'api/pda/slitter/sendSlitterRoll',
+	data: {point_code: code}
+})
+export const slitallowCoiling = (code) => request({
+	url:'api/pda/slitter/allowCoiling',
+	data: {point_code: code}
+})
+// 分切下料
+export const querySlitterDeviceSubVolumeInfos = (code) => request({
+	url:'api/pda/slitter/querySlitterDeviceSubVolumeInfos',
+	data: {point_code: code}
+})
+export const slitterDown = (code) => request({
+	url:'api/pda/slitter/slitterDown',
+	data: {point_code: code}
+})
+// 子卷绑定
+export const devicePointQuery = (code) => request({
+	url:'api/pda/slitter/devicePointQuery',
+	data: {device_code: code}
+})
+export const bindSlitterSubVolumeInfo = (code, cn) => request({
+	url:'api/pda/slitter/bindSlitterSubVolumeInfo',
+	data: {device_code: code, container_name: cn}
+})
+// 生箔工序
+export const needEmptyVehicle = (code) => request({
+	url:'api/pda/raw/needEmptyVehicle',
+	data: {point_code: code}
+})
+export const necessaryEmptyVehicle = (code) => request({
+	url:'api/pda/raw/necessaryEmptyVehicle',
+	data: {point_code: code}
+})
+export const needEmptyAxisv2 = (code, order, is) => request({
+	url:'api/pda/raw/needEmptyAxis/v2',
+	data: {point_code: code, order_code: order, is_call_empty: is}
+})
+export const confirmBlanking = (code) => request({
+	url:'api/pda/raw/confirmBlanking',
+	data: {point_code: code}
+})
+// 烘烤工序
+export const getHotTempPointInfo = (code, order) => request({
+	url:'api/pda/baking/getHotTempPointInfo',
+	data: {point_code: code, order_code: order}
+})
+export const doModifyRawInfos = (code, order, temperature, time) => request({
+	url:'api/pda/baking/doModifyRawInfos',
+	data: {point_code: code, order_code: order, temperature: temperature, time: time}
+})
+export const bakingQuality = (code, quality) => request({
+	url:'api/pda/baking/bakingQuality',
+	data: {point_code: code, quality: quality}
+})
diff --git a/utils/mork2.js b/utils/mork2.js
index d712f1f..22f18dc 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -8,7 +8,10 @@ export const authority = () => {
 				{path: 'RF01', title: '收卷辊库', sonTree: [{title: '收卷辊管理', path: '/pages/manage/roll-manage'}]},
 				{path: 'RF01', title: '检测取样', sonTree: [{title: '呼叫取样', path: '/pages/manage/call-sampling'}]},
 				{path: 'RF01', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}]},
-				{path: 'RF01', title: '内包间', sonTree: [{title: '管芯入库', path: '/pages/manage/tube-core-storage'}, {title: '管芯出库', path: '/pages/manage/tube-core-out'}, {title: '套轴绑定', path: '/pages/manage/axis-bind'}, {title: '重量维护', path: '/pages/manage/weight-bind'}]}
+				{path: 'RF01', title: '内包间', sonTree: [{title: '管芯入库', path: '/pages/manage/tube-core-storage'}, {title: '管芯出库', path: '/pages/manage/tube-core-out'}, {title: '套轴绑定', path: '/pages/manage/axis-bind'}, {title: '重量维护', path: '/pages/manage/weight-bind'}]},
+				{path: 'RF01', title: '装箱区', sonTree: [{title: '装箱暂存管理', path: '/pages/manage/pack-storage'}]},
+				{path: 'RF01', title: '分切管理', sonTree: [{title: '分切上料', path: '/pages/manage/split-feed'}, {title: '分切下料', path: '/pages/manage/split-cut'}, {title: '子卷绑定', path: '/pages/manage/sub-vol-bind'}]},
+				{path: 'RF01', title: '生产管理', sonTree: [{title: '生箔工序', path: '/pages/manage/raw-foil-progess'}, {title: '烘烤工序', path: '/pages/manage/bake-process'}]}
 			]
 		}
 	}}