From 7a7b559723e20de635d3888ea58eb151993c2ca2 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 16 十二月 2025 17:39:56 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue | 465 ++++++++++++++--------------------------------------------
1 files changed, 112 insertions(+), 353 deletions(-)
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 61170fd..39cbe94 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"
@@ -1,12 +1,11 @@
<template>
- <vol-box v-model="groupPalletVisible" :title="'缁勭洏鎿嶄綔 - 鍗曟嵁鍙凤細' + currentDocNo" :height="1000" :width="1100" :padding="20"
- :modal="true" @open="handleDialogOpen" @close="handleDialogClose">
+ <vol-box v-model="show" :title="'缁勭洏鎿嶄綔 - 鍗曟嵁鍙凤細' + orderNo" :height="1000" :width="1100" :padding="20" :modal="true">
<div class="barcode-scanner-container">
<!-- 浠撳簱閫夋嫨 - 绱у噾甯冨眬 -->
<div class="location-section compact">
<el-form :model="form" :rules="rules" ref="locationForm" class="compact-form">
- <el-form-item label="浠撳簱" prop="warehouseType" class="location-select compact-item">
+ <el-form-item label="鍏ュ簱浠撳簱" prop="warehouseType" class="location-select compact-item">
<el-select v-model="form.warehouseType" placeholder="璇烽�夋嫨浠撳簱" clearable filterable
@change="handleWarehouseChange" style="width: 100%" :loading="warehouseLoading" size="medium">
<el-option v-for="item in warehouseTypes" :key="item.warehouseType" :label="item.warehouseTypeDesc"
@@ -53,7 +52,7 @@
<!-- 鎵樼洏鏉＄爜杈撳叆 -->
<div class="input-wrapper custom-input-group compact-input">
- <div class="input-label">鏂欑鐮�</div>
+ <div class="input-label">鎵樼洏鏉＄爜</div>
<el-input ref="trayInput" v-model="trayBarcode" placeholder="璇锋壂鎻忔垨杈撳叆鏂欑鐮佸悗鎸夊洖杞﹂敭" clearable
:disabled="!form.locationType || !form.warehouseType" @keyup.enter.native="handleTraySubmit"
@clear="handleTrayClear" @input="handleTrayInput" class="custom-input" size="medium">
@@ -113,9 +112,10 @@
</span>
</div>
-
- <div class="table-container">
- <el-table :data="unpalletMaterials" stripe style="width: 100%" height="100%" size="small" v-loading="unpalletBarcodesLoading">
+
+ <div class="table-container">
+ <el-table :data="unpalletMaterials" stripe style="width: 100%" height="100%" size="small"
+ v-loading="unpalletBarcodesLoading">
<el-table-column type="index" label="搴忓彿" width="60" align="center"></el-table-column>
<el-table-column prop="barcode" label="鏉＄爜" min-width="140" show-overflow-tooltip></el-table-column>
<el-table-column prop="materielCode" label="鐗╂枡缂栫爜" min-width="150" show-overflow-tooltip></el-table-column>
@@ -126,7 +126,7 @@
</el-table>
</div>
</el-card>
-
+
</div>
<!-- 鐗╂枡鍒楄〃 - 鍥哄畾楂樺害甯︽粴鍔ㄦ潯 -->
@@ -166,35 +166,23 @@
</el-card>
</div>
</div>
-
- <!-- <div slot="footer" class="dialog-footer">
- <el-button @click="handleCancel">鍙栨秷</el-button>
- <el-button type="primary" @click="handleConfirm">纭</el-button>
- </div> -->
+ <template #footer>
+ <el-button type="danger" size="small" @click="handleDialogClose()">鍏抽棴</el-button>
+ </template>
</vol-box>
</template>
<script>
import http from '@/api/http.js';
import VolBox from '@/components/basic/VolBox.vue';
-import VolForm from '@/components/basic/VolForm.vue';
-import VolTable from '@/components/basic/VolTable.vue';
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus';
-import { ref, onMounted, onUnmounted } from 'vue'
-import InboundOrder from '../../../views/inbound/inboundOrder.vue';
-import { th } from 'element-plus/es/locales.mjs';
export default {
- name: 'BarcodeScanner',
- components: { VolBox, VolForm, VolTable },
- props: {
- docNo: { type: String, required: true, default: '' },
- visible: { type: Boolean, required: true, default: false }
- },
-
+ components: { VolBox },
data() {
return {
+ show: false,
+ orderNo: "",
palletVisible: this.visible,
- trayBarcodeReg:/^[A-Z]\d{9}$/,
+ trayBarcodeReg: /^[A-Z]\d{9}$/,
trayBarcode: '',
barcode: '',
materials: [],
@@ -203,7 +191,7 @@
debugMode: false,
currentFocus: 'warehouse',
- unpalletBarcodes:[],
+ unpalletBarcodes: [],
unpalletBarcodesLoading: false,
unpalletMaterials: [], // 鏈粍鐩樿缁嗘暟鎹垪琛�
@@ -239,12 +227,12 @@
trigger: 'change'
}
],
- trayBarcode:[
+ trayBarcode: [
{
pattern: this.trayBarcodeReg,
message: '鎵樼洏鍙锋牸寮忛敊璇紙闇�涓�1涓ぇ鍐欏瓧姣�+9涓暟瀛楋紝濡侫000008024锛�',
trigger: 'blur'
- }
+ }
],
warehouseType: [
{
@@ -255,12 +243,8 @@
}
}
},
+
computed: {
- groupPalletVisible: {
- get() { return this.visible; },
- set(newVal) { this.$emit('update:visible', newVal); }
- },
- currentDocNo() { return this.docNo; },
// 褰撳墠閫夋嫨鐨勪粨搴撳悕绉�
currentWarehouseName() {
const warehouse = this.warehouseTypes.find(item => item.warehouseType === this.form.warehouseType);
@@ -282,9 +266,6 @@
this.resetData();
this.$nextTick(() => {
setTimeout(() => {
- // this.focusTrayInput();
- this.initwarehouseTypes(); // 鍒濆鍖栦粨搴�
- this.initLocationTypes(); // 鍒濆鍖栦粨搴撳尯鍩�
this.fetchStockStatistics(); // 鍔犺浇缁熻鏁版嵁
this.fetchUnpalletMaterialDetails();
}, 300);
@@ -310,37 +291,27 @@
}
}
},
- 'form.warehouseType'(newVal) {
- if (newVal) {
- this.form.locationType = null;
- } else {
- this.locationTypes = [];
- }
- },
-
mounted() {
- // 娣诲姞鍏ㄥ眬閿洏鐩戝惉
document.addEventListener('keypress', this.handleKeyPress);
- // 浣跨敤setTimeout纭繚DOM瀹屽叏娓叉煋鍚庡啀鑱氱劍
setTimeout(() => {
- // this.focusTrayInput();
this.focusLocationSelect();
}, 300);
},
beforeDestroy() {
- // 娓呯悊浜嬩欢鐩戝惉
document.removeEventListener('keypress', this.handleKeyPress);
this.clearAllTimers();
},
methods: {
- /**
-* 鑷畾涔変粨搴撳尯鍩熼獙璇�
-* 鍏佽鍊间负0锛屽洜涓�0鏄悎娉曠殑locationType
-*/
+ open() {
+ this.show = true;
+ this.initLocationTypes();
+ this.initwarehouseTypes();
+ this.fetchStockStatistics();
+ this.fetchUnpalletMaterialDetails();
+ },
validateLocationType(rule, value, callback) {
- // 妫�鏌ュ�兼槸鍚︿负null銆乽ndefined鎴栫┖瀛楃涓诧紝浣嗗厑璁告暟瀛�0
if (!this.form.warehouseType) {
callback(new Error('璇峰厛閫夋嫨浠撳簱'));
} else if (value === null || value === undefined || value === '') {
@@ -349,32 +320,19 @@
callback();
}
},
-
+
// 鏍规嵁鏉＄爜鍒楄〃鑾峰彇璇︾粏鏁版嵁
async fetchUnpalletMaterialDetails() {
try {
- // 灏濊瘯璋冪敤鎺ュ彛鑾峰彇璇︾粏鏁版嵁
- // 娉ㄦ剰锛氬鏋滆繖涓帴鍙ｄ笉瀛樺湪锛屽彲浠ユ敞閲婃帀鎴栨牴鎹疄闄匒PI璋冩暣
- const response = await http.post('/api/InboundOrder/UnPalletGroupBarcode?orderNo='+this.docNo, {
-
- });
-
- console.log('鏈粍鐩樻暟鎹�:', response.data);
-
-
+ const response = await http.post('/api/InboundOrder/UnPalletGroupBarcode?orderNo=' + this.docNo, {});
if (response.status && Array.isArray(response.data)) {
this.unpalletMaterials = response.data;
this.unpalletBarcodes = response.data.map(item => item.barcode || '');
this.totalStockCount = response.data.length;
} else {
- // 濡傛灉鎺ュ彛杩斿洖鏍煎紡涓嶅悓锛屽皾璇曞叾浠栨柟寮�
- // 濡傛灉鎺ュ彛涓嶅瓨鍦紝杩欓噷浼氳繘鍏atch锛岃缃负绌烘暟缁�
this.unpalletMaterials = [];
}
} catch (err) {
- console.warn('鑾峰彇鏈粍鐩樿缁嗘暟鎹帴鍙ｅ彲鑳戒笉瀛樺湪锛屼娇鐢ㄦ潯鐮佸垪琛ㄦ樉绀猴細', err);
- // 濡傛灉鎺ュ彛涓嶅瓨鍦紝灏嗘潯鐮佸垪琛ㄨ浆鎹负绠�鍗曠殑鏄剧ず鏍煎紡
- // 鎴栬�呬繚鎸佷负绌猴紝璁╃敤鎴风煡閬撻渶瑕侀�夋嫨浠撳簱鍜屽尯鍩熸潵鏌ョ湅璇︾粏鏁版嵁
this.unpalletMaterials = this.unpalletBarcodes.map(barcode => ({
barcode: barcode,
materielCode: '-',
@@ -386,121 +344,21 @@
}));
}
},
- /**
- * 鍒濆鍖栦粨搴撳尯鍩熸暟鎹�
- */
async initLocationTypes() {
- this.locationLoading = true;
- this.error = '';
-
try {
- const response = await http.post('/api/LocationInfo/GetLocationTypes');
-
- if (response.status && Array.isArray(response.data)) {
- this.locationTypes = response.data;
- if (this.locationTypes.length === 0) {
- this.error = '鏈幏鍙栧埌浠撳簱鍖哄煙鏁版嵁';
- } else {
- // 濡傛灉鏈夐粯璁ゅ尯鍩燂紝鍙互鍦ㄨ繖閲岃缃�
- // this.form.locationType = this.locationTypes[0].locationType;
- }
- } else {
- this.error = '鑾峰彇浠撳簱鍖哄煙鏁版嵁澶辫触';
- }
- } catch (error) {
- console.error('鑾峰彇浠撳簱鍖哄煙澶辫触:', error);
- this.error = `鑾峰彇浠撳簱鍖哄煙澶辫触: ${error.message || '缃戠粶閿欒'}`;
- } finally {
- this.locationLoading = false;
+ const { data } = await this.http.post("api/LocationInfo/GetLocationTypes")
+ this.locationTypes = data
+ } catch (e) {
+ this.$message.error('鑾峰彇鍖哄煙绫诲瀷澶辫触')
}
},
-
- /**
- * 鍒濆鍖栦粨搴撴暟鎹�
- */
async initwarehouseTypes() {
- this.warehouseLoading = true;
- this.error = '';
-
try {
- const response = await http.post('/api/Warehouse/GetwarehouseTypes');
-
- if (response.status && Array.isArray(response.data)) {
- this.warehouseTypes = response.data;
- if (this.warehouseTypes.length === 0) {
- this.error = '鏈幏鍙栧埌浠撳簱鏁版嵁';
- } else {
- // 濡傛灉鏈夐粯璁ゅ尯鍩燂紝鍙互鍦ㄨ繖閲岃缃�
- // this.form.locationType = this.locationTypes[0].locationType;
- }
- } else {
- this.error = '鑾峰彇浠撳簱鏁版嵁澶辫触';
- }
- } catch (error) {
- console.error('鑾峰彇浠撳簱澶辫触:', error);
- this.error = `鑾峰彇浠撳簱澶辫触: ${error.message || '缃戠粶閿欒'}`;
- } finally {
- this.warehouseLoading = false;
+ const { data } = await this.http.post("api/Warehouse/GetwarehouseTypes")
+ this.warehouseTypes = data
+ } catch (e) {
+ this.$message.error('鑾峰彇鍖哄煙绫诲瀷澶辫触')
}
- },
-
-
- /**
- * 浠撳簱鍖哄煙鍙樻洿澶勭悊
- */
- handleLocationChange(value) {
- console.log('閫夋嫨浠撳簱鍖哄煙:', value, '绫诲瀷:', typeof value, this.currentLocationDesc);
-
- // 绔嬪嵆娓呴櫎閿欒淇℃伅
- this.error = '';
-
- // 鎵嬪姩瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
- this.$nextTick(() => {
- if (this.$refs.locationForm) {
- // 娓呴櫎璇ュ瓧娈电殑楠岃瘉鐘舵�侊紝鐒跺悗閲嶆柊楠岃瘉
- this.$refs.locationForm.clearValidate('locationType');
-
- // 鐭殏寤惰繜鍚庨噸鏂伴獙璇侊紝纭繚DOM宸叉洿鏂�
- setTimeout(() => {
- this.$refs.locationForm.validateField('locationType', (errorMsg) => {
- if (!errorMsg && (value === 0 || value)) {
- console.log('浠撳簱鍖哄煙楠岃瘉閫氳繃:', value);
- // 鍖哄煙閫夋嫨鍚庯紝鑷姩鑱氱劍鍒版墭鐩樿緭鍏ユ
- this.focusLocationSelect();
- // 鍒锋柊鏈粍鐩樻暟鎹紙鏍规嵁閫夋嫨鐨勪粨搴撳拰鍖哄煙杩囨护锛�
- }
- });
- }, 100);
- }
- });
- },
-
- /**
- * 浠撳簱鍙樻洿澶勭悊
- */
- handleWarehouseChange(value) {
- console.log('閫夋嫨浠撳簱:', value, '绫诲瀷:', typeof value, this.currentWarehouseName);
-
- // 绔嬪嵆娓呴櫎閿欒淇℃伅
- this.error = '';
-
- // 鎵嬪姩瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
- this.$nextTick(() => {
- if (this.$refs.locationForm) {
- // 娓呴櫎璇ュ瓧娈电殑楠岃瘉鐘舵�侊紝鐒跺悗閲嶆柊楠岃瘉
- this.$refs.locationForm.clearValidate('warehouseType');
-
- // 鐭殏寤惰繜鍚庨噸鏂伴獙璇侊紝纭繚DOM宸叉洿鏂�
- setTimeout(() => {
- this.$refs.locationForm.validateField('warehouseType', (errorMsg) => {
- if (!errorMsg && (value === 0 || value)) {
- console.log('浠撳簱楠岃瘉閫氳繃:', value);
- this.focusLocationSelect();
- }
- });
- }, 100);
- }
- });
},
async fetchStockStatistics() {
@@ -513,29 +371,21 @@
this.sumLoading = true;
this.sumError = '';
try {
- // 璋冪敤鍚庣缁熻鎺ュ彛锛堟浛鎹负浣犵殑瀹為檯鎺ュ彛璺緞锛�
- const response = await http.post('/api/InboundOrder/UnPalletQuantity?orderNo=' + this.docNo, {
-
- });
-
- // 缁戝畾鏁版嵁锛堝尮閰� PalletSumQuantityDTO 缁撴瀯锛�
+ const response = await http.post('/api/InboundOrder/UnPalletQuantity?orderNo=' + this.docNo, {});
if (response.data) {
- this.totalStockSum = response.data.stockSumQuantity || 0; // 鎬诲簱瀛樻暟閲�
- this.totalStockCount = response.data.stockCount || 0; // 鎬诲簱瀛樿褰曟暟
- this.uniqueUnit = response.data.uniqueUnit || ''; // 璁￠噺鍗曚綅
+ this.totalStockSum = response.data.stockSumQuantity || 0;
+ this.totalStockCount = response.data.stockCount || 0;
+ this.uniqueUnit = response.data.uniqueUnit || '';
}
} catch (err) {
this.sumError = '缁熻鍔犺浇澶辫触';
this.totalStockSum = 0;
this.totalStockCount = 0;
- console.error('搴撳瓨缁熻鏌ヨ寮傚父锛�', err);
} finally {
this.sumLoading = false;
}
},
- /**
- * 琛ㄥ崟楠岃瘉
- */
+
async validateForm() {
return new Promise((resolve) => {
if (!this.$refs.locationForm) {
@@ -550,40 +400,18 @@
this.error = '';
resolve(true);
} else {
- // 鎵嬪姩妫�鏌ocationType锛屾纭鐞嗗�间负0鐨勬儏鍐�
if (!this.from.warehouseType) {
this.error = '璇峰厛閫夋嫨浠撳簱';
}
else if (this.form.locationType === null || this.form.locationType === undefined || this.form.locationType === '') {
this.error = '璇峰厛閫夋嫨浠撳簱鍖哄煙';
- //this.$message.warning('璇峰厛閫夋嫨浠撳簱鍖哄煙');
} else {
- // 濡傛灉鍊煎瓨鍦紙鍖呮嫭0锛夛紝浣嗛獙璇佷笉閫氳繃锛屽彲鑳芥槸鍏朵粬楠岃瘉閿欒
this.error = '璇锋鏌ヨ〃鍗曞～鍐欐槸鍚︽纭�';
}
resolve(false);
}
});
});
- },
- focusWarehouseSelect() {
- if (this.$refs.locationForm) {
- const selectEl = this.$el.querySelector('.location-select:first-child .el-input__inner');
- if (selectEl) {
- selectEl.focus();
- this.currentFocus = 'warehouse';
- }
- }
- },
- // 鑱氱劍鍒颁粨搴撳尯鍩熼�夋嫨
- focusLocationSelect() {
- if (this.$refs.locationForm) {
- const selectEl = this.$el.querySelector('.location-select:nth-child(2) .el-input__inner');
- if (selectEl) {
- selectEl.focus();
- this.currentFocus = 'location';
- }
- }
},
// 鑱氱劍鍒版墭鐩樿緭鍏ユ
focusTrayInput() {
@@ -606,18 +434,10 @@
inputEl.focus();
this.currentFocus = 'material';
this.scanTarget = 'material';
-
-
- inputEl.select();
- console.log('鐗╂枡杈撳叆妗嗗唴瀹瑰凡閫変腑');
-
+ inputEl.select();
}
}
},
-
-
-
-
// 閲嶇疆鎵�鏈夋暟鎹�
resetData() {
console.log('閲嶇疆寮规鏁版嵁');
@@ -664,38 +484,9 @@
this.scanTimer = null;
}
},
-
- // 寮规鎵撳紑鏃堕噸缃暟鎹�
- handleDialogOpen() {
- console.log('寮规鎵撳紑锛岄噸缃暟鎹�');
- this.resetData();
- // 浣跨敤setTimeout纭繚DOM瀹屽叏娓叉煋鍚庡啀鑱氱劍
- this.$nextTick(() => {
- setTimeout(() => {
- this.initwarehouseTypes();
- this.initLocationTypes(); // 鍒濆鍖栦粨搴撳尯鍩�
- // 纭繚琛ㄥ崟寮曠敤瀛樺湪鍚庡啀鑱氱劍
- if (this.$refs.locationForm) {
- this.focusWarehouseSelect();
- } else {
- // 濡傛灉琛ㄥ崟寮曠敤杩樹笉瀛樺湪锛岀◢鍚庨噸璇�
- setTimeout(() => {
- this.focusWarehouseSelect();
- }, 500);
- }
- }, 300);
- });
- },
-
- // 寮规鍏抽棴鏃堕噸缃暟鎹�
handleDialogClose() {
- console.log('寮规鍏抽棴锛岄噸缃暟鎹�');
+ this.show = false;
this.resetData();
- },
-
- // 鍙栨秷鎸夐挳
- handleCancel() {
- this.palletVisible = false;
},
// 纭鎸夐挳
@@ -785,12 +576,13 @@
this.error = '';
- if(!this.trayBarcodeReg.test(currentTrayBarcode)){
- ElMessage.warning({
- message: '鎵樼洏鍙锋牸寮忛敊璇�',
- type: 'warning',
- duration: 3000
- })
+ if (!this.trayBarcodeReg.test(currentTrayBarcode)) {
+ // ElMessage.warning({
+ // message: '鎵樼洏鍙锋牸寮忛敊璇�',
+ // type: 'warning',
+ // duration: 3000
+ // })
+ this.$message("鎵樼洏鍙锋牸寮忛敊璇�");
this.focusTrayInput();
return;
}
@@ -798,11 +590,12 @@
// 璁剧疆鎵樼洏鏉＄爜鍚庯紝鑷姩鑱氱劍鍒扮墿鏂欒緭鍏ユ
this.focusBarcodeInput();
- this.$message({
- message: `鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`,
- type: 'success',
- duration: 2000
- });
+ // this.$message({
+ // message: `鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`,
+ // type: 'success',
+ // duration: 2000
+ // });
+ this.$message.success(`鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`);
},
// 娓呴櫎鎵樼洏
@@ -829,7 +622,7 @@
this.isManualInput = false;
this.isScanning = false;
},
-
+
// 澶勭悊鐗╂枡鏉＄爜鎻愪氦
async handleBarcodeSubmit() {
@@ -851,71 +644,43 @@
this.error = '';
this.loading = true;
+ console.log(currentBarcode);
try {
// 璋冪敤API鏌ヨ鐗╂枡淇℃伅
const materialData = await this.fetchMaterialData(currentBarcode);
if (!materialData || materialData.length === 0) {
-
-
return;
}
- // 妫�鏌ユ槸鍚﹀凡瀛樺湪鐩稿悓鐗╂枡缂栫爜鐨勮褰�
- const exists = this.materials.some(item =>
- item.barcode === this.trayBarcode
- );
- console.log('API:', materialData)
- if (exists) {
- this.$message({
- message: '璇ユ潯鐮佸凡瀛樺湪褰撳墠鎵樼洏鐨勫垪琛ㄤ腑',
- type: 'warning',
- duration: 2000
+
+ this.materials = [];
+ materialData.forEach(item => {
+ this.materials.push({
+ ...item,
+ trayCode: this.trayBarcode,
+ locationType: this.form.locationType,
+ locationDesc: this.currentLocationDesc,
+ scanTime: this.formatTime(new Date())
});
-
- } else {
+ });
+ this.orderNo = materialData[0].orderNo;
- materialData.forEach(item => {
+ this.fetchStockStatistics();
+ // 娓呯┖鐗╂枡杈撳叆妗嗗苟淇濇寔鑱氱劍
+ this.barcode = '';
+ this.scanCode = ''; // 娓呯┖鎵爜缂撳瓨
+ this.isScanning = false;
- // 濡傛灉涓嶅瓨鍦紝娣诲姞鏂扮墿鏂�
- this.materials.push({
- ...item,
- trayCode: this.trayBarcode,
- locationType: this.form.locationType,
- locationDesc: this.currentLocationDesc,
- scanTime: this.formatTime(new Date())
- });
- });
-
- const removeIndex = this.unpalletMaterials.findIndex(item => item.barcode === currentBarcode);
- if (removeIndex > -1) {
- this.unpalletMaterials.splice(removeIndex, 1); // 鍒犻櫎鏈粍鐩樺搴旀暟鎹�
- this.unpalletBarcodes = this.unpalletMaterials.map(item => item.barcode || ''); // 鏇存柊鏉＄爜鏁扮粍
- this.totalStockCount = Math.max(0, this.totalStockCount - 1);
- }
-
- this.$message({
- message: `鎴愬姛娣诲姞鏉＄爜: ${currentBarcode}`,
- type: 'success',
- duration: 2000
- });
-
- this.fetchStockStatistics();
- // 娓呯┖鐗╂枡杈撳叆妗嗗苟淇濇寔鑱氱劍
- this.barcode = '';
- this.scanCode = ''; // 娓呯┖鎵爜缂撳瓨
- this.isScanning = false;
-
- setTimeout(() => {
- this.focusBarcodeInput();
- }, 100);
- }
+ setTimeout(() => {
+ this.focusBarcodeInput();
+ }, 100);
} catch (err) {
this.error = err.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
this.focusBarcodeInput();
setTimeout(() => {
- // 閫変腑杈撳叆妗嗗唴鐨勯敊璇唴瀹癸紙纭繚focus瀹屾垚鍚庢墽琛岋級
- const inputEl = this.$refs.barcodeInput?.$el?.querySelector('input');
- if (inputEl) inputEl.select();
- }, 100);
+ // 閫変腑杈撳叆妗嗗唴鐨勯敊璇唴瀹癸紙纭繚focus瀹屾垚鍚庢墽琛岋級
+ const inputEl = this.$refs.barcodeInput?.$el?.querySelector('input');
+ if (inputEl) inputEl.select();
+ }, 100);
} finally {
this.loading = false;
}
@@ -924,18 +689,15 @@
// API璇锋眰 - 鏇挎崲涓哄疄闄呯殑API璋冪敤
async fetchMaterialData(barcode) {
try {
- const response = await http.post('/api/InboundOrder/BarcodeMaterielGroup',
+ const response = await http.post('/api/Inbound/GroupPallet',
{
palletCode: this.trayBarcode,
- orderNo: this.docNo,
- barcodes: barcode,
+ barcode: barcode,
locationTypeDesc: this.currentLocationDesc,
locationType: this.form.locationType, // 娣诲姞浠撳簱鍖哄煙淇℃伅
warehouseType: this.form.warehouseType
}
);
-
-
let materialData;
if (typeof response.data === 'string') {
@@ -946,7 +708,6 @@
}
} else {
- // 濡傛灉杩斿洖鐨勬槸JSON瀵硅薄锛岀洿鎺ヤ娇鐢�
materialData = response.data;
}
if (!response.status) {
@@ -957,8 +718,6 @@
} catch (error) {
console.error('API璋冪敤澶辫触:', error);
-
-
}
},
@@ -1377,35 +1136,35 @@
}
.unpallet-section.compact {
- margin-bottom: 8px;
- flex-shrink: 0;
-}
-
-.unpallet-card {
- flex-shrink: 0;
-}
-
-.unpallet-barcode-list {
- display: flex;
- flex-wrap: wrap;
- gap: 6px;
- padding: 8px 0;
- max-height: 180px;
- overflow-y: auto;
-}
-
-.unpallet-barcode-list>>>.el-tag {
- cursor: pointer;
- max-width: calc(33.333% - 4px);
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-@media (max-width: 768px) {
- .unpallet-barcode-list>>>.el-tag {
- max-width: calc(50% - 4px);
+ margin-bottom: 8px;
+ flex-shrink: 0;
}
-}
+
+ .unpallet-card {
+ flex-shrink: 0;
+ }
+
+ .unpallet-barcode-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 6px;
+ padding: 8px 0;
+ max-height: 180px;
+ overflow-y: auto;
+ }
+
+ .unpallet-barcode-list>>>.el-tag {
+ cursor: pointer;
+ max-width: calc(33.333% - 4px);
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ @media (max-width: 768px) {
+ .unpallet-barcode-list>>>.el-tag {
+ max-width: calc(50% - 4px);
+ }
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3