From 1332f04d2f15765e5d64c8778b5cb4a824e0d12f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 20 七月 2022 09:24:10 +0800
Subject: [PATCH] #

---
 pages/basics/outPakin.vue |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/pages/basics/outPakin.vue b/pages/basics/outPakin.vue
index 918f388..80d97bf 100644
--- a/pages/basics/outPakin.vue
+++ b/pages/basics/outPakin.vue
@@ -111,7 +111,8 @@
 				messageText: '杩欐槸涓�鏉℃垚鍔熸彁绀�',
 				origins: [{value:'1288'},{value:'5055'}],
 				origin: null, // 浠撳簱
-				current: 0
+				current: 0,
+				isNum:false
 			}
 		},
 		mounted(){
@@ -124,7 +125,7 @@
 		onLoad() {
 			// #ifdef APP
 			setInterval(()=>{
-				// uni.hideKeyboard()
+				uni.hideKeyboard()
 			},20)
 			// #endif
 		},
@@ -262,11 +263,19 @@
 			checkNum(theObj) {
 				var reg = /^[0-9]*$/;
 				if (!reg.test(theObj)) {
-					this.messageToggle('warn');
-					this.messageText = '鍟嗗搧缂栫爜鏈夎锛岃閲嶈瘯';
-					this.foucss();
-					return;
+					this.isNum = false;
+					return ;
 				}
+				var year = theObj.substring(0,2)
+				//鑾峰彇褰撳墠骞翠唤
+				var dt = new Date();
+				var thisYear = new Date().getFullYear() + ''
+				thisYear = thisYear.substring(2,4)
+				if(year > thisYear) {
+					this.isNum = false;
+					return ;
+				}
+				this.isNum = true;
 			},
 			// 娣诲姞鎵弿鏃ュ織
 			addLog(matCode,userName) {
@@ -293,8 +302,8 @@
 				let matCode = that.matnrId
 				// 寮�鍚壂鎻忔棩蹇�
 				that.addLog(matCode,userName)
-				that.foucss();
-				return;
+				// that.foucss();
+				// return;
 				if (that.matnrId.length > 25){
 					that.messageToggle('warn');
 					that.messageText = '鍟嗗搧缂栫爜瓒呴暱锛岃閲嶈瘯';
@@ -305,6 +314,12 @@
 				let matnr = str[0] + '-' + str[1]
 				// 妫�鏌ユ潯鐮佷腑闈炴暟瀛�
 				that.checkNum(str[2])
+				if (that.isNum == false) {
+					that.messageToggle('warn');
+					that.messageText = '鍟嗗搧缂栫爜鏈夎锛岃閲嶈瘯锛�';
+					that.foucss();
+					return;
+				}
 				for (let k = 0; k < that.matList.length;k++) {
 					if (that.matList[k].matnr != matnr) {
 						that.messageToggle('warn');
@@ -313,7 +328,6 @@
 						return;
 					}
 				}
-				
 				
 				// return;
 				// uni.showLoading();

--
Gitblit v1.9.1