From 6994f1b7d860a8cb59fdbaaaa5be9642560dda01 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 17 Jun 2025 14:44:48 +0800
Subject: [PATCH] en

---
 locale/en-1.json                              |  17 +-
 locale/id-1.json                              |  17 +-
 locale/zh-Hans-1.json                         |  17 +-
 pages.json                                    |  74 +---
 pages/SecondPhase/slitting/CacheSave.vue      |  66 ----
 pages/SecondPhase/slitting/CallAxisSeq.vue    |  87 -----
 pages/SecondPhase/slitting/DoInitShaft.vue    |  10 +-
 pages/SecondPhase/slitting/PaperBind.vue      |  22 +-
 .../SecondPhase/slitting/SlittingCutting.vue  | 122 -------
 .../SecondPhase/slitting/SlittingCutting2.vue |  33 +-
 .../SecondPhase/slitting/SlittingFeeding.vue  |  66 ++--
 pages/SecondPhase/slitting/UpperShaftCut2.vue | 121 -------
 pages/SecondPhase/slitting/ZjCasing.vue       | 291 ---------------
 pages/SecondPhase/slitting/ZjDelivery.vue     | 339 ------------------
 pages/SecondPhase/slitting/ZjInStore.vue      | 187 ----------
 pages/SecondPhase/slitting/ZjOutStore.vue     | 336 -----------------
 utils/mork2.js                                |   8 -
 17 files changed, 120 insertions(+), 1693 deletions(-)
 delete mode 100644 pages/SecondPhase/slitting/CacheSave.vue
 delete mode 100644 pages/SecondPhase/slitting/CallAxisSeq.vue
 delete mode 100644 pages/SecondPhase/slitting/SlittingCutting.vue
 delete mode 100644 pages/SecondPhase/slitting/UpperShaftCut2.vue
 delete mode 100644 pages/SecondPhase/slitting/ZjCasing.vue
 delete mode 100644 pages/SecondPhase/slitting/ZjDelivery.vue
 delete mode 100644 pages/SecondPhase/slitting/ZjInStore.vue
 delete mode 100644 pages/SecondPhase/slitting/ZjOutStore.vue

diff --git a/locale/en-1.json b/locale/en-1.json
index c509330..d9ebc5a 100644
--- a/locale/en-1.json
+++ b/locale/en-1.json
@@ -1,12 +1,20 @@
 {
 	"button.check": "Check",
 	"button.abnormal": "Abnormal",
-    "button.normal": "Normal",
+	"button.normal": "Normal",
+	"button.add": "Add",
+	"button.delete": "Delete",
+	"button.bind": "Bind",
+	"button.cleanup": "Cleanup",
 	"filter.bill-code": "Bill code",
 	"filter.warehouse": "Warehouse",
 	"filter.woodenbox": "Woodenbox",
 	"filter.countednum": "Checknum",
 	"filter.uncountednum": "Unchecknum",
+	"filter.ifreinstallshaft": "Do you want to re install the shaft",
+	"filter.tubecode": "Chip code",
+	"filter.rownum": "Row number",
+	"filter.colnum": "Column Number",
 	"grid.bill-code": "Bill code",
 	"grid.bill-type": "Bill type",
 	"grid.warehouse-name": "Warehouse name",
@@ -29,5 +37,10 @@
 	"grid.check-man": "Check man",
 	"grid.check-time": "Check time",
 	"grid.expected-end-time": "Expected end time",
-	"grid.remain-time": "Remain time"
+	"grid.remain-time": "Remain time",
+	"grid.jtcode": "Machine number",
+	"grid.axisposition": "Axis position",
+	"grid.operate": "Operate",
+	"select.uppershaft": "Upper shaft",
+	"select.lowershaft": "Lower shaft"
 }
