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

---
 pages/phyz/AGV/emptyPakin.vue |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pages/phyz/AGV/emptyPakin.vue b/pages/phyz/AGV/emptyPakin.vue
index a4ec135..d4b4f7a 100644
--- a/pages/phyz/AGV/emptyPakin.vue
+++ b/pages/phyz/AGV/emptyPakin.vue
@@ -2,13 +2,11 @@
 	<view>
 		<view class="code">
 			<view class="item">
-				<view class="code-decs">鏂欑鐮�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
 					@input="barcodeInput()" readonly>
 			</view>
 			<view class="item">
-				<view class="code-decs">鏆傚瓨浣�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="stationCode" :focus="stationCodeFocus"
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆 鏆傚瓨浣�" v-model="stationCode" :focus="stationCodeFocus"
 					@input="stationCodeInput()" readonly>
 				<view class="item-right">
 					<button></button>
@@ -53,7 +51,7 @@
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
 		<view class="buttom">
 			<button size="mini" @click="reset('warn')">閲嶇疆</button>
-			<button size="mini" type="primary" @click="combConfirm('warn','pakout')">鍑哄簱</button>
+			<!-- <button size="mini" type="primary" @click="combConfirm('warn','pakout')">鍑哄簱</button> -->
 			<button size="mini" type="primary" @click="combConfirm('warn','pakin')">鍏ュ簱</button>
 		</view>
 		<!-- 寮圭獥 -->
@@ -152,7 +150,8 @@
 				removeNum: 0,
 				hide: true,
 				hidebg: 'kb-bgtr',
-				kind: ''
+				kind: '',
+				containerType: 0
 			}
 		},
 		onLoad() {
@@ -189,7 +188,7 @@
 			stationCodeInput() {
 				setTimeout(() => {
 					var len = this.stationCode.length
-					if (len != 15) {
+					if (len != 7) {
 						this.stationCode = ''
 						this.stationCodeFocus = true
 						uni.showToast({
@@ -224,13 +223,19 @@
 			},
 			// barcode input 浜嬩欢
 			barcodeInput() {
-				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
-				if (this.barcode.split('_')[1]) {
-					this.barcode = this.barcode.split('_')[1]
-				} 
+				let val = this.barcode.substring(0,2)
+				if (val == '10') {
+					this.containerType = 1
+				} else if(val == '20') {
+					this.containerType = 2
+				} else if (val == '21') {
+					this.containerType = 3
+				} else if (val == '30') {
+					this.containerType = 4
+				}
 				setTimeout(() => {
 					var len = this.barcode.length
-					if (len != 10) {
+					if (len != 6) {
 						uni.showToast({
 							title: '鏂欑鐮佹湁璇閲嶈瘯',
 							icon: "none",
@@ -444,13 +449,13 @@
 					let param = {
 						devNo: this.dataList[0].devNo,
 						containerCode: this.barcode,
-						containerType: this.dataList[0].locType1,
+						containerType: this.containerType,
 						}
 					params.push(param)
 				} else {
 					let param = {
 						devNo: this.dataList[0].devNo,
-						containerType: this.dataList[0].locType1,
+						containerType: this.containerType,
 						}
 					params.push(param)
 				}

--
Gitblit v1.9.1