From bc8846977cb68b9c28e92b050338ebdfd7f521bf Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期二, 03 二月 2026 17:22:48 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue | 12 +++++++++++-
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue | 11 ++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue"
index fe15c2e..92ca4a5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue"
@@ -625,6 +625,10 @@
this.isManualInput = true;
this.isScanning = false;
+ if (this.trayBarcode) {
+ this.trayBarcode = this.trayBarcode.replace(/\s+/g, "");
+ }
+
if (this.manualInputTimer) {
clearTimeout(this.manualInputTimer);
}
@@ -638,6 +642,9 @@
this.isManualInput = true;
this.isScanning = false;
+ if (this.barcode) {
+ this.barcode = this.barcode.replace(/\s+/g, "");
+ }
if (this.manualInputTimer) {
clearTimeout(this.manualInputTimer);
}
@@ -666,7 +673,9 @@
.then(valid => {
if (!valid) return;
- const currentTrayBarcode = this.trayBarcode.trim();
+ let currentTrayBarcode = (this.trayBarcode || "").replace(/\s+/g, "").trim();
+
+ this.trayBarcode = currentTrayBarcode;
if (!currentTrayBarcode) {
this.error = '璇疯緭鍏ユ垨鎵弿鎵樼洏鏉＄爜';
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue"
index 81601b6..14da45b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue"
@@ -923,6 +923,10 @@
this.isManualInput = true;
this.isScanning = false;
+ if (this.trayBarcode) {
+ this.trayBarcode = this.trayBarcode.replace(/\s+/g, "");
+ }
+
if (this.manualInputTimer) {
clearTimeout(this.manualInputTimer);
}
@@ -936,6 +940,10 @@
this.isManualInput = true;
this.isScanning = false;
+ if (this.barcode) {
+ this.barcode = this.barcode.replace(/\s+/g, "");
+ }
+
if (this.manualInputTimer) {
clearTimeout(this.manualInputTimer);
}
@@ -963,7 +971,9 @@
this.validateForm().then((valid) => {
if (!valid) return;
- const currentTrayBarcode = this.trayBarcode.trim();
+ let currentTrayBarcode = (this.trayBarcode || "").replace(/\s+/g, "").trim();
+
+ this.trayBarcode = currentTrayBarcode;
if (!currentTrayBarcode) {
this.error = "璇疯緭鍏ユ垨鎵弿鎵樼洏鏉＄爜";
--
Gitblit v1.9.3