From 1e40a94e41a811a30b49150b5feabe9b7797948a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 08:23:06 +0800
Subject: [PATCH] #

---
 pages/tzsk/pakin/pakin2.vue |   32 ++++++++++++--------------------
 1 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/pages/tzsk/pakin/pakin2.vue b/pages/tzsk/pakin/pakin2.vue
index fd0b746..d3b2702 100644
--- a/pages/tzsk/pakin/pakin2.vue
+++ b/pages/tzsk/pakin/pakin2.vue
@@ -222,7 +222,8 @@
 			},
 			// 杩囨护
 			checkContainerCode(item) {
-				item.containerCode = item.containerCode.split('_')[1]
+				item.containerCode = item.containerCode.split('_')[1] ? item.containerCode.split('_')[1] : item.containerCode
+				
 				// this.barcode = this.barcode.split('_')[1]
 			},
 			// 鏍规嵁璁㈠崟鍙疯繑鍥炲晢鍝佽鎯�
@@ -243,8 +244,10 @@
 								for (let i = 0; i < res.data[0].combMats.length; i++) {
 									that.checkMat(res.data[0].combMats[i])
 								}
-								// that.tempOrderInfo.csocode = res.data[0].combMats.csocode ? res.data[0].combMats.csocode : ''
-								// that.tempOrderInfo.isoseq = res.data[0].combMats.isoseq ? res.data[0].combMats.isoseq : ''
+								that.orderNoFocus = false
+								setTimeout(() => {
+									that.barcodeFocus = true
+								}, 10);
 							} else {
 								uni.showToast({
 									title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝g‘',
@@ -479,11 +482,11 @@
 			comb() {
 				uni.vibrateShort();
 				let that = this;
-				if (that.barcode === '') {
-					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
-					this.messageToggle('error')
-					return;
-				}
+				// if (that.barcode === '') {
+				// 	this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+				// 	this.messageToggle('error')
+				// 	return;
+				// }
 				if (that.dataList.length === 0) {
 					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
 					this.messageToggle('error')
@@ -563,19 +566,8 @@
 <style>
 	@import url('../../../static/css/wms.css/wms.css');
 
-	.keyboard{
-		width: 40px;height: 40px;background-size: 100%;position: absolute;z-index: 99;
-			top: 5px;right: 5px; border-radius: 50%;
-			display: flex;align-items: center;justify-content: center;
-	}
-	.kb-bgtr {
-		background-color: #55557f;
-	}
-	.kb-bgfa {
-		background-color: #00aeec;
-	}
 	.list:first-child {
-		margin-top: 360rpx;
+		margin-top: 320rpx;
 	}
 	.code {
 		width: 100%;

--
Gitblit v1.9.1