From a64a5efc46c62c59759370a84141d7844e41c0b2 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 5 Mar 2025 10:22:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E8=BD=B4=E5=9B=9E?=
 =?UTF-8?q?=E5=BA=93=E3=80=81=E5=91=BC=E5=8F=AB=E5=A5=97=E8=BD=B4=EF=BC=8C?=
 =?UTF-8?q?add=E4=BD=99=E8=BD=B4=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              |  8 +++
 pages/ProductManage/CallPaperShaft.vue  | 40 ++++++++++++--
 pages/ProductManage/PlusShaftReturn.vue | 72 +++++++++++++++++++++++++
 pages/ProductManage/UnAxisBack.vue      | 33 +++++++++---
 utils/getData3.js                       | 23 +++++++-
 utils/mork2.js                          |  5 +-
 6 files changed, 165 insertions(+), 16 deletions(-)
 create mode 100644 pages/ProductManage/PlusShaftReturn.vue

diff --git a/pages.json b/pages.json
index 19c1c12..fc1d013 100644
--- a/pages.json
+++ b/pages.json
@@ -615,6 +615,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/ProductManage/PlusShaftReturn",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/ProductManage/CallPaperShaft.vue b/pages/ProductManage/CallPaperShaft.vue
index e9d5649..430fba4 100644
--- a/pages/ProductManage/CallPaperShaft.vue
+++ b/pages/ProductManage/CallPaperShaft.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<!-- <nav-bar title="分切呼叫套轴"></nav-bar> -->
+		<!-- <nav-bar title="呼叫套轴"></nav-bar> -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
@@ -55,8 +55,9 @@
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index1 || !index2 || (!upL && !upR) || !index3 || !index4 || !qty}" :disabled="disabled" @tap="_callPaperShaft">送轴</button>
+			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">清空</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index1 || !index2 || (!upL && !upR) || !index3 || !index4 || !qty}" :disabled="disabled" @tap="_callPaperShaft">自动送轴</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index1 || !index2 || (!upL && !upR) || !index3 || !index4}" :disabled="disabled1" @tap="_labourShaftBack">人工送轴</button>
 		</view>
 	</view>
 </template>
@@ -65,7 +66,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import {queryProductArea, queryDeviceByarea} from '@/utils/getData2.js'
-	import {paperQueryPaperMaterial, callPaperShaft} from '@/utils/getData3.js'
+	import {paperQueryPaperMaterial, callPaperShaft, labourShaftBack} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -88,7 +89,8 @@
 				upL: '',
 				upR: '',
 				qty: null,
-				disabled: false
+				disabled: false,
+				disabled1: false
 			};
 		},
 		onLoad (options) {
@@ -127,6 +129,7 @@
 				this.index4 = ''
 				this.qty = null
 				this.disabled = false
+				this.disabled1 = false
 			},
 			async _callPaperShaft () {
 				this.disabled = true
@@ -186,6 +189,33 @@
 			},
 			showSelector2 () {
 				this.newaxis2 = this.axis
+			},
+			async _labourShaftBack () {
+				this.disabled1 = true
+				if (!this.index1 || !this.index2 || (!this.upL && !this.upR) || !this.index3 || !this.index4) {
+					this.disabled1 = false
+					return
+				}
+				let upLT = ''
+				let upRT = ''
+				this.axis.map(el => {
+					if (el.value === this.upL) {
+						upLT = el.text
+					}
+					if (el.value === this.upR) {
+						upRT = el.text
+					}
+				})
+				try {
+					let res = await labourShaftBack(this.index1, this.index2, upLT, this.upL, upRT, this.upR, this.index3, this.index4)
+					this.disabled1 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
 			}
 		}
 	}
diff --git a/pages/ProductManage/PlusShaftReturn.vue b/pages/ProductManage/PlusShaftReturn.vue
new file mode 100644
index 0000000..1df67de
--- /dev/null
+++ b/pages/ProductManage/PlusShaftReturn.vue
@@ -0,0 +1,72 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="余轴退回"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">起点</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+		</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}" :disabled="disabled1" @tap="_queryMaterialInfoL1400">空轴退回</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_shaftRecedesL1400">管轴退回</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryDeviceByarea, queryMaterialInfoL1400, shaftRecedesL1400} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				disabled1: false,
+				disabled2: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _shaftRecedesL1400 () {
+				this.disabled1 = true
+				if (!this.val1) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await shaftRecedesL1400(this.val1)
+					this.disabled1 = false
+					this.toEmpty()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.disabled1 = false
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/ProductManage/UnAxisBack.vue b/pages/ProductManage/UnAxisBack.vue
index 844336b..93bcc0e 100644
--- a/pages/ProductManage/UnAxisBack.vue
+++ b/pages/ProductManage/UnAxisBack.vue
@@ -29,8 +29,9 @@
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index2 || !index3 || !index4}" :disabled="disabled" @tap="toSure">回库</button>
+			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">清空</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index2 || !index3 || !index4}" :disabled="disabled" @tap="_shaftGoBack">空轴回库</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index2 || !index3 || !index4}" :disabled="disabled1" @tap="_callNeedShaft">呼叫空轴</button>
 		</view>
 	</view>
 </template>
