From e53663247b2d2395a6bbaa485e3b4e5c85f0fb92 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期三, 04 二月 2026 19:18:47 +0800
Subject: [PATCH] 1

---
 项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue |   83 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 77 insertions(+), 6 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 0fc42d7..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"
@@ -175,7 +175,7 @@
 import http from '@/api/http.js';
 import VolBox from '@/components/basic/VolBox.vue';
 
-// 闃叉姈鍑芥暟淇濇寔涓嶅彉
+// 闃叉姈鍑芥暟
 function debounce(func, wait) {
   let timeout;
   return function () {
@@ -251,7 +251,11 @@
             trigger: 'change'
           }
         ]
-      }
+      },
+      
+      // 鏂板锛氶敭鐩樹簨浠剁洃鍚爣璁�
+      keyPressListenerAdded: false,
+      isDialogClosing: false
     }
   },
 
@@ -272,6 +276,26 @@
   },
   
   watch: {
+    // 鐩戝惉show鍙橀噺鍙樺寲
+    show(newVal) {
+      if (newVal === true) {
+        console.log('寮规鎵撳紑锛岄噸缃暟鎹�');
+        this.isDialogClosing = false;
+        this.resetData();
+        this.$nextTick(() => {
+          setTimeout(() => {
+            this.fetchUnpalletMaterialDetails();
+            this.addKeyPressListener(); // 娣诲姞閿洏浜嬩欢鐩戝惉
+          }, 300);
+        });
+      } else if (newVal === false && !this.isDialogClosing) {
+        console.log('寮规鍏抽棴锛岀Щ闄や簨浠剁洃鍚�');
+        this.isDialogClosing = true;
+        this.removeKeyPressListener(); // 绉婚櫎閿洏浜嬩欢鐩戝惉
+        this.resetData();
+      }
+    },
+    
     visible(newVal, oldVal) {
       this.palletVisible = newVal;
 
@@ -306,15 +330,34 @@
   },
   
   mounted() {
-    document.addEventListener('keypress', this.handleKeyPress);
+    // 涓嶅湪mounted鏃舵坊鍔犵洃鍚紝鍦ㄥ脊绐楁墦寮�鏃舵坊鍔�
   },
   
   beforeDestroy() {
-    document.removeEventListener('keypress', this.handleKeyPress);
+    // 纭繚缁勪欢閿�姣佹椂绉婚櫎鐩戝惉
+    this.removeKeyPressListener();
     this.clearAllTimers();
   },
   
   methods: {
+    // 娣诲姞閿洏浜嬩欢鐩戝惉
+    addKeyPressListener() {
+      if (!this.keyPressListenerAdded) {
+        document.addEventListener('keypress', this.handleKeyPress);
+        this.keyPressListenerAdded = true;
+        console.log('閿洏浜嬩欢鐩戝惉宸叉坊鍔�');
+      }
+    },
+    
+    // 绉婚櫎閿洏浜嬩欢鐩戝惉
+    removeKeyPressListener() {
+      if (this.keyPressListenerAdded) {
+        document.removeEventListener('keypress', this.handleKeyPress);
+        this.keyPressListenerAdded = false;
+        console.log('閿洏浜嬩欢鐩戝惉宸茬Щ闄�');
+      }
+    },
+    
     open() {
       this.show = true;
       this.orderNo = "";
@@ -322,6 +365,13 @@
       this.initLocationTypes();
       this.initwarehouseTypes();
       this.fetchUnpalletMaterialDetails();
+      
+      // 寮圭獥鎵撳紑鏃舵坊鍔犻敭鐩樹簨浠剁洃鍚�
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.addKeyPressListener();
+        }, 100);
+      });
     },
     
     validateLocationType(rule, value, callback) {
@@ -483,6 +533,9 @@
     },
     
     resetData() {
+      // 鍏堢Щ闄ら敭鐩樹簨浠剁洃鍚�
+      this.removeKeyPressListener();
+      
       this.palletGroupedBarcodes = {};
       this.isSubmitting = false;
       this.trayBarcode = '';
@@ -509,6 +562,8 @@
       };
       this.warehouseTypes = [];
       this.locationTypes = [];
+      this.isDialogClosing = false;
+      this.keyPressListenerAdded = false;
       
       this.$nextTick(() => {
         if (this.$refs.locationForm) {
@@ -529,6 +584,8 @@
     },
     
     handleDialogClose() {
+      // 鍏堢Щ闄ら敭鐩樹簨浠剁洃鍚�
+      this.removeKeyPressListener();
       this.show = false;
       this.resetData();
     },
@@ -568,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);
       }
@@ -581,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);
       }
@@ -609,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 = '璇疯緭鍏ユ垨鎵弿鎵樼洏鏉$爜';
@@ -759,7 +825,7 @@
         });
     },
 
-    // API璇锋眰
+    // API璇锋眰 - 娉ㄦ剰杩欓噷淇敼浜咥PI鍦板潃涓�/AllGroupPallet
     fetchMaterialData(barcode) {
       return http.post('/api/Inbound/AllGroupPallet', {
         palletCode: this.trayBarcode,
@@ -797,6 +863,11 @@
 
     // 澶勭悊鎵爜鏋緭鍏�
     handleKeyPress(event) {
+      // 妫�鏌ュ脊绐楁槸鍚︽樉绀�
+      if (!this.show || this.isDialogClosing) {
+        return;
+      }
+      
       if (this.isManualInput || this.isSubmitting) {
         return;
       }

--
Gitblit v1.9.3