From 0474bea600b73ee35b9ce0aac5b65ff720492d37 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期五, 12 十二月 2025 13:57:58 +0800
Subject: [PATCH] 提交
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue | 1805 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 1,200 insertions(+), 605 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 baa1fdc..61170fd 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,202 +1,187 @@
<template>
- <vol-box
- v-model="groupPalletVisible"
- :title="'缁勭洏鎿嶄綔 - 鍗曟嵁鍙凤細' + currentDocNo"
- :height="1000"
- :width="1100"
- :padding="20"
- :modal="true"
-
- @open="handleDialogOpen"
- @close="handleDialogClose"
- >
- <div class="barcode-scanner-container">
-
- <!-- 鎵樼洏淇℃伅鏄剧ず -->
- <div class="tray-info" v-if="trayBarcode">
- <i class="el-icon-s-management"></i> 褰撳墠鏂欑: {{ trayBarcode }}
- <!-- <el-button
- class="small-button"
- type="text"
- @click="clearTray"
- style="float: right;"
- >
- 娓呴櫎鎵樼洏
- </el-button> -->
+ <vol-box v-model="groupPalletVisible" :title="'缁勭洏鎿嶄綔 - 鍗曟嵁鍙凤細' + currentDocNo" :height="1000" :width="1100" :padding="20"
+ :modal="true" @open="handleDialogOpen" @close="handleDialogClose">
+ <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-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"
+ :value="item.warehouseType" />
+ </el-select>
+ </el-form-item>
+ </el-form>
</div>
-
- <!-- 鎵爜鎴栨墜鍔ㄨ緭鍏ュ尯鍩� -->
- <div class="input-section">
- <el-card shadow="hover">
- <div slot="header">
- <span><i class="el-icon-scanner"></i> </span>
+
+ <!-- 浠撳簱鍖哄煙閫夋嫨 - 绱у噾甯冨眬 -->
+ <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-option v-for="item in locationTypes" :key="item.locationType" :label="item.locationTypeDesc"
+ :value="item.locationType" />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ </div>
+
+ <!-- 鎵樼洏淇℃伅鏄剧ず - 绱у噾甯冨眬 -->
+ <div class="tray-info compact" v-if="trayBarcode">
+ <i class="el-icon-s-management"></i> 褰撳墠鏂欑: {{ trayBarcode }}
+ <span class="location-info" v-if="form.warehouseType">
+ | 浠撳簱: {{ currentWarehouseName }}
+ </span>
+ <span class="location-info" v-if="form.locationType">
+ | 浠撳簱鍖哄煙: {{ currentLocationDesc }}
+ </span>
+ </div>
+
+ <!-- 鎵爜鍖哄煙 - 绱у噾甯冨眬 -->
+ <div class="input-section compact">
+ <el-card shadow="hover" class="compact-card">
+ <div slot="header" class="compact-header">
+ <span><i class="el-icon-scanner"></i> 鎵爜鍖哄煙</span>
<span class="scan-status">
- <span class="scan-indicator"></span>鎵爜灏辩华
+ <span class="scan-indicator"></span>
+ {{ form.locationType && form.warehouseType ? '鎵爜灏辩华' : '璇峰厛閫夋嫨浠撳簱鍜屼粨搴撳尯鍩�' }}
</span>
</div>
-
+
<!-- 鎵樼洏鏉＄爜杈撳叆 -->
- <div class="input-wrapper custom-input-group">
- <div class="input-label">鏂欑鐮�</div>
- <el-input
- ref="trayInput"
- v-model="trayBarcode"
- placeholder="璇锋壂鎻忔垨杈撳叆鏂欑鐮佸悗鎸夊洖杞﹂敭"
- clearable
- @keyup.enter.native="handleTraySubmit"
- @clear="handleTrayClear"
- @input="handleTrayInput"
- class="custom-input"
- >
- <template slot="prepend">
- <span> 鏂欑鏉＄爜</span>
- </template>
+ <div class="input-wrapper custom-input-group compact-input">
+ <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">
<template slot="append">
- <el-button
- @click="handleTraySubmit"
- type="primary"
- icon="el-icon-position"
- >
+ <el-button @click="handleTraySubmit" type="primary" icon="el-icon-position"
+ :disabled="!form.locationType || !trayBarcode || !form.warehouseType" size="medium">
纭
</el-button>
</template>
</el-input>
</div>
-
+
<!-- 鐗╂枡鏉＄爜杈撳叆 -->
- <div class="input-wrapper custom-input-group">
+ <div class="input-wrapper custom-input-group compact-input">
<div class="input-label">鐗╂枡鏉＄爜</div>
- <el-input
- ref="barcodeInput"
- v-model="barcode"
- placeholder="璇锋壂鎻忔垨杈撳叆鐗╂枡鏉＄爜鍚庢寜鍥炶溅閿�"
- clearable
- :disabled="!trayBarcode"
- @keyup.enter.native="handleBarcodeSubmit"
- @clear="handleClear"
- @input="handleBarcodeInput"
- class="custom-input"
- >
- <template slot="prepend">
- <span>鐗╂枡鏉＄爜</span>
- </template>
+ <el-input ref="barcodeInput" v-model="barcode" placeholder="璇锋壂鎻忔垨杈撳叆鐗╂枡鏉＄爜鍚庢寜鍥炶溅閿�" clearable
+ :disabled="!form.locationType || !trayBarcode || !form.warehouseType"
+ @keyup.enter.native="handleBarcodeSubmit" @clear="handleClear" @input="handleBarcodeInput"
+ class="custom-input" size="medium">
<template slot="append">
- <el-button
- :loading="loading"
- @click="handleBarcodeSubmit"
- type="primary"
- icon="el-icon-search"
- :disabled="!trayBarcode"
- >
+ <el-button :loading="loading" @click="handleBarcodeSubmit" type="primary" icon="el-icon-search"
+ :disabled="!form.locationType || !trayBarcode || !barcode || !from.warehouseType" size="medium">
{{ loading ? '鏌ヨ涓�...' : '鏌ヨ' }}
</el-button>
</template>
</el-input>
</div>
-
- <div class="input-tips">
- <p>鎻愮ず锛氬厛杈撳叆鏂欑鐮侊紝鐒跺悗杈撳叆鐗╂枡鏉＄爜</p>
-
+
+ <div class="input-tips compact-tips">
+ <p>鎻愮ず锛氳鍏堥�夋嫨浠撳簱 鈫� 閫夋嫨浠撳簱鍖哄煙 鈫� 杈撳叆鏂欑鐮� 鈫� 杈撳叆鐗╂枡鏉＄爜</p>
+ <p v-if="!form.warehouseType" class="warning-text">鈿狅笍 璇峰厛閫夋嫨浠撳簱</p>
+ <p v-if="!form.locationType && !form.warehouseType" class="warning-text">鈿狅笍 璇峰厛閫夋嫨浠撳簱鍖哄煙</p>
+ <p v-if="form.warehouseType && form.locationType && !trayBarcode" class="warning-text">鈿狅笍 璇峰厛杈撳叆鏂欑鐮�</p>
</div>
-
+
</el-card>
</div>
<!-- 鍔犺浇鐘舵�� -->
- <div v-if="loading" class="loading">
+ <div v-if="loading" class="loading compact">
<el-progress :percentage="100" status="success" :show-text="false" />
<p>姝ｅ湪鏌ヨ鐗╂枡淇℃伅...</p>
</div>
<!-- 閿欒鎻愮ず -->
- <div v-if="error" class="error-message">
- <el-alert
- :title="error"
- type="error"
- show-icon
- closable
- @close="error = ''"
- />
+ <div v-if="error" class="error-message compact">
+ <el-alert :title="error" type="error" show-icon closable @close="error = ''" />
</div>
- <!-- 鐗╂枡鍒楄〃 -->
- <div class="material-list">
- <el-card shadow="hover">
- <div slot="header">
- <span><i class="el-icon-tickets"></i> 缁勭洏鏁版嵁</span>
+ <!-- 鏈粍鐩樺垪琛� -->
+ <div class="unpallet-section compact">
+ <el-card shadow="hover" class="compact-card unpallet-card">
+ <div slot="header" class="compact-header">
+ <span><i class="el-icon-tickets"></i> 鏈粍鐩樻潯鐮�</span>
<span class="list-actions">
- <el-tag type="primary">鍏� {{ materials.length }} 鏉¤褰�</el-tag>
- <el-tag v-if="trayBarcode" type="success">鎵樼洏: {{ trayBarcode }}</el-tag>
- <!-- <el-button
- v-if="materials.length > 0"
- class="small-button clear-all-btn"
- type="danger"
- icon="el-icon-delete"
- @click="clearAllMaterials"
- >
- 娓呯┖鍒楄〃
- </el-button> -->
- <!-- <el-button
- class="small-button clear-all-btn"
- @click="debugMode = !debugMode"
- >
- {{ debugMode ? '闅愯棌璋冭瘯' : '鏄剧ず璋冭瘯' }}
- </el-button> -->
+ <el-tag type="primary" size="small">鏈粍鐩� {{ totalStockCount }}</el-tag>
</span>
</div>
+
- <div v-if="materials.length === 0" class="empty-state">
+ <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>
+ <el-table-column prop="batchNo" label="鎵规" min-width="150" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="orderQuantity" label="鏁伴噺" min-width="130" align="right"></el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" width="80" align="center"></el-table-column>
+ <el-table-column prop="supplyCode" label="渚涘簲鍟�" min-width="130" show-overflow-tooltip></el-table-column>
+ </el-table>
+ </div>
+ </el-card>
+
+ </div>
+
+ <!-- 鐗╂枡鍒楄〃 - 鍥哄畾楂樺害甯︽粴鍔ㄦ潯 -->
+ <div class="material-list compact">
+ <el-card shadow="hover" class="compact-card">
+ <div slot="header" class="compact-header">
+ <span><i class="el-icon-tickets"></i> 缁勭洏鏁版嵁</span>
+ <span class="list-actions">
+ <el-tag type="primary" size="small">鍏� {{ materials.length }} 鏉�</el-tag>
+ <el-tag type="primary" size="small">鏈叆搴撴暟閲� {{ totalStockSum }}{{ uniqueUnit }}</el-tag>
+ <el-tag v-if="trayBarcode" type="success" size="small">鎵樼洏: {{ trayBarcode }}</el-tag>
+ <el-tag v-if="form.warehouseType" type="info" size="small">浠撳簱: {{ currentWarehouseName }}</el-tag>
+ <el-tag v-if="form.locationType" type="info" size="small">鍖哄煙: {{ currentLocationDesc }}</el-tag>
+ </span>
+ </div>
+
+ <div v-if="materials.length === 0" class="empty-state compact">
<i class="el-icon-document"></i>
- <p v-if="!trayBarcode">璇峰厛杈撳叆鏂欑鏉＄爜</p>
+ <p v-if="!form.warehouseType">璇峰厛閫夋嫨浠撳簱</p>
+ <p v-if="!form.locationType">璇峰厛閫夋嫨浠撳簱鍖哄煙</p>
+ <p v-else-if="!trayBarcode">璇峰厛杈撳叆鏂欑鏉＄爜</p>
<p v-else>鏆傛棤鐗╂枡鏁版嵁锛岃鎵弿鎴栬緭鍏ョ墿鏂欐潯鐮�</p>
</div>
-
- <el-table
- v-else
- :data="materials"
- stripe
- style="width: 100%"
- >
- <el-table-column type="index" label="搴忓彿" width="60" align="center"></el-table-column>
- <el-table-column prop="barcode" label="鏉＄爜" min-width="140"></el-table-column>
- <el-table-column prop="materielCode" label="鐗╂枡缂栫爜" min-width="150"></el-table-column>
- <el-table-column prop="batchNo" label="鎵规" min-width="150"></el-table-column>
- <el-table-column prop="stockQuantity" label="鏁伴噺" min-width="130"></el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="80" align="center"></el-table-column>
- <el-table-column prop="supplyCode" label="渚涘簲鍟�" min-width="130"></el-table-column>
- <el-table-column prop="warehouseCode" label="浠撳簱" min-width="120"></el-table-column>
-
- <!-- <el-table-column label="鎿嶄綔" width="100" align="center">
- <template slot-scope="scope">
- <el-button
- v-if="scope"
- class="small-button"
- type="danger"
- icon="el-icon-delete"
- circle
- @click="removeMaterial(scope.$index)"
- ></el-button>
- </template>
- </el-table-column> -->
- </el-table>
+
+ <div class="table-container" v-else>
+ <el-table :data="materials" stripe style="width: 100%" height="100%" size="small">
+ <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>
+ <el-table-column prop="batchNo" label="鎵规" min-width="150" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="stockQuantity" label="鏁伴噺" min-width="130" align="right"></el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" width="80" align="center"></el-table-column>
+ <el-table-column prop="supplyCode" label="渚涘簲鍟�" min-width="130" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="warehouseType" label="浠撳簱" min-width="120" show-overflow-tooltip></el-table-column>
+ </el-table>
+ </div>
</el-card>
</div>
</div>
-
- <!-- <div slot="footer" class="dialog-footer">
+
+ <!-- <div slot="footer" class="dialog-footer">
<el-button @click="handleCancel">鍙栨秷</el-button>
<el-button type="primary" @click="handleConfirm">纭</el-button>
</div> -->
- </vol-box>
+ </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 { 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',
@@ -208,23 +193,66 @@
data() {
return {
- palletVisible: this.visible,
- trayBarcode: '',
- barcode: '',
- materials: [],
- loading: false,
- error: '',
- debugMode: false,
- currentFocus: 'tray',
-
- // 鎵爜鏋浉鍏冲彉閲�
- scanCode: '',
- lastKeyTime: null,
- isManualInput: false,
- isScanning: false,
- scanTimer: null,
- manualInputTimer: null,
- scanTarget: 'tray', // 褰撳墠鎵爜鐩爣: tray 鎴� material
+ palletVisible: this.visible,
+ trayBarcodeReg:/^[A-Z]\d{9}$/,
+ trayBarcode: '',
+ barcode: '',
+ materials: [],
+ loading: false,
+ error: '',
+ debugMode: false,
+ currentFocus: 'warehouse',
+
+ unpalletBarcodes:[],
+ unpalletBarcodesLoading: false,
+ unpalletMaterials: [], // 鏈粍鐩樿缁嗘暟鎹垪琛�
+
+ // 鎵爜鏋浉鍏冲彉閲�
+ scanCode: '',
+ lastKeyTime: null,
+ isManualInput: false,
+ isScanning: false,
+ scanTimer: null,
+ manualInputTimer: null,
+ scanTarget: 'tray', // 褰撳墠鎵爜鐩爣: tray 鎴� material
+
+ // 搴撳瓨缁熻鐩稿叧鍙橀噺
+ totalStockSum: 0,
+ totalStockCount: 0,
+ uniqueUnit: '',
+ sumLoading: false,
+ sumError: '',
+ // 浠撳簱鐩稿叧鍙橀噺
+ warehouseTypes: [],
+ warehouseLoading: false,
+ // 浠撳簱鍖哄煙鐩稿叧鍙橀噺
+ locationTypes: [],
+ locationLoading: false,
+ form: {
+ warehouseType: null,
+ locationType: null
+ },
+ rules: {
+ locationType: [
+ {
+ validator: this.validateLocationType,
+ trigger: 'change'
+ }
+ ],
+ trayBarcode:[
+ {
+ pattern: this.trayBarcodeReg,
+ message: '鎵樼洏鍙锋牸寮忛敊璇紙闇�涓�1涓ぇ鍐欏瓧姣�+9涓暟瀛楋紝濡侫000008024锛�',
+ trigger: 'blur'
+ }
+ ],
+ warehouseType: [
+ {
+ message: '璇烽�夋嫨浠撳簱',
+ trigger: 'change'
+ }
+ ]
+ }
}
},
computed: {
@@ -232,74 +260,399 @@
get() { return this.visible; },
set(newVal) { this.$emit('update:visible', newVal); }
},
- currentDocNo() { return this.docNo; }
+ currentDocNo() { return this.docNo; },
+ // 褰撳墠閫夋嫨鐨勪粨搴撳悕绉�
+ currentWarehouseName() {
+ const warehouse = this.warehouseTypes.find(item => item.warehouseType === this.form.warehouseType);
+ return warehouse ? warehouse.warehouseTypeDesc : '';
+ },
+ // 褰撳墠閫夋嫨鐨勪粨搴撳尯鍩熸弿杩�
+ currentLocationDesc() {
+ const location = this.locationTypes.find(item => item.locationType === this.form.locationType)
+ return location ? location.locationTypeDesc : ''
+ }
},
watch: {
visible(newVal, oldVal) {
- this.palletVisible = newVal;
-
- // 褰撲粠 false 鍙樹负 true 鏃讹紝琛ㄧず寮规鎵撳紑
- if (newVal === true && oldVal === false) {
- console.log('寮规鎵撳紑锛岄噸缃暟鎹�');
- this.resetData();
- this.$nextTick(() => {
- setTimeout(() => {
- this.focusTrayInput();
- }, 300);
- });
- }
-
- // 褰撲粠 true 鍙樹负 false 鏃讹紝琛ㄧず寮规鍏抽棴
- if (newVal === false && oldVal === true) {
- console.log('寮规鍏抽棴锛岄噸缃暟鎹�');
- this.resetData();
- }
- },
- palletVisible(newVal) {
- this.$emit('update:visible', newVal);
- },
+ this.palletVisible = newVal;
+
+ // 褰撲粠 false 鍙樹负 true 鏃讹紝琛ㄧず寮规鎵撳紑
+ if (newVal === true && oldVal === false) {
+ console.log('寮规鎵撳紑锛岄噸缃暟鎹�');
+ this.resetData();
+ this.$nextTick(() => {
+ setTimeout(() => {
+ // this.focusTrayInput();
+ this.initwarehouseTypes(); // 鍒濆鍖栦粨搴�
+ this.initLocationTypes(); // 鍒濆鍖栦粨搴撳尯鍩�
+ this.fetchStockStatistics(); // 鍔犺浇缁熻鏁版嵁
+ this.fetchUnpalletMaterialDetails();
+ }, 300);
+ });
+ }
+
+ // 褰撲粠 true 鍙樹负 false 鏃讹紝琛ㄧず寮规鍏抽棴
+ if (newVal === false && oldVal === true) {
+ console.log('寮规鍏抽棴锛岄噸缃暟鎹�');
+ this.resetData();
+ }
+ },
+ palletVisible(newVal) {
+ this.$emit('update:visible', newVal);
+ },
docNo(newVal) {
if (newVal) {
this.palletForm = { palletCode: '', barcode: '' };
this.backData = [];
this.$refs.palletForm?.reset();
+ this.fetchStockStatistics(); // 鍗曟嵁鍙峰彉浜嗭紝鍒锋柊缁熻
+ this.fetchUnpalletMaterialDetails();
}
}
},
+ 'form.warehouseType'(newVal) {
+ if (newVal) {
+ this.form.locationType = null;
+ } else {
+ this.locationTypes = [];
+ }
+ },
- mounted() {
-
- // 娣诲姞鍏ㄥ眬閿洏鐩戝惉
- document.addEventListener('keypress', this.handleKeyPress);
-
- // 浣跨敤setTimeout纭繚DOM瀹屽叏娓叉煋鍚庡啀鑱氱劍
- setTimeout(() => {
- this.focusTrayInput();
- }, 300);
- },
- beforeDestroy() {
- // 娓呯悊浜嬩欢鐩戝惉
- document.removeEventListener('keypress', this.handleKeyPress);
- this.clearAllTimers();
- },
- methods: {
- // 閲嶇疆鎵�鏈夋暟鎹�
+ 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
+*/
+ validateLocationType(rule, value, callback) {
+ // 妫�鏌ュ�兼槸鍚︿负null銆乽ndefined鎴栫┖瀛楃涓诧紝浣嗗厑璁告暟瀛�0
+ if (!this.form.warehouseType) {
+ callback(new Error('璇峰厛閫夋嫨浠撳簱'));
+ } else if (value === null || value === undefined || value === '') {
+ callback(new Error('璇烽�夋嫨浠撳簱鍖哄煙'));
+ } else {
+ callback();
+ }
+ },
+
+ // 鏍规嵁鏉＄爜鍒楄〃鑾峰彇璇︾粏鏁版嵁
+ async fetchUnpalletMaterialDetails() {
+ try {
+ // 灏濊瘯璋冪敤鎺ュ彛鑾峰彇璇︾粏鏁版嵁
+ // 娉ㄦ剰锛氬鏋滆繖涓帴鍙ｄ笉瀛樺湪锛屽彲浠ユ敞閲婃帀鎴栨牴鎹疄闄匒PI璋冩暣
+ const response = await http.post('/api/InboundOrder/UnPalletGroupBarcode?orderNo='+this.docNo, {
+
+ });
+
+ console.log('鏈粍鐩樻暟鎹�:', response.data);
+
+
+ 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: '-',
+ batchNo: '-',
+ stockQuantity: '-',
+ unit: '-',
+ supplyCode: '-',
+ warehouseType: '-'
+ }));
+ }
+ },
+ /**
+ * 鍒濆鍖栦粨搴撳尯鍩熸暟鎹�
+ */
+ 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;
+ }
+ },
+
+ /**
+ * 鍒濆鍖栦粨搴撴暟鎹�
+ */
+ 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;
+ }
+ },
+
+
+ /**
+ * 浠撳簱鍖哄煙鍙樻洿澶勭悊
+ */
+ 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() {
+ // 鍗曟嵁鍙蜂负绌烘椂涓嶆煡璇�
+ if (!this.docNo) {
+ this.sumError = '鍗曟嵁鍙蜂负绌猴紝鏃犳硶缁熻';
+ return;
+ }
+
+ this.sumLoading = true;
+ this.sumError = '';
+ try {
+ // 璋冪敤鍚庣缁熻鎺ュ彛锛堟浛鎹负浣犵殑瀹為檯鎺ュ彛璺緞锛�
+ const response = await http.post('/api/InboundOrder/UnPalletQuantity?orderNo=' + this.docNo, {
+
+ });
+
+ // 缁戝畾鏁版嵁锛堝尮閰� PalletSumQuantityDTO 缁撴瀯锛�
+ if (response.data) {
+ 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) {
+ this.error = '琛ㄥ崟鏈垵濮嬪寲';
+ this.$message.warning('璇峰厛閫夋嫨浠撳簱鍖哄煙');
+ resolve(false);
+ return;
+ }
+
+ this.$refs.locationForm.validate((valid) => {
+ if (valid) {
+ 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() {
+ if (this.$refs.trayInput && this.$refs.trayInput.$el) {
+ const inputEl = this.$refs.trayInput.$el.querySelector('input');
+ if (inputEl) {
+ inputEl.focus();
+ this.currentFocus = 'tray';
+ this.scanTarget = 'tray';
+ inputEl.select();
+ }
+ }
+ },
+
+ // 鑱氱劍鍒扮墿鏂欒緭鍏ユ
+ focusBarcodeInput() {
+ if (this.$refs.barcodeInput && this.$refs.barcodeInput.$el) {
+ const inputEl = this.$refs.barcodeInput.$el.querySelector('input');
+ if (inputEl) {
+ inputEl.focus();
+ this.currentFocus = 'material';
+ this.scanTarget = 'material';
+
+
+ inputEl.select();
+ console.log('鐗╂枡杈撳叆妗嗗唴瀹瑰凡閫変腑');
+
+ }
+ }
+ },
+
+
+
+
+ // 閲嶇疆鎵�鏈夋暟鎹�
resetData() {
console.log('閲嶇疆寮规鏁版嵁');
this.trayBarcode = '';
this.barcode = '';
this.materials = [];
+ this.unpalletBarcodes = [];
+ this.unpalletMaterials = [];
this.loading = false;
this.error = '';
this.scanCode = '';
this.lastKeyTime = null;
this.isManualInput = false;
this.isScanning = false;
- this.currentFocus = 'tray';
+ this.currentFocus = 'warehouse';
this.scanTarget = 'tray';
this.clearAllTimers();
+ this.totalStockSum = 0;
+ this.totalStockCount = 0;
+ this.sumLoading = false;
+ this.sumError = '';
+ this.form = {
+ warehouseType: null,
+ locationType: null
+ }
+ this.warehouseTypes = [];
+ this.locationTypes = [];
+ // 娓呴櫎琛ㄥ崟楠岃瘉鐘舵��
+ this.$nextTick(() => {
+ if (this.$refs.locationForm) {
+ this.$refs.locationForm.clearValidate();
+ }
+ });
},
-
+
// 娓呴櫎鎵�鏈夎鏃跺櫒
clearAllTimers() {
if (this.manualInputTimer) {
@@ -311,7 +664,7 @@
this.scanTimer = null;
}
},
-
+
// 寮规鎵撳紑鏃堕噸缃暟鎹�
handleDialogOpen() {
console.log('寮规鎵撳紑锛岄噸缃暟鎹�');
@@ -319,464 +672,648 @@
// 浣跨敤setTimeout纭繚DOM瀹屽叏娓叉煋鍚庡啀鑱氱劍
this.$nextTick(() => {
setTimeout(() => {
- this.focusTrayInput();
+ this.initwarehouseTypes();
+ this.initLocationTypes(); // 鍒濆鍖栦粨搴撳尯鍩�
+ // 纭繚琛ㄥ崟寮曠敤瀛樺湪鍚庡啀鑱氱劍
+ if (this.$refs.locationForm) {
+ this.focusWarehouseSelect();
+ } else {
+ // 濡傛灉琛ㄥ崟寮曠敤杩樹笉瀛樺湪锛岀◢鍚庨噸璇�
+ setTimeout(() => {
+ this.focusWarehouseSelect();
+ }, 500);
+ }
}, 300);
});
},
-
+
// 寮规鍏抽棴鏃堕噸缃暟鎹�
handleDialogClose() {
console.log('寮规鍏抽棴锛岄噸缃暟鎹�');
this.resetData();
},
-
+
// 鍙栨秷鎸夐挳
handleCancel() {
this.palletVisible = false;
},
-
+
// 纭鎸夐挳
- handleConfirm() {
+ async handleConfirm() {
+ if (!await this.validateForm()) return;
+
if (this.materials.length === 0) {
this.$message.warning('璇疯嚦灏戞坊鍔犱竴涓墿鏂�');
return;
}
-
+
if (!this.trayBarcode) {
this.$message.warning('璇疯緭鍏ユ墭鐩樻潯鐮�');
return;
}
-
+
const result = {
+ warehouseType: this.form.warehouseType,
+ warehouseName: this.currentWarehouseName,
+ locationType: this.form.locationType,
+ locationDesc: this.currentLocationDesc,
trayBarcode: this.trayBarcode,
materials: this.materials,
docNo: this.docNo
};
-
+
// 瑙﹀彂鐖剁粍浠剁殑 back-success 浜嬩欢
this.$emit('back-success', result);
this.palletVisible = false;
},
- // 鑱氱劍鍒版墭鐩樿緭鍏ユ
- focusTrayInput() {
- if (this.$refs.trayInput && this.$refs.trayInput.$el) {
- const inputEl = this.$refs.trayInput.$el.querySelector('input');
- if (inputEl) {
- inputEl.focus();
- this.currentFocus = 'tray';
- this.scanTarget = 'tray';
- }
- }
- },
-
- // 鑱氱劍鍒扮墿鏂欒緭鍏ユ
- focusBarcodeInput() {
- if (this.$refs.barcodeInput && this.$refs.barcodeInput.$el) {
- const inputEl = this.$refs.barcodeInput.$el.querySelector('input');
- if (inputEl) {
- inputEl.focus();
- this.currentFocus = 'material';
- this.scanTarget = 'material';
- }
- }
- },
-
- // 澶勭悊鎵樼洏杈撳叆
- handleTrayInput() {
- // 鏍囪涓烘墜鍔ㄨ緭鍏ユā寮�
- this.isManualInput = true;
- this.isScanning = false;
+ // 澶勭悊鎵樼洏杈撳叆
+ handleTrayInput() {
+ // 鏍囪涓烘墜鍔ㄨ緭鍏ユā寮�
+ this.isManualInput = true;
+ this.isScanning = false;
+
+ // 娓呴櫎涔嬪墠鐨勮鏃跺櫒
+ if (this.manualInputTimer) {
+ clearTimeout(this.manualInputTimer);
+ }
+
+ // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆涓烘壂鐮佹ā寮�
+ this.manualInputTimer = setTimeout(() => {
+ this.isManualInput = false;
+ }, 1000);
+ },
+
+ // 澶勭悊鐗╂枡杈撳叆
+ handleBarcodeInput() {
+ // 鏍囪涓烘墜鍔ㄨ緭鍏ユā寮�
+ this.isManualInput = true;
+ this.isScanning = false;
+
+ // 娓呴櫎涔嬪墠鐨勮鏃跺櫒
+ if (this.manualInputTimer) {
+ clearTimeout(this.manualInputTimer);
+ }
+
+ // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆涓烘壂鐮佹ā寮�
+ this.manualInputTimer = setTimeout(() => {
+ this.isManualInput = false;
+ }, 1000);
+ },
+
+ // 澶勭悊鎵樼洏鏉＄爜鎻愪氦
+ async handleTraySubmit() {
+ // 鍏堢洿鎺ユ鏌ocationType锛岄伩鍏嶈〃鍗曢獙璇佺殑寮傛闂
+ if (!this.form.warehouseType) {
+ this.error = '璇峰厛閫夋嫨浠撳簱';
+ return;
+ }
+ if (!this.form.locationType) {
+ this.error = '璇峰厛閫夋嫨浠撳簱鍖哄煙';
+ //this.$message.warning('璇峰厛閫夋嫨浠撳簱鍖哄煙');
+ return;
+ }
+
+ // 鐒跺悗鍐嶈繘琛屽畬鏁寸殑琛ㄥ崟楠岃瘉
+ if (!await this.validateForm()) return;
+
+ const currentTrayBarcode = this.trayBarcode.trim();
+
+ if (!currentTrayBarcode) {
+ this.error = '璇疯緭鍏ユ垨鎵弿鎵樼洏鏉＄爜';
+ return;
+ }
+
+ this.error = '';
+
+ if(!this.trayBarcodeReg.test(currentTrayBarcode)){
+ ElMessage.warning({
+ message: '鎵樼洏鍙锋牸寮忛敊璇�',
+ type: 'warning',
+ duration: 3000
+ })
+ this.focusTrayInput();
+ return;
+ }
+
+ // 璁剧疆鎵樼洏鏉＄爜鍚庯紝鑷姩鑱氱劍鍒扮墿鏂欒緭鍏ユ
+ this.focusBarcodeInput();
+
+ this.$message({
+ message: `鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`,
+ type: 'success',
+ duration: 2000
+ });
+ },
+
+ // 娓呴櫎鎵樼洏
+ clearTray() {
+ this.trayBarcode = '';
+ this.materials = [];
+ this.focusTrayInput();
+ this.$message({
+ message: '鎵樼洏鏉＄爜宸叉竻闄�',
+ type: 'info',
+ duration: 2000
+ });
+ },
+
+ // 娓呯┖鎵樼洏杈撳叆
+ handleTrayClear() {
+ this.error = '';
+ },
+
+ // 娓呯┖杈撳叆
+ handleClear() {
+ this.error = '';
+ this.scanCode = '';
+ this.isManualInput = false;
+ this.isScanning = false;
+ },
+
+
+ // 澶勭悊鐗╂枡鏉＄爜鎻愪氦
+ async handleBarcodeSubmit() {
+ if (!await this.validateForm()) return;
+ const currentBarcode = this.barcode.trim();
+
+ if (!this.trayBarcode) {
+ this.error = '璇峰厛杈撳叆鎵樼洏鏉＄爜';
+ this.focusTrayInput();
+ return;
+ }
+
+ if (!currentBarcode) {
+ this.error = '璇疯緭鍏ユ垨鎵弿鐗╂枡鏉＄爜';
+ return;
+ }
+
+ this.focusBarcodeInput();
+ this.error = '';
+ this.loading = true;
+
+ 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
+ });
- // 娓呴櫎涔嬪墠鐨勮鏃跺櫒
- if (this.manualInputTimer) {
- clearTimeout(this.manualInputTimer);
- }
+ } else {
+
+ materialData.forEach(item => {
+
+ // 濡傛灉涓嶅瓨鍦紝娣诲姞鏂扮墿鏂�
+ this.materials.push({
+ ...item,
+ trayCode: this.trayBarcode,
+ locationType: this.form.locationType,
+ locationDesc: this.currentLocationDesc,
+ scanTime: this.formatTime(new Date())
+ });
+ });
- // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆涓烘壂鐮佹ā寮�
- this.manualInputTimer = setTimeout(() => {
- this.isManualInput = false;
- }, 1000);
- },
-
- // 澶勭悊鐗╂枡杈撳叆
- handleBarcodeInput() {
- // 鏍囪涓烘墜鍔ㄨ緭鍏ユā寮�
- this.isManualInput = true;
- this.isScanning = false;
-
- // 娓呴櫎涔嬪墠鐨勮鏃跺櫒
- if (this.manualInputTimer) {
- clearTimeout(this.manualInputTimer);
- }
-
- // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆涓烘壂鐮佹ā寮�
- this.manualInputTimer = setTimeout(() => {
- this.isManualInput = false;
- }, 1000);
- },
-
- // 澶勭悊鎵樼洏鏉＄爜鎻愪氦
- handleTraySubmit() {
- const currentTrayBarcode = this.trayBarcode.trim();
-
- if (!currentTrayBarcode) {
- this.error = '璇疯緭鍏ユ垨鎵弿鎵樼洏鏉＄爜';
- return;
+ 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.error = '';
-
- // 璁剧疆鎵樼洏鏉＄爜鍚庯紝鑷姩鑱氱劍鍒扮墿鏂欒緭鍏ユ
- this.focusBarcodeInput();
-
this.$message({
- message: `鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`,
+ message: `鎴愬姛娣诲姞鏉＄爜: ${currentBarcode}`,
type: 'success',
duration: 2000
});
- },
-
- // 娓呴櫎鎵樼洏
- clearTray() {
- this.trayBarcode = '';
- this.materials = [];
- this.focusTrayInput();
- this.$message({
- message: '鎵樼洏鏉＄爜宸叉竻闄�',
- type: 'info',
- duration: 2000
- });
- },
-
- // 娓呯┖鎵樼洏杈撳叆
- handleTrayClear() {
- this.error = '';
- },
-
- // 娓呯┖杈撳叆
- handleClear() {
- this.error = '';
- this.scanCode = '';
- this.isManualInput = false;
+
+ this.fetchStockStatistics();
+ // 娓呯┖鐗╂枡杈撳叆妗嗗苟淇濇寔鑱氱劍
+ this.barcode = '';
+ this.scanCode = ''; // 娓呯┖鎵爜缂撳瓨
this.isScanning = false;
- },
-
- // 澶勭悊鐗╂枡鏉＄爜鎻愪氦
- async handleBarcodeSubmit() {
- const currentBarcode = this.barcode.trim();
-
- if (!this.trayBarcode) {
- this.error = '璇峰厛杈撳叆鎵樼洏鏉＄爜';
- this.focusTrayInput();
- return;
- }
-
- if (!currentBarcode) {
- this.error = '璇疯緭鍏ユ垨鎵弿鐗╂枡鏉＄爜';
- return;
- }
- this.error = '';
- this.loading = true;
+ 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);
+ } finally {
+ this.loading = false;
+ }
+ },
- 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
- });
- } else {
-
- materialData.forEach(item => {
-
- // 濡傛灉涓嶅瓨鍦紝娣诲姞鏂扮墿鏂�
- this.materials.push({
- ...item,
- trayCode: this.trayBarcode,
- scanTime: this.formatTime(new Date())
- });
- });
-
-
-
-
- this.$message({
- message: `鎴愬姛娣诲姞鏉＄爜: ${currentBarcode}`,
- type: 'success',
- duration: 2000
- });
-
-
- // 娓呯┖鐗╂枡杈撳叆妗嗗苟淇濇寔鑱氱劍
- this.barcode = '';
- this.scanCode = ''; // 娓呯┖鎵爜缂撳瓨
- this.isScanning = false;
-
- setTimeout(() => {
- this.focusBarcodeInput();
- }, 100);
- }
- } catch (err) {
- this.error = err.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
- } finally {
- this.loading = false;
- }
- },
-
- // API璇锋眰 - 鏇挎崲涓哄疄闄呯殑API璋冪敤
- async fetchMaterialData(barcode) {
- try {
- const response = await http.post('/api/InboundOrder/BarcodeMaterielGroup',
- {
+ // API璇锋眰 - 鏇挎崲涓哄疄闄呯殑API璋冪敤
+ async fetchMaterialData(barcode) {
+ try {
+ const response = await http.post('/api/InboundOrder/BarcodeMaterielGroup',
+ {
palletCode: this.trayBarcode,
orderNo: this.docNo,
- barcodes: barcode
- }
+ barcodes: barcode,
+ locationTypeDesc: this.currentLocationDesc,
+ locationType: this.form.locationType, // 娣诲姞浠撳簱鍖哄煙淇℃伅
+ warehouseType: this.form.warehouseType
+ }
);
-
-
+
+
let materialData;
-
+
if (typeof response.data === 'string') {
-
+
try {
materialData = JSON.parse(response.data);
} catch (e) {
-
+
}
} else {
// 濡傛灉杩斿洖鐨勬槸JSON瀵硅薄锛岀洿鎺ヤ娇鐢�
materialData = response.data;
}
- if(!response.status){
- this.error = response.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
- }
- // 纭繚杩斿洖鐨勬暟鎹寘鍚墍鏈夊繀闇�鐨勫瓧娈�
- return materialData;
-
+ if (!response.status) {
+ this.error = response.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
+ }
+
+ return materialData;
+
} catch (error) {
console.error('API璋冪敤澶辫触:', error);
-
-
+
+
}
- },
-
- // 澶勭悊鎵爜鏋緭鍏�
- handleKeyPress(event) {
- // 濡傛灉鏄墜鍔ㄨ緭鍏ユā寮忥紝涓嶅鐞嗘壂鐮佹灙閫昏緫
- if (this.isManualInput) {
- return;
+ },
+
+ // 澶勭悊鎵爜鏋緭鍏�
+ handleKeyPress(event) {
+ // 濡傛灉鏄墜鍔ㄨ緭鍏ユā寮忥紝涓嶅鐞嗘壂鐮佹灙閫昏緫
+ if (this.isManualInput) {
+ return;
+ }
+
+ const key = event.key;
+ const currentTime = new Date().getTime();
+
+ // 蹇界暐鐩存帴鎸変笅鐨勫洖杞﹂敭锛堢敱handleBarcodeSubmit澶勭悊锛�
+ if (key === 'Enter') {
+ if (this.scanCode.length > 0) {
+ // 闃绘榛樿鍥炶溅琛屼负锛岄伩鍏嶈〃鍗曟彁浜�
+ event.preventDefault();
+
+ // 鎵爜瀹屾垚锛岃嚜鍔ㄨЕ鍙戞煡璇�
+ this.isScanning = false;
+
+ // 鏍规嵁褰撳墠鎵爜鐩爣璁剧疆鐩稿簲鐨勮緭鍏ユ鍊�
+ if (this.scanTarget === 'tray') {
+ this.trayBarcode = this.scanCode;
+ this.handleTraySubmit();
+ } else if (this.scanTarget === 'material') {
+ this.barcode = this.scanCode;
+ this.handleBarcodeSubmit();
}
-
- const key = event.key;
- const currentTime = new Date().getTime();
-
- // 蹇界暐鐩存帴鎸変笅鐨勫洖杞﹂敭锛堢敱handleBarcodeSubmit澶勭悊锛�
- if (key === 'Enter') {
- if (this.scanCode.length > 0) {
- // 闃绘榛樿鍥炶溅琛屼负锛岄伩鍏嶈〃鍗曟彁浜�
- event.preventDefault();
-
- // 鎵爜瀹屾垚锛岃嚜鍔ㄨЕ鍙戞煡璇�
- this.isScanning = false;
-
- // 鏍规嵁褰撳墠鎵爜鐩爣璁剧疆鐩稿簲鐨勮緭鍏ユ鍊�
- if (this.scanTarget === 'tray') {
- this.trayBarcode = this.scanCode;
- this.handleTraySubmit();
- } else if (this.scanTarget === 'material') {
- this.barcode = this.scanCode;
- this.handleBarcodeSubmit();
- }
- }
- this.scanCode = '';
- this.lastKeyTime = null;
- return;
- }
-
- // 鏋勫缓鎵爜鍐呭锛堝揩閫熻繛缁緭鍏ヨ涓烘壂鐮侊級
- if (this.lastKeyTime && currentTime - this.lastKeyTime < 50) {
- this.scanCode += key;
- this.isScanning = true;
- } else {
- this.scanCode = key;
- this.isScanning = true;
- }
-
- // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆鎵弿鐘舵��
- if (this.scanTimer) {
- clearTimeout(this.scanTimer);
- }
- this.scanTimer = setTimeout(() => {
- this.isScanning = false;
- }, 100);
-
- this.lastKeyTime = currentTime;
- },
-
- // 鍒犻櫎鐗╂枡
- removeMaterial(index) {
- this.$confirm('纭畾瑕佸垹闄よ繖鏉＄墿鏂欒褰曞悧?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- this.materials.splice(index, 1);
- this.$message({
- type: 'success',
- message: '鍒犻櫎鎴愬姛!'
- });
- }).catch(() => {
- // 鍙栨秷鍒犻櫎
- });
- },
-
- // 娓呯┖鎵�鏈夌墿鏂�
- clearAllMaterials() {
- if (this.materials.length === 0) return;
-
- this.$confirm('纭畾瑕佹竻绌烘墍鏈夌墿鏂欒褰曞悧?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- this.materials = [];
- this.$message({
- type: 'success',
- message: '宸叉竻绌烘墍鏈夎褰�!'
- });
- }).catch(() => {
- // 鍙栨秷娓呯┖
- });
- },
-
- // 鏍煎紡鍖栨椂闂�
- formatTime(date) {
- const year = date.getFullYear();
- const month = String(date.getMonth() + 1).padStart(2, '0');
- const day = String(date.getDate()).padStart(2, '0');
- const hours = String(date.getHours()).padStart(2, '0');
- const minutes = String(date.getMinutes()).padStart(2, '0');
- const seconds = String(date.getSeconds()).padStart(2, '0');
-
- return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
+ this.scanCode = '';
+ this.lastKeyTime = null;
+ return;
}
+
+ // 鏋勫缓鎵爜鍐呭锛堝揩閫熻繛缁緭鍏ヨ涓烘壂鐮侊級
+ if (this.lastKeyTime && currentTime - this.lastKeyTime < 50) {
+ this.scanCode += key;
+ this.isScanning = true;
+ } else {
+ this.scanCode = key;
+ this.isScanning = true;
+ }
+
+ // 璁剧疆璁℃椂鍣紝濡傛灉涓�娈垫椂闂村唴娌℃湁杈撳叆锛屽垯閲嶇疆鎵弿鐘舵��
+ if (this.scanTimer) {
+ clearTimeout(this.scanTimer);
+ }
+ this.scanTimer = setTimeout(() => {
+ this.isScanning = false;
+ }, 100);
+
+ this.lastKeyTime = currentTime;
+ },
+
+ // 鍒犻櫎鐗╂枡
+ removeMaterial(index) {
+ this.$confirm('纭畾瑕佸垹闄よ繖鏉＄墿鏂欒褰曞悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.materials.splice(index, 1);
+ this.$message({
+ type: 'success',
+ message: '鍒犻櫎鎴愬姛!'
+ });
+ this.fetchStockStatistics();
+
+ }).catch(() => {
+ // 鍙栨秷鍒犻櫎
+ });
+ },
+
+ // 娓呯┖鎵�鏈夌墿鏂�
+ clearAllMaterials() {
+ if (this.materials.length === 0) return;
+
+ this.$confirm('纭畾瑕佹竻绌烘墍鏈夌墿鏂欒褰曞悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.materials = [];
+ this.$message({
+ type: 'success',
+ message: '宸叉竻绌烘墍鏈夎褰�!'
+ });
+ }).catch(() => {
+ // 鍙栨秷娓呯┖
+ });
+ },
+
+ // 鏍煎紡鍖栨椂闂�
+ formatTime(date) {
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+ const hours = String(date.getHours()).padStart(2, '0');
+ const minutes = String(date.getMinutes()).padStart(2, '0');
+ const seconds = String(date.getSeconds()).padStart(2, '0');
+
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ }
+ }
}
</script>
<style scoped>
- .barcode-scanner-container {
- max-width: 1200px;
- margin: 0 auto;
- padding: 20px;
- }
- .page-title {
- text-align: center;
- margin-bottom: 30px;
- }
- .input-section {
- margin-bottom: 30px;
- }
- .scan-status {
- float: right;
- font-size: 12px;
- color: #67C23A;
- }
- .scan-indicator {
- display: inline-block;
- width: 10px;
- height: 10px;
- border-radius: 50%;
- background-color: #67C23A;
- margin-right: 5px;
- animation: pulse 1.5s infinite;
- }
- @keyframes pulse {
- 0% { opacity: 1; }
- 50% { opacity: 0.4; }
- 100% { opacity: 1; }
- }
- .input-wrapper {
- position: relative;
- margin-bottom: 15px;
- }
- .input-tips {
- margin-top: 10px;
- font-size: 12px;
- color: #909399;
- }
- .loading {
- text-align: center;
- margin: 20px 0;
- }
- .loading p {
- margin-top: 10px;
- color: #409EFF;
- }
- .error-message {
- margin-bottom: 20px;
- }
- .material-list {
- margin-top: 30px;
- }
- .list-actions {
- float: right;
- }
- .clear-all-btn {
- margin-left: 10px;
- }
- .empty-state {
- text-align: center;
- padding: 40px 0;
- color: #909399;
- }
- .empty-state i {
- font-size: 48px;
- margin-bottom: 10px;
- }
- .material-code {
- font-family: 'Courier New', monospace;
- font-weight: bold;
- color: #409EFF;
- }
- .tray-info {
- background: #f0f9ff;
- padding: 10px 15px;
- border-radius: 4px;
- margin-bottom: 15px;
- border-left: 4px solid #409EFF;
- }
- .debug-info {
- background: #f5f7fa;
- padding: 10px;
- border-radius: 4px;
- margin-top: 10px;
- font-size: 12px;
- color: #909399;
- }
- .small-button {
- padding: 7px 9px;
- font-size: 12px;
- }
+.barcode-scanner-container {
+ max-width: 1200px;
+ margin: 0 auto;
+ padding: 10px;
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ gap: 8px;
+}
+
+/* 绱у噾甯冨眬鏍峰紡 */
+.compact {
+ margin-bottom: 0;
+}
+
+.compact-form {
+ margin-bottom: 0;
+}
+
+.compact-item {
+ margin-bottom: 0;
+}
+
+.compact-card {
+ margin-bottom: 0;
+}
+
+.compact-card>>>.el-card__body {
+ padding: 12px;
+}
+
+.compact-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 !important;
+}
+
+.compact-header>>>.el-card__header {
+ padding: 8px 12px;
+}
+
+.compact-input {
+ margin: 8px 0;
+}
+
+.compact-tips {
+ margin-top: 8px;
+ font-size: 11px;
+}
+
+/* 浠撳簱鍖哄煙閫夋嫨 - 绱у噾 */
+.location-section.compact {
+ margin-bottom: 8px;
+}
+
+.location-section.compact>>>.el-form-item {
+ margin-bottom: 0;
+}
+
+/* 鎵樼洏淇℃伅 - 绱у噾 */
+.tray-info.compact {
+ padding: 6px 10px;
+ margin-bottom: 8px;
+ font-size: 13px;
+}
+
+/* 鎵爜鍖哄煙 - 绱у噾 */
+.input-section.compact {
+ margin-bottom: 8px;
+ flex-shrink: 0;
+}
+
+/* 鐗╂枡鍒楄〃 - 鍥哄畾楂樺害甯︽粴鍔� */
+.material-list.compact {
+ flex: 1;
+ min-height: 0;
+ /* 閲嶈锛氬厑璁竑lex瀛愰」鏀剁缉 */
+ display: flex;
+ flex-direction: column;
+}
+
+.material-list.compact>>>.el-card {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+}
+
+.material-list.compact>>>.el-card__body {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ padding: 0;
+ min-height: 0;
+}
+
+.table-container {
+ flex: 1;
+ min-height: 0;
+ overflow: hidden;
+}
+
+.material-list.compact>>>.el-table {
+ flex: 1;
+}
+
+.material-list.compact>>>.el-table__body-wrapper {
+ overflow-y: auto;
+}
+
+/* 绱у噾鐨勭┖鐘舵�� */
+.empty-state.compact {
+ padding: 20px 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+
+.empty-state.compact i {
+ font-size: 36px;
+ margin-bottom: 8px;
+}
+
+.empty-state.compact p {
+ font-size: 13px;
+}
+
+/* 鍏朵粬鍘熸湁鏍峰紡璋冩暣 */
+.page-title {
+ text-align: center;
+ margin-bottom: 15px;
+}
+
+.scan-status {
+ font-size: 12px;
+ color: #67C23A;
+}
+
+.scan-indicator {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ border-radius: 50%;
+ background-color: #67C23A;
+ margin-right: 5px;
+ animation: pulse 1.5s infinite;
+}
+
+@keyframes pulse {
+ 0% {
+ opacity: 1;
+ }
+
+ 50% {
+ opacity: 0.4;
+ }
+
+ 100% {
+ opacity: 1;
+ }
+}
+
+.input-wrapper {
+ position: relative;
+}
+
+.input-tips {
+ margin-top: 6px;
+ color: #909399;
+}
+
+.warning-text {
+ color: #E6A23C;
+ font-weight: bold;
+}
+
+.loading.compact {
+ text-align: center;
+ margin: 10px 0;
+ padding: 5px;
+}
+
+.loading.compact p {
+ margin-top: 5px;
+ color: #409EFF;
+ font-size: 12px;
+}
+
+.error-message.compact {
+ margin: 5px 0;
+}
+
+.error-message.compact>>>.el-alert {
+ padding: 6px 12px;
+}
+
+.list-actions {
+ display: flex;
+ align-items: center;
+ gap: 4px;
+}
+
+.list-actions>>>.el-tag {
+ height: 24px;
+ line-height: 22px;
+ padding: 0 6px;
+}
+
+.clear-all-btn {
+ margin-left: 8px;
+}
+
+.material-code {
+ font-family: 'Courier New', monospace;
+ font-weight: bold;
+ color: #409EFF;
+}
+
+.location-info {
+ color: #606266;
+ font-weight: normal;
+}
+
+.debug-info {
+ background: #f5f7fa;
+ padding: 8px;
+ border-radius: 4px;
+ margin-top: 8px;
+ font-size: 11px;
+ color: #909399;
+}
+
+.small-button {
+ padding: 6px 8px;
+ font-size: 11px;
+}
+
+/* 杈撳叆妗嗙粍鏍峰紡璋冩暣 */
.custom-input-group {
display: flex;
align-items: center;
width: 100%;
- margin: 20px 0;
+ margin: 8px 0;
border: 1px solid #DCDFE6;
border-radius: 4px;
overflow: hidden;
@@ -784,15 +1321,17 @@
}
.input-label {
- padding: 0 15px;
+ padding: 0 12px;
background: #F5F7FA;
border-right: 1px solid #DCDFE6;
color: #606266;
- font-size: 14px;
+ font-size: 13px;
white-space: nowrap;
- height: 40px;
- line-height: 40px;
+ height: 36px;
+ line-height: 36px;
flex-shrink: 0;
+ min-width: 70px;
+ text-align: center;
}
.input-container {
@@ -805,12 +1344,68 @@
flex: 1;
}
-.custom-input ::v-deep .el-input__inner {
+.custom-input>>>.el-input__inner {
border: none;
border-radius: 0;
- height: 40px;
- line-height: 40px;
+ height: 36px;
+ line-height: 36px;
+ font-size: 13px;
}
-
+/* 鍝嶅簲寮忚皟鏁� */
+@media (max-width: 768px) {
+ .barcode-scanner-container {
+ padding: 5px;
+ }
+
+ .custom-input-group {
+ flex-direction: column;
+ border: none;
+ }
+
+ .input-label {
+ width: 100%;
+ border-right: none;
+ border-bottom: 1px solid #DCDFE6;
+ margin-bottom: 5px;
+ }
+
+ .input-container {
+ width: 100%;
+ border: 1px solid #DCDFE6;
+ border-radius: 4px;
+ }
+
+ .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);
+ }
+}
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3