@@ -38,7 +39,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import {queryProductArea} from '@/utils/getData2.js'
-	import {shaftGoBack} from '@/utils/getData3.js'
+	import {shaftGoBack, callNeedShaft} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar
@@ -52,7 +53,8 @@
 				index3: '',
 				options4: [{value: '4', text: '4'}, {value: '5', text: '5'}],
 				index4: '',
-				disabled: false
+				disabled: false,
+				disabled1: false
 			};
 		},
 		onLoad (options) {
@@ -70,15 +72,12 @@
 			selectChange2(e) {
 				this.index2 = e
 			},
-			toSure () {
+			async _shaftGoBack () {
 				this.disabled = true
 				if (!this.index2 || !this.index3 || !this.index4) {
 					this.disabled = false
 					return
 				}
-				this._shaftGoBack()
-			},
-			async _shaftGoBack () {
 				try {
 					let res = await shaftGoBack(this.index2, this.index3, this.index4)
 					uni.showToast({
@@ -90,11 +89,29 @@
 					this.disabled = false
 				}
 			},
+			async _callNeedShaft () {
+				this.disabled1 = true
+				if (!this.index2 || !this.index3 || !this.index4) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await callNeedShaft(this.index2, this.index3, this.index4)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled1 = false
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
 			clearUp () {
 				this.index2 = ''
 				this.index3 = ''
 				this.index4 = ''
 				this.disabled = false
+				this.disabled1 = false
 			}
 		}
 	}
diff --git a/utils/getData3.js b/utils/getData3.js
index 530ad56..b7bc78f 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -375,8 +375,16 @@ export const shaftGoBack = (area, size, qzz) => request({
 		qzz_generation: qzz
 	}
 })
+export const callNeedShaft = (area, size, qzz) => request({
+	url:'api/pda/paper/callNeedShaft',
+	data: {
+		area: area,
+		qzz_size: size,
+		qzz_generation: qzz
+	}
+})
 /**
- * 分切呼叫套轴
+ * 呼叫套轴
  */
 export const callPaperShaft = (area, location, ulk, ulv, urk, urv, size, qzz, num) => request({
 	url:'api/pda/paper/callPaperShaft',
@@ -392,6 +400,19 @@ export const callPaperShaft = (area, location, ulk, ulv, urk, urv, size, qzz, nu
 		qqz_num: num
 	}
 })
+export const labourShaftBack = (area, location, ulk, ulv, urk, urv, size, qzz) => request({
+	url:'api/pda/paper/labourShaftBack',
+	data: {
+		area: area,
+		location: location,
+		up_left_size_k: ulk,
+		up_left_size_v: ulv,
+		up_right_size_k: urk,
+		up_right_size_v: urv, 
+		qzz_size: size,
+		qzz_generation: qzz
+	}
+})
 /**
  * 分切上轴（一期分切管理）
  */
diff --git a/utils/mork2.js b/utils/mork2.js
index dc86b08..17ab0b2 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -22,8 +22,9 @@ export const allAuthority = () => {
 				{menu_id: '5', title: '子卷出站', path: '/pages/ProductManage/ZjOutStore'},
 				{menu_id: '6', title: '套轴申请', path: '/pages/ProductManage/AxisApply'},
 				{menu_id: '7', title: '空轴回库', path: '/pages/ProductManage/UnAxisBack'},
-				{menu_id: '8', title: '分切呼叫套轴', path: '/pages/ProductManage/CallPaperShaft'},
-				{menu_id: '8', title: '分切上轴', path: '/pages/ProductManage/UpperShaftCut'}
+				{menu_id: '8', title: '呼叫套轴', path: '/pages/ProductManage/CallPaperShaft'},
+				{menu_id: '9', title: '分切上轴', path: '/pages/ProductManage/UpperShaftCut'},
+				{menu_id: '10', title: '余轴退回', path: '/pages/ProductManage/PlusShaftReturn'}
 				]},
 			{menu_id: '4', path: 'RF04', title: '点位管理', sonTree: [
 				{menu_id: '1', title: '点位管理', path: '/pages/ProductManage/PointManage'},