\ No newline at end of file
diff --git a/locale/id-1.json b/locale/id-1.json
index 8e060d7..7fade95 100644
--- a/locale/id-1.json
+++ b/locale/id-1.json
@@ -1,12 +1,20 @@
 {
 	"button.check": "Inventar",
 	"button.abnormal": "Abnormal",
-    "button.normal": "Normal",
+	"button.normal": "Normal",
+	"button.add": "Tambahkan",
+	"button.delete": "Hapus",
+	"button.bind": "Ikatan",
+	"button.cleanup": "Hapus",
 	"filter.bill-code": "Kode dokumen",
 	"filter.warehouse": "gudang",
 	"filter.woodenbox": "Kotak kayu",
 	"filter.countednum": "Jumlah cakera",
 	"filter.uncountednum": "Titik tidak terhitung",
+	"filter.ifreinstallshaft": "Apakah mengubah sumbu",
+	"filter.tubecode": "Kode inti pipa",
+	"filter.rownum": "Jumlah baris",
+	"filter.colnum": "Jumlah kolom",
 	"grid.bill-code": "Nomor dokumen",
 	"grid.bill-type": "Jenis dokumen",
 	"grid.warehouse-name": "Nama gudang",
@@ -27,5 +35,10 @@
 	"grid.rolls-num": "Jumlah gulungan",
 	"grid.check-result": "Hasil inventaris",
 	"grid.check-man": "Orang inventaris",
-	"grid.check-time": "Waktu inventaris"
+	"grid.check-time": "Waktu inventaris",
+	"grid.jtcode": "Nomor mesin",
+	"grid.axisposition": "Posisi sumbu",
+	"grid.operate": "Operasi",
+	"select.uppershaft": "Poros Atas",
+	"select.lowershaft": "Poros bawah"
 }
\ No newline at end of file
diff --git a/locale/zh-Hans-1.json b/locale/zh-Hans-1.json
index c482244..6d7858a 100644
--- a/locale/zh-Hans-1.json
+++ b/locale/zh-Hans-1.json
@@ -1,12 +1,20 @@
 {
     "button.check": "盘点",
     "button.abnormal": "异常",
-    "button.normal": "正常",
+	"button.normal": "正常",
+	"button.add": "添加",
+	"button.delete": "删除",
+	"button.bind": "绑定",
+	"button.cleanup": "清除",
 	"filter.bill-code": "单据编码",
 	"filter.warehouse": "仓库",
 	"filter.woodenbox": "木箱",
 	"filter.countednum": "已盘点数",
 	"filter.uncountednum": "未盘点数",
+	"filter.ifreinstallshaft": "是否重新套轴",
+	"filter.tubecode": "管芯编码",
+	"filter.rownum": "排数",
+	"filter.colnum": "排数",
 	"grid.bill-code": "单据号",
 	"grid.bill-type": "单据类型",
 	"grid.warehouse-name": "仓库名称",
@@ -29,5 +37,10 @@
 	"grid.check-man": "盘点人",
 	"grid.check-time": "盘点时间",
 	"grid.expected-end-time": "预计结束时间",
-	"grid.remain-time": "剩余时间(分)"
+	"grid.remain-time": "剩余时间(分)",
+	"grid.jtcode": "机台编号",
+	"grid.axisposition": "轴位置",
+	"grid.operate": "操作",
+	"select.uppershaft": "上轴",
+	"select.lowershaft": "下轴"
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 9012cb1..f3e872d 100644
--- a/pages.json
+++ b/pages.json
@@ -103,38 +103,6 @@
                 "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/slitting/TubeStock",
@@ -184,14 +152,6 @@
                 "navigationStyle": "custom"
             }
             
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/SlittingCutting",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
         }
         ,{
             "path" : "pages/SecondPhase/slitting/DoInitShaft",
@@ -320,14 +280,6 @@
                 "navigationStyle": "custom"
             }
             
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/UpperShaftCut2",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
         }
         ,{
             "path" : "pages/SecondPhase/production/ZjInStore",
@@ -368,14 +320,6 @@
                 "navigationStyle": "custom"
             }
             
-        }
-        ,{
-            "path" : "pages/SecondPhase/slitting/CallAxisSeq",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
         }
         ,{
             "path" : "pages/SecondPhase/slitting/SlittingCutting2",
@@ -426,29 +370,21 @@
             
         }
         ,{
-            "path" : "pages/SecondPhase/slitting/CacheSave",
+            "path" : "pages/SecondPhase/production/MjMake",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
             
         }
