From 7100156c36c1d19998556e9bfa8729b807868015 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 5 Mar 2025 15:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=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                              |  2 +-
 pages/ProductManage/PlusShaftReturn.vue | 72 -------------------
 pages/ProductManage/RemainShaftBack.vue | 93 +++++++++++++++++++++++++
 utils/getData3.js                       | 12 ++++
 utils/mork2.js                          |  2 +-
 5 files changed, 107 insertions(+), 74 deletions(-)
 delete mode 100644 pages/ProductManage/PlusShaftReturn.vue
 create mode 100644 pages/ProductManage/RemainShaftBack.vue

diff --git a/pages.json b/pages.json
index fc1d013..fe0aedb 100644
--- a/pages.json
+++ b/pages.json
@@ -616,7 +616,7 @@
             
         }
         ,{
-            "path" : "pages/ProductManage/PlusShaftReturn",
+            "path" : "pages/ProductManage/RemainShaftBack",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
diff --git a/pages/ProductManage/PlusShaftReturn.vue b/pages/ProductManage/PlusShaftReturn.vue
deleted file mode 100644
index 1df67de..0000000
--- a/pages/ProductManage/PlusShaftReturn.vue
+++ /dev/null
@@ -1,72 +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_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/RemainShaftBack.vue b/pages/ProductManage/RemainShaftBack.vue
new file mode 100644
index 0000000..0d2ea93
--- /dev/null
+++ b/pages/ProductManage/RemainShaftBack.vue
@@ -0,0 +1,93 @@
+<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 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"></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="index4" :localdata="options4"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-5 btn-submit btn-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index3 || !index4}" :disabled="disabled" @tap="toSure(1)">空轴退回</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !val1 || !index3 || !index4}" :disabled="disabled" @tap="toSure(2)">管轴退回</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {remainShaftBack} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options3: [{value: '3', text: '3寸'}, {value: '6', text: '6寸'}],
+				index3: '',
+				options4: [{value: '4', text: '4'}, {value: '5', text: '5'}],
+				index4: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async toSure (type) {
+				this.disabled = true
+				if (!this.val1 || !this.index3 || !this.index4) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await remainShaftBack(this.val1, this.index3, this.index4, type)
+					this.disabled = false
+					this.toEmpty()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toEmpty () {
+				this.val1 = ''
+				this.index3 = ''
+				this.index4 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/utils/getData3.js b/utils/getData3.js
index b7bc78f..b6ae662 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -450,3 +450,15 @@ export const toEndSub = (code) => request({
 		container_name: code
 	}
 })
+/**
+ * 余轴退回(一期分切管理)
+ */
+export const remainShaftBack = (code, size, ge, flag) => request({
+	url:'api/pda/paper/remainShaftBack',
+	data: {
+		point_code: code,
+		qzz_size: size,
+		qzz_generation: ge,
+		flag: flag
+	}
+})
diff --git a/utils/mork2.js b/utils/mork2.js
index 17ab0b2..5172648 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -24,7 +24,7 @@ export const allAuthority = () => {
 				{menu_id: '7', title: '空轴回库', path: '/pages/ProductManage/UnAxisBack'},
 				{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: '10', title: '余轴退回', path: '/pages/ProductManage/RemainShaftBack'}
 				]},
 			{menu_id: '4', path: 'RF04', title: '点位管理', sonTree: [
 				{menu_id: '1', title: '点位管理', path: '/pages/ProductManage/PointManage'},