From e924f3a5a72f93cd866a0fe442b54f60cadd1b69 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: Thu, 5 Dec 2024 15:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=8F=96=E6=A0=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/manage/call-sampling.vue                | 26 +++++++++++++++----
 ...l-sampling1.vue => call-sampling_back.vue} | 26 ++++---------------
 2 files changed, 26 insertions(+), 26 deletions(-)
 rename pages/manage/{call-sampling1.vue => call-sampling_back.vue} (72%)

diff --git a/pages/manage/call-sampling.vue b/pages/manage/call-sampling.vue
index 8abd0ed..742e0a5 100644
--- a/pages/manage/call-sampling.vue
+++ b/pages/manage/call-sampling.vue
@@ -27,10 +27,9 @@
 			</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}" :disabled="disabled" @tap="_callAgvToSampling">呼叫</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSamplingVerify('1')">放货确认</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSamplingVerify('2')">取货确认</button>
+			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSampling">呼叫</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_resumeMoveWasteFoilv3('2')">结束</button>
 		</view>
 	</view>
 </template>
@@ -38,7 +37,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {callAgvToSampling, callAgvToSamplingVerify} from '@/utils/getData2.js'
+	import {callAgvToSampling, callAgvToSamplingVerify, resumeMoveWasteFoilv3} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -94,6 +93,23 @@
 				this.val1 = ''
 				this.val2 = ''
 				this.disabled = false
+			},
+			async _resumeMoveWasteFoilv3 (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await resumeMoveWasteFoilv3(type, this.val1, this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
 			}
 		}
 	}
diff --git a/pages/manage/call-sampling1.vue b/pages/manage/call-sampling_back.vue
similarity index 72%
rename from pages/manage/call-sampling1.vue
rename to pages/manage/call-sampling_back.vue
index 742e0a5..8abd0ed 100644
--- a/pages/manage/call-sampling1.vue
+++ b/pages/manage/call-sampling_back.vue
@@ -27,9 +27,10 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSampling">呼叫</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_resumeMoveWasteFoilv3('2')">结束</button>
+			<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSampling">呼叫</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSamplingVerify('1')">放货确认</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSamplingVerify('2')">取货确认</button>
 		</view>
 	</view>
 </template>
@@ -37,7 +38,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {callAgvToSampling, callAgvToSamplingVerify, resumeMoveWasteFoilv3} from '@/utils/getData2.js'
+	import {callAgvToSampling, callAgvToSamplingVerify} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -93,23 +94,6 @@
 				this.val1 = ''
 				this.val2 = ''
 				this.disabled = false
-			},
-			async _resumeMoveWasteFoilv3 (type) {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await resumeMoveWasteFoilv3(type, this.val1, this.val2)
-					this.clearUp()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
 			}
 		}
 	}