From 7438b52a180abe7e72d5be0302b89025973219e7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 21 七月 2023 09:03:59 +0800
Subject: [PATCH] #

---
 pages/AGV/AGVPakinOn.vue |   30 ++++++++++++++++++++++++++++--
 pages/AGV/AGVPakin.vue   |   19 +++++++++++++++++--
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/pages/AGV/AGVPakin.vue b/pages/AGV/AGVPakin.vue
index 1073456..6f92ee6 100644
--- a/pages/AGV/AGVPakin.vue
+++ b/pages/AGV/AGVPakin.vue
@@ -2,6 +2,11 @@
 	<view>
 		<view class="code">
 			<view class="item">
+				<view class="code-decs">璁㈠崟鍙�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
+					@input="orderNoInput()">
+			</view>
+			<view class="item">
 				<view class="code-decs">鎵樼洏鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
 					@input="barcodeInput()">
@@ -141,6 +146,7 @@
 				baseUrl: '',
 				token: '',
 				barcode: '',
+				orderNo: '',
 				dataList: [],
 				count: 0,
 				rowNum: '',
@@ -154,6 +160,7 @@
 				content: '',
 				barcodeFocus: true,
 				matFocus: false,
+				orderNoFocus: false,
 				matData: '',
 				removeNum: 0,
 			}
@@ -171,6 +178,13 @@
 				this.$refs.message.open()
 			},
 			// barcode input 浜嬩欢
+			orderNoInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.orderNo.length
+					this.barcodeFocuss()
+				}, 200)
+			},
 			barcodeInput() {
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
@@ -398,6 +412,7 @@
 				uni.request({
 					url: that.baseUrl + '/agvMobile/comb/auth',
 					data: JSON.stringify({
+						orderNo: that.orderNo,
 						barcode: that.barcode,
 						combMats: that.dataList
 					}),
@@ -460,7 +475,7 @@
 	@import url('../../static/css/wms.css/wms.css');
 
 	.list:first-child {
-		margin-top: 360rpx;
+		margin-top: 460rpx;
 	}
 	.code {
 		width: 100%;
@@ -505,7 +520,7 @@
 		width: 100%;
 		background-color: white;
 		position: fixed;
-		margin-top: 200rpx;
+		margin-top: 300rpx;
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;
diff --git a/pages/AGV/AGVPakinOn.vue b/pages/AGV/AGVPakinOn.vue
index 883599e..33c2652 100644
--- a/pages/AGV/AGVPakinOn.vue
+++ b/pages/AGV/AGVPakinOn.vue
@@ -2,6 +2,11 @@
 	<view>
 		<view class="code">
 			<view class="item">
+				<view class="code-decs">璁㈠崟鍙�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
+					@input="orderNoInput()">
+			</view>
+			<view class="item">
 				<view class="code-decs">鎵樼洏鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
 					@input="barcodeInput()">
@@ -144,6 +149,7 @@
 				baseUrl: '',
 				token: '',
 				barcode: '',
+				orderNo: '',
 				stationCode: '',
 				dataList: [],
 				count: 0,
@@ -159,6 +165,7 @@
 				barcodeFocus: true,
 				stationCodeFocus: false,
 				matFocus: false,
+				orderNoFocus: false,
 				matData: '',
 				removeNum: 0,
 				devNo: [],
@@ -194,6 +201,13 @@
 				}, 200)
 			},
 			// 绗﹀悎鏉′欢鐨勮烦杞埌涓嬩竴鏍忕洰
+			orderNoInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.orderNo.length
+					this.barcodeFocuss()
+				}, 200)
+			},
 			barcodeInput() {
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
@@ -210,6 +224,15 @@
 					}
 					this.stationCodeFocuss()
 				}, 200)
+			},
+			// 鎵樼洏鐮佹湁璇噸缃�
+			barcodeFocuss() {
+				let that = this;
+				that.barcodeFocus = false;
+				setTimeout(() => {
+					that.barcode = '';
+					that.barcodeFocus = true;
+				}, 100);
 			},
 			// 鏆傚瓨浣嶆湁璇噸缃�
 			stationCodeFocuss() {
@@ -423,6 +446,7 @@
 				uni.request({
 					url: that.baseUrl + '/agvMobile/comb/auth',
 					data: JSON.stringify({
+						orderNo: that.orderNo,
 						barcode: that.barcode,
 						locno: that.stationCode,
 						combMats: that.dataList
@@ -549,7 +573,9 @@
 
 <style>
 	@import url('../../static/css/wms.css/wms.css');
-
+	.list:first-child {
+		margin-top: 540rpx;
+	}
 	.code {
 		width: 100%;
 		position: fixed;
@@ -593,7 +619,7 @@
 		width: 100%;
 		background-color: white;
 		position: fixed;
-		margin-top: 300rpx;
+		margin-top: 400rpx;
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;

--
Gitblit v1.9.1