From bec122c276d6dbc79a9e64f294500f5d6c502795 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 14 Jan 2025 17:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/manage/waste-foil-move.vue | 27 ++++++++++++++++++++++-----
 utils/getData2.js                |  4 ++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pages/manage/waste-foil-move.vue b/pages/manage/waste-foil-move.vue
index d8e7a31..73ff67b 100644
--- a/pages/manage/waste-foil-move.vue
+++ b/pages/manage/waste-foil-move.vue
@@ -16,10 +16,11 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toSure1">开始</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toSure2('1')">确认</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toSure2('2')">结束</button>
+			<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-4 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toSure1">开始</button>
+			<button class="zd-col-4 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toSure2('1')">确认</button>
+			<button class="zd-col-4 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toSure2('2')">结束</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_resumeAutoMoveWasteFoil">继续巡航</button>
 		</view>
 	</view>
 </template>
@@ -28,7 +29,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import LinkScan from '@/components/LinkScan.vue'
-	import {startMoveWasteFoilv2, resumeMoveWasteFoilv2} from '@/utils/getData2.js'
+	import {startMoveWasteFoilv2, resumeMoveWasteFoilv2, resumeAutoMoveWasteFoil} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -115,6 +116,22 @@
 			clearUp () {
 				this.val1 = ''
 				this.disabled = false
+			},
+			async _resumeAutoMoveWasteFoil () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await resumeAutoMoveWasteFoil(this.val1)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
 			}
 		}
 	}
diff --git a/utils/getData2.js b/utils/getData2.js
index 4a2d94e..cbd79b8 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -57,6 +57,10 @@ export const resumeMoveWasteFoilv2 = (flag, code) => request({
 	url:'api/pda/other/resumeMoveWasteFoil/v2',
 	data: {flag: flag, point_code: code}
 })
+export const resumeAutoMoveWasteFoil = (code) => request({
+	url:'api/pda/other/resumeAutoMoveWasteFoil',
+	data: {point_code: code}
+})
 // 管芯入库
 export const gxgetGxSpecification = () => request({
 	url:'api/pda/gx/getGxSpecification',