-        ,{
-            "path" : "pages/SecondPhase/production/MjMake",
+        ,{
+            "path" : "pages/SecondPhase/production/SboCool",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
             }
-            
-        }
-        ,{
-            "path" : "pages/SecondPhase/production/SboCool",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/slitting/CacheSave.vue b/pages/SecondPhase/slitting/CacheSave.vue
deleted file mode 100644
index 0a4b930..0000000
--- a/pages/SecondPhase/slitting/CacheSave.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<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">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submitbar">
-			<button class="zd-col-5 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
-			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_cutCacheInventory('0')">清除</button>
-			<button class="zd-col-8 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_cutCacheInventory('1')">放轴</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {cutCacheInventory} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		methods: {
-			async _cutCacheInventory (type) {
-				this.disabled = true
-				if (!this.val1) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await cutCacheInventory(this.val1, type)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-					this.disabled = false
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			clearUp () {
-				this.val1 = ''
-				this.disabled = false
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/pages/SecondPhase/slitting/CallAxisSeq.vue b/pages/SecondPhase/slitting/CallAxisSeq.vue
deleted file mode 100644
index 0913e74..0000000
--- a/pages/SecondPhase/slitting/CallAxisSeq.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-	<view class="zd_container">
-		<!-- <nav-bar title="人工呼叫套轴顺序"></nav-bar> -->
-		<nav-bar :title="title"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>序号</th>
-								<th class="th_2">设备</th>
-								<th>位置</th>
-								<th>尺寸</th>
-								<th>状态</th>
-								<th>代数</th>
-								<th>呼叫时间</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{Number(i) + 1}}</td>
-								<td class="td_2">{{e.resource_name}}</td>
-								<td>{{['上轴', '下轴'][Number(e.up_or_down) - 1]}}</td>
-								<td>{{e.qzz_size}}</td>
-								<td>{{getStatusText(e.status)}}</td>
-								<td>{{e.qzz_generation}}</td>
-								<td>{{e.start_time}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<up-top ref="UT" :scrollTop="top"></up-top>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import UpTop from '@/components/upTop.vue'
-	import {showManualView} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			UpTop
-		},
-		data() {
-			return {
-				title: '',
-				top: 0,
-				dataList: []
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		onPageScroll(e) {
-			this.$refs.UT.topData(e.scrollTop)
-		},
-		created () {
-			this._showManualView()
-		},
-		methods: {
-			getStatusText(status) {
-				const statusMap = {
-					'01': '准备套轴',
-					'02': '正在配送',
-					'03': '配送完成'
-				}
-				return statusMap[status] || '已完成'
-			},
-			async _showManualView () {
-				let res = await showManualView()
-				if (res) {
-					this.dataList = [...res]
-				}
-			}
-		}
-	}
-</script>
-
-<style scoped>
-.zd_content {
-	padding-bottom: 30rpx;
-}
-</style>
\ No newline at end of file
diff --git a/pages/SecondPhase/slitting/DoInitShaft.vue b/pages/SecondPhase/slitting/DoInitShaft.vue
index 362e1dd..2594561 100644
--- a/pages/SecondPhase/slitting/DoInitShaft.vue
+++ b/pages/SecondPhase/slitting/DoInitShaft.vue
@@ -5,9 +5,11 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
-					<view class="filter_label">点位</view>
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.point')}}</span>
+					</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -16,13 +18,13 @@
 					</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 class="filter_input_wraper_inn_text">{{$t('filter.ifreinstallshaft')}}</view>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-22 btn-submit btn-success" :class="{'btn-info': !index}" :disabled="disabled" @tap="_doInitShaftPoint">确认</button>
+			<button class="zd-col-22 btn-submit btn-success" :class="{'btn-info': !index}" :disabled="disabled" @tap="_doInitShaftPoint">{{$t('button.confirm')}}</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/SecondPhase/slitting/PaperBind.vue b/pages/SecondPhase/slitting/PaperBind.vue
index 635b1b1..7e70418 100644
--- a/pages/SecondPhase/slitting/PaperBind.vue
+++ b/pages/SecondPhase/slitting/PaperBind.vue
@@ -6,7 +6,7 @@
 			<view class="zd_wrapper">
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">托盘号</span>
+						<span class="filter_label">{{$t('filter.pallet-number')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box v-model="val1" />
@@ -14,36 +14,36 @@
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">管芯编码</span>
+						<span class="filter_label">{{$t('filter.tubecode')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box v-model="val3" />
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label">排数</view>
+					<view class="filter_label">{{$t('filter.rownum')}}</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+						<uni-data-select v-model="index1" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label">列数</view>
+					<view class="filter_label">{{$t('filter.colnum')}}</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+						<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label">物料</view>
+					<view class="filter_label">{{$t('filter.material')}}</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>
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :searchInput="true" :localdata="newoptions" @change="selectChange" @handleChange="handleChange" @showSelector="showSelector"></uni-data-select>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index || !index1 || !index2 || !val3}" :disabled="disabled" @tap="_operateIvt('1')">绑定</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index || !index1 || !index2 || !val3}" :disabled="disabled" @tap="_operateIvt('2')">清除</button>
+			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index || !index1 || !index2 || !val3}" :disabled="disabled" @tap="_operateIvt('1')">{{$t('button.bind')}}</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index || !index1 || !index2 || !val3}" :disabled="disabled" @tap="_operateIvt('2')">{{$t('button.cleanup')}}</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/SecondPhase/slitting/SlittingCutting.vue b/pages/SecondPhase/slitting/SlittingCutting.vue
deleted file mode 100644
index 4764045..0000000
--- a/pages/SecondPhase/slitting/SlittingCutting.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<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" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
-				<view class="msg_item">上轴子卷号：{{obj.up}}</view>
-				<view class="msg_item">下轴子卷号：{{obj.down}}</view>
-				<view class="msg_item">提示：{{obj.msg}}</view>
-			</view>
-		</view>
-		<view class="zd-row submitbar">
-			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !index}" @tap="toSure">确认</button>
-		</view>
-		<uni-popup ref="alertDialog" type="dialog">
-			<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="提示" content="确认是否创建下卷桁架任务？" @confirm="dialogConfirm"></uni-popup-dialog>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {queryProductArea} from '@/utils/getData2.js'
-	import {slitterDevices, downRolls, querySlitterDeviceSubVolumeInfos} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				options: [],
-				index: '',
-				options2: [],
-				index2: '',
-				obj: {up: '-', down: '-', msg: '-'}
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._queryProductArea()
-		},
-		methods: {
-			selectChange2(e) {
-				this.index2 = e
-				if (e) {
-					this._slitterDevices(e)
-				} else {
-					this.index = ''
-				}
-			},
-			/** 生产区域下拉框查询 */
-			async _queryProductArea () {
-				let res = await queryProductArea()
-				this.options2 = [...res.data]
-			},
-			async _slitterDevices (e) {
-				let res = await slitterDevices(e)
-				this.options = [...res]
-			},
-			selectChange (e) {
-				this.index = e
-				if (e) {
-					this._querySlitterDeviceSubVolumeInfos()
-				} else {
-					this.obj = {up: '-', down: '-', msg: '-'}
-				}
-			},
-			toSure () {
-				if (!this.index) {
-					return
-				}
-				this.$refs.alertDialog.open()
-			},
-			dialogConfirm () {
-				this._downRolls()
-			},
-			async _downRolls () {
-				try {
-					let res = await downRolls(this.index)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					console.log(e)
-				}
-			},
-			clearUp () {
-				this.index = ''
-				this.index2 = ''
-				this.options = []
-				this.obj = {up: '-', down: '-', msg: '-'}
-			},
-			async _querySlitterDeviceSubVolumeInfos () {
-				try {
-					let res = await querySlitterDeviceSubVolumeInfos(this.index)
-					this.obj = res.data
-				} catch (e) {
-					console.log(e)
-				}
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/pages/SecondPhase/slitting/SlittingCutting2.vue b/pages/SecondPhase/slitting/SlittingCutting2.vue
index dde62f8..e613598 100644
--- a/pages/SecondPhase/slitting/SlittingCutting2.vue
+++ b/pages/SecondPhase/slitting/SlittingCutting2.vue
@@ -5,22 +5,27 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
-					<view class="filter_label">区域</view>
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.area')}}</span>
+					</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+						<uni-data-select v-model="index2" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label">设备</view>
+					<!-- <view class="filter_label">设备</view> -->
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.device')}}</span>
+					</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 			</view>
 			<view class="zd_wrapper">
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">子卷号</span>
+						<span class="filter_label">{{$t('grid.sub-roll-number')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box
@@ -31,7 +36,7 @@
 				<view class="zd-row">
 					<view class="zd-col-19">
 						<view class="filter_item">
-							<view class="filter_label">轴位置</view>
+							<view class="filter_label">{{$t('grid.axisposition')}}</view>
 							<view class="filter_input_wraper">
 								<radio-group @change="radioChange">
 									<label class="mgr20" v-for="(item, index) in options1" :key="item.value">
@@ -43,7 +48,7 @@
 						</view>
 					</view>
 					<view class="zd-col-4">
-						<button class="mini-btn" size="mini" style="display: block;" type="primary" @tap="handleAdd">添加</button>
+						<button class="mini-btn" size="mini" style="display: block;" type="primary" @tap="handleAdd">{{$t('button.add')}}</button>
 					</view>
 				</view>
 			</view>
@@ -52,16 +57,16 @@
 					<table>
 						<thead>
 							<tr>
-								<th width="60%">子卷号</th>
-								<th width="20%">轴位置</th>
-								<th width="20%">操作</th>
+								<th width="60%">{{$t('grid.sub-roll-number')}}</th>
+								<th width="20%">{{$t('grid.axisposition')}}</th>
+								<th width="20%">{{$t('grid.operate')}}</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{e.container_name}}</td>
 								<td>{{ options1 | findByValue(e.site)}}</td>
-								<td><button class="mini-btn" size="mini" type="primary" @tap="handleDelete(i)">删除</button></td>
+								<td><button class="mini-btn" size="mini" type="primary" @tap="handleDelete(i)">{{$t('button.delete')}}</button></td>
 							</tr>
 						</tbody>
 					</table>
@@ -69,8 +74,8 @@
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !index || !dataList.length}" :disabled="disabled" @tap="_downRolls2">确认</button>
+			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !index || !dataList.length}" :disabled="disabled" @tap="_downRolls2">{{$t('button.confirm')}}</button>
 		</view>
 	</view>
 </template>
@@ -92,7 +97,7 @@
 				index: '',
 				options2: [],
 				index2: '',
-				options1: [{value: '1', text: '上轴'}, {value: '2', text: '下轴'}],
+				options1: [{value: '1', text: this.$t('select.uppershaft')}, {value: '2', text: this.$t('select.lowershaft')}],
 				index1: '1',
 				current: 0,
 				val1: '',
diff --git a/pages/SecondPhase/slitting/SlittingFeeding.vue b/pages/SecondPhase/slitting/SlittingFeeding.vue
index 23206a7..c5307d2 100644
--- a/pages/SecondPhase/slitting/SlittingFeeding.vue
+++ b/pages/SecondPhase/slitting/SlittingFeeding.vue
@@ -5,14 +5,16 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
-					<view class="filter_label">区域</view>
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('filter.area')}}</span>
+					</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">点位</span>
+						<span class="filter_label">{{$t('filter.point')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box
@@ -22,7 +24,7 @@
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">母卷号</span>
+						<span class="filter_label">{{$t('grid.mother-roll-number')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box
@@ -36,21 +38,21 @@
 					<table>
 						<thead>
 							<tr>
-								<th>序号</th>
-								<th class="th_2">母卷号</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>{{$t('grid.number')}}</th>
+								<th class="th_2">{{$t('grid.mother-roll-number')}}</th>
+								<th>{{$t('grid.sub-roll-number')}}</th>
+								<th>{{$t('grid.jtcode')}}</th>
+								<th>{{$t('grid.split-group')}}</th>
+								<th>{{$t('grid.production-sequence')}}</th>
+								<th>{{$t('grid.date-of-manufacture')}}</th>
+								<th>{{$t('grid.order-number')}}</th>
+								<th>{{$t('grid.paper-FRP-tube')}}</th>
+								<th>{{$t('grid.paper-tube-material-code')}}</th>
+								<th>{{$t('grid.paper-tube-material-description')}}</th>
+								<th>{{$t('grid.paper-tube-specifications')}}</th>
+								<th>{{$t('grid.FRP-pipe-material-code')}}</th>
+								<th>{{$t('grid.FRP-pipe-material-description')}}</th>
+								<th>{{$t('grid.FRP-pipe-specifications')}}</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -63,13 +65,13 @@
 								<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_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.frp_material}}</td>
+								<td>{{e.frp_description}}</td>
+								<td>{{e.frp_model}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -78,18 +80,18 @@
 			<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-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">{{$t('button.full-shaft-return')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">{{$t('button.empty-shaft-return')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" @tap="handleSure">{{$t('button.manual-call')}}</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>
+			<button class="zd-col-3 btn-submit btn-success" @tap="searchList">{{$t('button.search')}}</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_label">{{$t('filter.starting-point')}}</view>
 						<view class="filter_input_wraper">
 							<search-box
 							v-model="val3"
@@ -98,7 +100,7 @@
 						</view>
 					</view>
 					<view class="filter_item filter_item-1">
-						<view class="filter_label">母卷号</view>
+						<view class="filter_label">{{$t('grid.mother-roll-number')}}</view>
 						<view class="filter_input_wraper">
 							<search-box
 							v-model="val4"
@@ -106,7 +108,7 @@
 						</view>
 					</view>
 					<view class="filter_item filter_item-1">
-						<view class="filter_label">终点</view>
+						<view class="filter_label">{{$t('filter.end')}}</view>
 						<view class="filter_input_wraper">
 							<search-box
 							v-model="val5"
@@ -116,8 +118,8 @@
 				</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>
+				<button class="zd-col-11 btn-submit btn-default letter-30" @tap="cancleModal">{{$t('button.cancel')}}</button>
+				<button class="zd-col-11 btn-submit btn-success letter-30" @tap="modalToSure">{{$t('button.confirm')}}</button>
 			</view>
 		</view>
 		<view v-if="active" class="msg_mask"></view>
diff --git a/pages/SecondPhase/slitting/UpperShaftCut2.vue b/pages/SecondPhase/slitting/UpperShaftCut2.vue
deleted file mode 100644
index 370ddf3..0000000
--- a/pages/SecondPhase/slitting/UpperShaftCut2.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-	<view class="zd_container">
-		<!-- <nav-bar title="分切上轴2"></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" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
-				<view class="msg_item">提示：{{obj.tip}}</view>
-			</view>
-		</view>
-		<view class="zd-row submitbar">
-			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !index}" @tap="toSure">确认</button>
-		</view>
-		<uni-popup ref="alertDialog" type="dialog">
-			<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="提示" content="确认是否创建上轴桁架任务？" @confirm="dialogConfirm"></uni-popup-dialog>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	// import {queryProductArea} from '@/utils/mork2.js'
-	import {queryProductArea} from '@/utils/getData2.js'
-	import {slitterDevices, doUpShaftToSlitterByDeviceTip, doUpShaftToSlitterByDevice} from '@/utils/getData3.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				title: '',
-				options: [],
-				index: '',
-				options2: [],
-				index2: '',
-				obj: {tip: '-'}
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._queryProductArea()
-		},
-		methods: {
-			selectChange2(e) {
-				this.index2 = e
-				if (e) {
-					this._slitterDevices(e)
-				} else {
-					this.index = ''
-				}
-			},
-			/** 生产区域下拉框查询 */
-			async _queryProductArea () {
-				let res = await queryProductArea()
-				this.options2 = [...res.data]
-			},
-			async _slitterDevices (e) {
-				let res = await slitterDevices(e)
-				this.options = [...res]
-			},
-			selectChange (e) {
-				this.index = e
-				if (e) {
-					this._doUpShaftToSlitterByDeviceTip()
-				} else {
-					this.obj = {tip: '-'}
-				}
-			},
-			toSure () {
-				if (!this.index) {
-					return
-				}
-				this.$refs.alertDialog.open()
-			},
-			dialogConfirm () {
-				this._doUpShaftToSlitterByDevice()
-			},
-			async _doUpShaftToSlitterByDevice () {
-				try {
-					let res = await doUpShaftToSlitterByDevice(this.index2, this.index)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					console.log(e)
-				}
-			},
-			clearUp () {
-				this.index = ''
-				this.index2 = ''
-				this.options = []
-				this.obj = {tip: '-'}
-			},
-			async _doUpShaftToSlitterByDeviceTip () {
-				try {
-					let res = await doUpShaftToSlitterByDeviceTip(this.index2, this.index)
-					this.obj = res
-				} catch (e) {
-					console.log(e)
-				}
-			}
-		}
-	}
-</script>
\ No newline at end of file
diff --git a/pages/SecondPhase/slitting/ZjCasing.vue b/pages/SecondPhase/slitting/ZjCasing.vue
deleted file mode 100644
index c8dc8e8..0000000
--- a/pages/SecondPhase/slitting/ZjCasing.vue
+++ /dev/null
@@ -1,291 +0,0 @@
-<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="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 class="th_2">选择</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}" @tap="toCheck(e)">
-								<td>{{Number(i) + 1}}</td>
-								<td class="td_2"><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}">&#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>
-		<up-top ref="UT" :scrollTop="top"></up-top>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import UpTop from '@/components/upTop.vue'
-	import {queryProductArea, queryDeviceByarea, queryMaterialInfo2, casingConfirm, casingOutConfirm, casingWearConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			UpTop
-		},
-		data() {
-			return {
-				title: '',
-				top: 0,
-				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
-			};
-		},
-		onPageScroll(e) {
-			this.$refs.UT.topData(e.scrollTop)
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		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>
\ No newline at end of file
diff --git a/pages/SecondPhase/slitting/ZjDelivery.vue b/pages/SecondPhase/slitting/ZjDelivery.vue
deleted file mode 100644
index 30670de..0000000
--- a/pages/SecondPhase/slitting/ZjDelivery.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<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="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="zd-row mgb10">
-					<view class="zd-col-19">
-						<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>
-					<view class="zd-col-4">
-						<button class="btn-submit btn-success" @tap="_queryMaterialInfo">查询</button>
-					</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>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>序号</th>
-								<th class="th_2">选择</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}" @tap="toCheck(e)">
-								<td>{{Number(i) + 1}}</td>
-								<td class="td_2"><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}">&#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>
-		<up-top ref="UT" :scrollTop="top"></up-top>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import UpTop from '@/components/upTop.vue'
-	import {queryProductArea, queryDeviceByarea, queryMaterialInfo3, needVehicle, shippingConfirm, returnVehicle, shippingCheck, acrossVehicle} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			UpTop
-		},
-		data() {
-			return {
-				title: '',
-				top: 0,
-				val1: '',
-				val2: '',
-				val3: '',
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				qty: '',
-				dataList: [],
-				disabled1: false,
-				disabled2: false,
-				disabled3: false,
-				disabled4: false,
-				disabled5: false,
-				checkArr: []
-			};
-		},
-		onPageScroll(e) {
-			this.$refs.UT.topData(e.scrollTop)
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		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>
\ No newline at end of file
diff --git a/pages/SecondPhase/slitting/ZjInStore.vue b/pages/SecondPhase/slitting/ZjInStore.vue
deleted file mode 100644
index 823b09b..0000000
--- a/pages/SecondPhase/slitting/ZjInStore.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<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_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>
-		<up-top ref="UT" :scrollTop="top"></up-top>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import UpTop from '@/components/upTop.vue'
-	import {devicePointQuery, queryProductArea, queryDeviceByarea, queryMaterialInfo5, inConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			UpTop
-		},
-		data() {
-			return {
-				title: '',
-				top: 0,
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				options3: [],
-				index3: '',
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				disabled: false
-			};
-		},
-		onPageScroll(e) {
-			this.$refs.UT.topData(e.scrollTop)
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		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>
\ No newline at end of file
diff --git a/pages/SecondPhase/slitting/ZjOutStore.vue b/pages/SecondPhase/slitting/ZjOutStore.vue
deleted file mode 100644
index 08e25d5..0000000
--- a/pages/SecondPhase/slitting/ZjOutStore.vue
+++ /dev/null
@@ -1,336 +0,0 @@
-<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_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 class="th_2">选择</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}" @tap="toCheck(e)">
-								<td>{{Number(i) + 1}}</td>
-								<td class="td_2"><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}">&#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>
-		<up-top ref="UT" :scrollTop="top"></up-top>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import UpTop from '@/components/upTop.vue'
-	import {devicePointQuery, queryProductArea, queryDeviceByarea, queryMaterialInfo4, outConfirm, conveyPointQuery, conveyConfirm, disuseConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			UpTop
-		},
-		data() {
-			return {
-				title: '',
-				top: 0,
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				options3: [],
-				index3: '',
-				options4: [],
-				index4: '',
-				options5: [],
-				index5: '',
-				isV: '0',
-				dataList: [],
-				disabled1: false,
-				disabled2: false,
-				disabled3: false,
-				checkArr: [],
-				active: false
-			};
-		},
-		onPageScroll(e) {
-			this.$refs.UT.topData(e.scrollTop)
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		created () {
-			this._queryProductArea()
-			this._queryMaterialInfo()
-		},
-		methods: {
-			/** 末次下卷 */
-			isVirtual () {
-				this.isV = this.isV === '0' ? '1' : '0'
-			},
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = 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>
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 4d2c1d6..c930c23 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -30,12 +30,7 @@ export const allAuthority = () => {
 			]},
 			{menu_id: '5', path: 'RF03', title: '分切管理', sonTree: [
 				{menu_id: '1', title: '分切上料', path: '/pages/SecondPhase/slitting/SlittingFeeding'},
-				// {menu_id: '6', title: '分切下料', path: '/pages/SecondPhase/slitting/SlittingCutting'},
 				{menu_id: '6', title: '分切下料2', path: '/pages/SecondPhase/slitting/SlittingCutting2'},
-				// {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: '7', title: '穿拔轴初始化', path: '/pages/SecondPhase/slitting/DoInitShaft'},
 				{menu_id: '8', title: '纸管绑定', path: '/pages/SecondPhase/slitting/PaperBind'},
 				{menu_id: '8', title: '分切暂存下料', path: '/pages/SecondPhase/slitting/CacheCut'},
@@ -46,14 +41,11 @@ export const allAuthority = () => {
 				{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/UpperShaftCut'},
-				// {menu_id: '8', title: '分切上轴2', path: '/pages/SecondPhase/slitting/UpperShaftCut2'},
 				{menu_id: '8', title: '分切呼叫送轴', path: '/pages/SecondPhase/slitting/CallShaft'},
-				// {menu_id: '8', title: '人工呼叫套轴顺序', path: '/pages/SecondPhase/slitting/CallAxisSeq'},
 				{menu_id: '8', title: '分切上料架管理', path: '/pages/SecondPhase/slitting/RollCacheManage'},
 				{menu_id: '8', title: '饵料下卷', path: '/pages/SecondPhase/slitting/BaitRoll'},
 				// {menu_id: '8', title: '空轴绑定', path: '/pages/SecondPhase/slitting/EmptyAxisBind'},
 				{menu_id: '8', title: '空轴退回', path: '/pages/SecondPhase/slitting/EmptyAxisReturn'},
-				// {menu_id: '8', title: '分切暂存维护', path: '/pages/SecondPhase/slitting/CacheSave'},
 				{menu_id: '8', title: '管芯备货', path: '/pages/SecondPhase/slitting/TubeStock'}
 			]},
 			{menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [