From 20e6520be621221456a3ef4260401dd96e28fa4a Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 22 一月 2026 16:55:21 +0800
Subject: [PATCH] 1

---
 pages/AGV/CollectionPakin.vue |   94 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 67 insertions(+), 27 deletions(-)

diff --git a/pages/AGV/CollectionPakin.vue b/pages/AGV/CollectionPakin.vue
index f3c8270..fa04e86 100644
--- a/pages/AGV/CollectionPakin.vue
+++ b/pages/AGV/CollectionPakin.vue
@@ -5,6 +5,10 @@
 				<view class="code-decs">婧愭墭鐩�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orgBarcode" :focus="orgBarcodeFocus" />
 			</view>
+			<view class="item">
+				<view class="code-decs">鍑哄簱绔欏彿:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="devNo" />
+			</view>
 			<view class="item" style="display: none;">
 				<view class="code-decs">鍙拌溅鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus" />
@@ -484,42 +488,78 @@
 						return;
 					}
 				}
+				
 				uni.request({
-					url: that.baseUrl + '/mobile/comb/auth',
-					data: JSON.stringify({
-						orderNo: that.orderNo,
-						barcode: that.barcode,
-						boxType1: that.boxType1,
-						combMats: that.dataList,
-						type: '1'
-					}),
+					url: `${this.baseUrl}/mobile/agv/collectionPakin/auth`,
 					method: 'POST',
+					data: JSON.stringify({
+						orgBarcode: that.orgBarcode,
+						tarBarcode: that.barcode,
+						devNo: that.devNo,
+						combMats: that.dataList
+					}),
 					header: {
-						'token': uni.getStorageSync('token')
+						token: that.token
 					},
-					success(result) {
-						var res = result.data
+					success: (result) => {
+						const res = result.data
 						if (res.code === 200) {
-							that.resst();
-							that.messageText = "缁勬墭鎴愬姛"
-							that.messageToggle('success')
-							const innerAudioContext = uni.createInnerAudioContext();
-							innerAudioContext.src = '/static/music/pakinOk.mp3';
-							innerAudioContext.play()
-						} else if (res.code == 403) {
-							that.messageText = res.msg
-							that.messageToggle('error')
-							setTimeout(() => {
-								uni.reLaunch({
-									url: '../login/login'
-								});
-							}, 1000);
+							that.clearAll()
+							that.showMessage(res.msg, 'success')
+							// this.showMessage('缁勬墭鎴愬姛')
+							// // 鎾斁鎴愬姛鎻愮ず闊�
+							// const audio = uni.createInnerAudioContext()
+							// audio.src = '/static/music/pakinOk.mp3'
+							// audio.play()
+						} else if (res.code === 403) {
+							that.handleAuthError(res.msg)
 						} else {
-							that.messageText = res.msg
-							that.messageToggle('error')
+							that.showMessage(res.msg, 'error')
 						}
+					},
+					complete: () => {
+						// 璇锋眰瀹屾垚鍚庤В闄ら槻鎶栭攣瀹�
+						setTimeout(() => {
+							that.isCombing = false
+						}, 500)
 					}
 				});
+				// uni.request({
+				// 	url: that.baseUrl + '/mobile/comb/auth',
+				// 	data: JSON.stringify({
+				// 		orderNo: that.orderNo,
+				// 		barcode: that.barcode,
+				// 		boxType1: that.boxType1,
+				// 		combMats: that.dataList,
+				// 		type: '1'
+				// 	}),
+				// 	method: 'POST',
+				// 	header: {
+				// 		'token': uni.getStorageSync('token')
+				// 	},
+				// 	success(result) {
+				// 		var res = result.data
+				// 		if (res.code === 200) {
+				// 			that.resst();
+				// 			that.messageText = "缁勬墭鎴愬姛"
+				// 			that.messageToggle('success')
+				// 			const innerAudioContext = uni.createInnerAudioContext();
+				// 			innerAudioContext.src = '/static/music/pakinOk.mp3';
+				// 			innerAudioContext.play()
+				// 		} else if (res.code == 403) {
+				// 			that.messageText = res.msg
+				// 			that.messageToggle('error')
+				// 			setTimeout(() => {
+				// 				uni.reLaunch({
+				// 					url: '../login/login'
+				// 				});
+				// 			}, 1000);
+				// 		} else {
+				// 			that.messageText = res.msg
+				// 			that.messageToggle('error')
+				// 		}
+				// 	}
+				// });
 			},
 			reset(type) {
 				this.msgType = type

--
Gitblit v1.9.1