From da245c6f1995c5668866184d8068794c27622f62 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 24 九月 2025 11:05:20 +0800
Subject: [PATCH] 首检，巡检，入库检的数值判断

---
 pages/QC/LLJ/ScanCode.vue |   87 ++++++++++++++++++++++++++++---------------
 1 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/pages/QC/LLJ/ScanCode.vue b/pages/QC/LLJ/ScanCode.vue
index e869a76..983367d 100644
--- a/pages/QC/LLJ/ScanCode.vue
+++ b/pages/QC/LLJ/ScanCode.vue
@@ -2,14 +2,14 @@
 	<view class="container">
 		<!-- 涓诲唴瀹瑰尯 -->
 		<!-- <view class="scan-container"> -->
-			<text class="main-title">鏉ユ枡鎵爜妫�楠�</text>
-			<text class="subtitle">璇峰鍑嗙墿鏂欐潯鐮侊紝淇濇寔10-15cm璺濈</text>
-			<!-- 鎵弿妗� -->
-			<view class="scan-box" @click="startScan">
-				<view class="scan-line" :style="{top: linePosition + '%'}"></view>
-			</view>
-			<!-- 鎵嬪姩杈撳叆 -->
-			<!-- <button class="manual-input" @click="showManualInput">鎵嬪姩杈撳叆鏉＄爜</button> -->
+		<text class="main-title">鏉ユ枡鎵爜妫�楠�</text>
+		<text class="subtitle">璇峰鍑嗙墿鏂欐潯鐮侊紝淇濇寔10-15cm璺濈</text>
+		<!-- 鎵弿妗� -->
+		<view class="scan-box" @click="startScan">
+			<view class="scan-line" :style="{top: linePosition + '%'}"></view>
+		</view>
+		<!-- 鎵嬪姩杈撳叆 -->
+		<!-- <button class="manual-input" @click="showManualInput">鎵嬪姩杈撳叆鏉＄爜</button> -->
 		<!-- </view> -->
 		<!-- 鎵嬪姩杈撳叆寮圭獥 -->
 		<!-- <uni-popup ref="inputPopup" type="dialog">
@@ -18,7 +18,7 @@
 		</uni-popup> -->
 	</view>
 </template>
-                                                                                                                                           
+
 <script>
 	export default {
 		data() {
@@ -62,36 +62,63 @@
 					data: {
 						Barcode: code
 					}
-				}).then(ress => { 
-					if (ress.data.tbBillList.length > 0) {
+				}).then(ress => {
+					if (ress.status == 0) {
+						if (ress.data.tbBillList.length > 0) {
 
-						if (ress.data.tbBillList[0].fsubmit === 1) {
+							if (ress.data.tbBillList[0].fsubmit === 1) {
 
-							uni.navigateTo({
-								url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
-									.tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
-									.releaseNo +
-									'&current=B'
-							})
+								uni.navigateTo({
+									url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
+										.tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
+										.releaseNo +
+										'&current=B&type=A'
+								})
+							} else {
+								uni.navigateTo({
+									url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
+										.tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
+										.releaseNo +
+										'&current=A&type=A'
+								})
+
+
+								// uni.showModal({
+								// 					title: '寮�濮嬫楠�',
+								// 					content: '寮�濮嬫楠屽皢璁板綍褰撳墠鏃堕棿涓哄紑濮嬫楠屾椂闂达紝纭畾寮�濮嬶紵',
+								// 					success: function(res) {
+								// 					if (res.confirm) {
+								// 						uni.navigateTo({
+								// 							url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
+								// 								.tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
+								// 								.releaseNo +
+								// 								'&current=A'
+								// 						})
+								// 					} else {
+
+								// 					}
+								// 				}
+								// 			})
+							}
+
 						} else {
-
-							uni.navigateTo({
-								url: 'Add?id=' + ress.data.tbBillList[0].id + '&lotNo=' + ress.data
-									.tbBillList[0].lotNo + '&releaseNo=' + ress.data.tbBillList[0]
-									.releaseNo +
-									'&current=A'
+							uni.showModal({
+								title: '鎵爜閿欒',
+								content: '鏈煡璇㈠埌鏉＄爜銆�' + code + '銆戠浉鍏冲崟鎹唴瀹�',
+								showCancel: false
 							})
+							//showScanError('鎻愮ず锛氭湭鏌ヨ鍒版潯鐮併��' + res.result + '銆戠浉鍏冲崟鎹唴瀹�')
+							//this.msg = '鎻愮ず锛氭湭鏌ヨ鍒版潯鐮併��' + res.result + '銆戠浉鍏冲崟鎹唴瀹�'
 						}
-
 					} else {
+						console.log(ress.data.message);
 						uni.showModal({
-							title: '鎵爜閿欒',
-							content: '鏈煡璇㈠埌鏉＄爜銆�' + code + '銆戠浉鍏冲崟鎹唴瀹�',
+							title: '鎻愮ず',
+							content: ress.message,
 							showCancel: false
 						})
-						//showScanError('鎻愮ず锛氭湭鏌ヨ鍒版潯鐮併��' + res.result + '銆戠浉鍏冲崟鎹唴瀹�')
-						//this.msg = '鎻愮ず锛氭湭鏌ヨ鍒版潯鐮併��' + res.result + '銆戠浉鍏冲崟鎹唴瀹�'
 					}
+
 				})
 			},
 
@@ -102,7 +129,7 @@
 
 			// 纭鎵嬪姩杈撳叆
 			confirmManualInput(value) {
-				 
+
 				this.handleScanResult(value)
 			},
 

--
Gitblit v1.9.3