From ca3e4977395bc02c5d147dffdff7381333fdfbca Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 09 四月 2026 14:39:37 +0800
Subject: [PATCH] 空箱跨区域移库
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/AllcatedPallet.vue | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 108 insertions(+), 8 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..f09a1e1 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"
@@ -19,8 +19,8 @@
<div class="location-section compact">
<el-form :model="form" :rules="rules" ref="locationForm" class="compact-form">
<el-form-item label="浠撳簱鍖哄煙" prop="locationType" class="location-select compact-item">
- <el-select v-model="form.locationType" placeholder="璇峰厛閫夋嫨浠撳簱" clearable filterable
- @change="handleLocationChange" style="width: 100%" :loading="locationLoading" size="medium">
+ <el-select v-model="form.locationType" placeholder="鑷姩鑾峰彇浠撳簱鍖哄煙" clearable filterable
+ @change="handleLocationChange" style="width: 100%" :loading="locationLoading" size="medium" :disabled="true">
<el-option v-for="item in locationTypes" :key="item.locationType" :label="item.locationTypeDesc"
:value="item.locationType" />
</el-select>
@@ -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) {
@@ -396,6 +446,34 @@
})
.finally(() => {
this.warehouseLoading = false;
+ });
+ },
+
+ fetchLocationByWarehouse(warehouseCode) {
+ if (!warehouseCode) {
+ this.form.locationType = null;
+ return;
+ }
+ this.locationLoading = true;
+ http.post(`/api/InboundOrder/GetLocationType?code=${warehouseCode}`)
+ .then(({ data }) => {
+ if (data) {
+ this.form.locationType = data.locationType || data;
+ if (!this.locationTypes.find(item => item.locationType === this.form.locationType)) {
+ this.locationTypes.push({
+ locationType: this.form.locationType,
+ locationTypeDesc: this.form.locationType
+ });
+ }
+ }
+ })
+ .catch((err) => {
+ console.error("鑾峰彇浠撳簱鍖哄煙澶辫触:", err);
+ this.$message.error("鑾峰彇浠撳簱鍖哄煙澶辫触锛岃閲嶈瘯");
+ this.form.locationType = null;
+ })
+ .finally(() => {
+ this.locationLoading = false;
});
},
@@ -483,6 +561,9 @@
},
resetData() {
+ // 鍏堢Щ闄ら敭鐩樹簨浠剁洃鍚�
+ this.removeKeyPressListener();
+
this.palletGroupedBarcodes = {};
this.isSubmitting = false;
this.trayBarcode = '';
@@ -509,6 +590,8 @@
};
this.warehouseTypes = [];
this.locationTypes = [];
+ this.isDialogClosing = false;
+ this.keyPressListenerAdded = false;
this.$nextTick(() => {
if (this.$refs.locationForm) {
@@ -529,6 +612,8 @@
},
handleDialogClose() {
+ // 鍏堢Щ闄ら敭鐩樹簨浠剁洃鍚�
+ this.removeKeyPressListener();
this.show = false;
this.resetData();
},
@@ -568,6 +653,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 +670,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 +701,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 +853,7 @@
});
},
- // API璇锋眰
+ // API璇锋眰 - 娉ㄦ剰杩欓噷淇敼浜咥PI鍦板潃涓�/AllGroupPallet
fetchMaterialData(barcode) {
return http.post('/api/Inbound/AllGroupPallet', {
palletCode: this.trayBarcode,
@@ -797,6 +891,11 @@
// 澶勭悊鎵爜鏋緭鍏�
handleKeyPress(event) {
+ // 妫�鏌ュ脊绐楁槸鍚︽樉绀�
+ if (!this.show || this.isDialogClosing) {
+ return;
+ }
+
if (this.isManualInput || this.isSubmitting) {
return;
}
@@ -866,6 +965,7 @@
this.barcode = '';
this.materials = [];
this.error = '';
+ this.fetchLocationByWarehouse(this.form.warehouseType);
},
// 鍖哄煙鍒囨崲浜嬩欢
--
Gitblit v1.9.3