From a84ed18ebca6d113fa9c52a36fc71e3a106fd729 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 26 九月 2024 12:49:23 +0800
Subject: [PATCH] #

---
 pages/pakin/pakin.vue |   55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 8635bf2..1abc6d6 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -223,11 +223,14 @@
 				}, 200)
 			},
 			asBarcodeInput() {
+				this.asBarcode = this.asBarcode.replace(/\s+/g, '')
 				setTimeout(() => {
 					var len = this.asBarcode.length
-					if (len != 12) {
+					if (this.checkCode(this.asBarcode)) {
+						// && this.asBarcode.length != 8
+						
 						uni.showToast({
-							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+							title: 'AS400鏈夎璇烽噸璇�',
 							icon: "none",
 							position: 'top'
 						});
@@ -236,6 +239,24 @@
 					}
 					this.focuss()
 				}, 200)
+			},
+			checkCode(code) {
+				// console.log(this.isNum(code.substring(0, 1)))
+				// console.log(!this.isNum(code.substring(1, 2)))
+				// console.log(code.length == 8,code.length)
+				let flag = true
+				if (code.substring(0, 2) == 'PM' ) {
+					flag = false
+				} else if (
+					this.isNum(code.substring(0, 1)) 
+					&& !this.isNum(code.substring(1, 2)) 
+					&& code.length == 8 ) {
+					flag = false
+				}
+				return flag
+			},
+			isNum(value) {
+				return typeof value === 'string' ? /^\d+$/.test(value) : typeof value === 'number' && !isNaN(value);
 			},
 			// 鎵樼洏鐮佹湁璇噸缃�
 			barcodeFocuss() {
@@ -257,11 +278,11 @@
 			},
 			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
 			focuss() {
-				this.focus = false;
+				this.matFocus = false;
 				setTimeout(() => {
 					this.matnr = '';
 					this.matFocus = true;
-				}, 100);
+				}, 200);
 			},
 			codeInput(code) {
 				switch (code) {
@@ -285,9 +306,6 @@
 						break;
 					case "barcode4":
 						this.barcode4Focus = false;
-						setTimeout(() => {
-							this.barcode4Focus = true;
-						}, 100);
 						break;
 				}
 			},
@@ -307,7 +325,6 @@
 						if (result.code === 200 && result.data) {
 							that.matData = result.data
 							that.matnr = ''
-							that.matData['model'] = ''
 							uni.navigateTo({
 								url: "../mat/matSelected",
 								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
@@ -464,7 +481,7 @@
 					return;
 				}
 				if (that.asBarcode === '') {
-					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+					this.messageText = "璇锋壂鎻廇S400鏉$爜"
 					this.messageToggle('error')
 					return;
 				}
@@ -484,7 +501,12 @@
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
 						barcode: that.barcode,
-						combMats: that.dataList
+						asBarcode: that.asBarcode,
+						combMats: that.dataList,
+						code1: that.barcode1,
+						code2: that.barcode2,
+						code3: that.barcode3,
+						code4: that.barcode4
 					}),
 					method: 'POST',
 					header: {
@@ -523,7 +545,13 @@
 			// 纭閲嶇疆
 			resetConfirm() {
 				this.dataList = []
+				this.asBarcode = ''
+				this.barcode1 = ''
+				this.barcode2 = ''
+				this.barcode3 = ''
+				this.barcode4 = ''
 				this.messageText = "閲嶇疆瀹屾垚"
+				this.barcodeFocuss()
 				this.messageToggle('success')
 			},
 			// 鍙栨秷閲嶇疆
@@ -534,6 +562,11 @@
 			resst() {
 				this.dataList = []
 				this.barcode = ''
+				this.asBarcode = ''
+				this.barcode1 = ''
+				this.barcode2 = ''
+				this.barcode3 = ''
+				this.barcode4 = ''
 				this.barcodeFocuss()
 			},
 		}
@@ -575,7 +608,7 @@
 	}
 
 	.code-decs {
-		width: 20vw;
+		/* width: 20vw; */
 		font-size: 14px;
 		color: #303133;
 	}

--
Gitblit v1.9.1