From 1331e9edaf52ec0820dd1c7efc605127aa3a2c36 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 26 十一月 2025 20:29:28 +0800
Subject: [PATCH] 提交
---
项目代码/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 5
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 2
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue | 13
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 3
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/Pallet.vue | 1985 +++++++++++++++++++++----------------------
项目代码/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js | 695 +++++++-------
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/SelectedStock.vue | 11
项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 2
8 files changed, 1,342 insertions(+), 1,374 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 b976153..db36e69 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,37 +1,16 @@
<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">
-
+ <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 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>
@@ -41,38 +20,26 @@
<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 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 }}
+ | 浠撳簱: {{ 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">
@@ -83,73 +50,45 @@
{{ form.locationType && form.warehouseType ? '鎵爜灏辩华' : '璇峰厛閫夋嫨浠撳簱鍜屼粨搴撳尯鍩�' }}
</span>
</div>
-
+
<!-- 鎵樼洏鏉＄爜杈撳叆 -->
<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"
- >
+ <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"
- :disabled="!form.locationType || !trayBarcode || !form.warehouseType"
- size="medium"
- >
+ <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 compact-input">
<div class="input-label">鐗╂枡鏉＄爜</div>
- <el-input
- ref="barcodeInput"
- v-model="barcode"
- placeholder="璇锋壂鎻忔垨杈撳叆鐗╂枡鏉＄爜鍚庢寜鍥炶溅閿�"
- clearable
+ <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"
- >
+ @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="!form.locationType || !trayBarcode || !barcode || !from.warehouseType"
- size="medium"
- >
+ <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 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>
@@ -161,13 +100,7 @@
<!-- 閿欒鎻愮ず -->
<div v-if="error" class="error-message compact">
- <el-alert
- :title="error"
- type="error"
- show-icon
- closable
- @close="error = ''"
- />
+ <el-alert :title="error" type="error" show-icon closable @close="error = ''" />
</div>
<!-- 鐗╂枡鍒楄〃 - 鍥哄畾楂樺害甯︽粴鍔ㄦ潯 -->
@@ -184,7 +117,7 @@
<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="!form.warehouseType">璇峰厛閫夋嫨浠撳簱</p>
@@ -192,15 +125,9 @@
<p v-else-if="!trayBarcode">璇峰厛杈撳叆鏂欑鏉＄爜</p>
<p v-else>鏆傛棤鐗╂枡鏁版嵁锛岃鎵弿鎴栬緭鍏ョ墿鏂欐潯鐮�</p>
</div>
-
+
<div class="table-container" v-else>
- <el-table
- :data="materials"
- stripe
- style="width: 100%"
- height="100%"
- size="small"
- >
+ <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>
@@ -214,19 +141,19 @@
</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';
@@ -241,50 +168,50 @@
data() {
return {
- palletVisible: this.visible,
- trayBarcode: '',
- barcode: '',
- materials: [],
- loading: false,
- error: '',
- debugMode: false,
- currentFocus: 'warehouse',
-
- // 鎵爜鏋浉鍏冲彉閲�
- scanCode: '',
- lastKeyTime: null,
- isManualInput: false,
- isScanning: false,
- scanTimer: null,
- manualInputTimer: null,
- scanTarget: 'tray', // 褰撳墠鎵爜鐩爣: tray 鎴� material
+ palletVisible: this.visible,
+ trayBarcode: '',
+ barcode: '',
+ materials: [],
+ loading: false,
+ error: '',
+ debugMode: false,
+ currentFocus: 'warehouse',
- // 搴撳瓨缁熻鐩稿叧鍙橀噺
- 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'
- }
- ],
- warehouseType: [
- {
- massage:'璇烽�夋嫨浠撳簱',
+ // 鎵爜鏋浉鍏冲彉閲�
+ 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'
+ }
+ ],
+ warehouseType: [
+ {
+ massage: '璇烽�夋嫨浠撳簱',
trigger: 'change'
}
]
@@ -297,44 +224,44 @@
set(newVal) { this.$emit('update:visible', newVal); }
},
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 : ''
+ 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();
- this.initwarehouseTypes(); // 鍒濆鍖栦粨搴�
- this.initLocationTypes(); // 鍒濆鍖栦粨搴撳尯鍩�
- this.fetchStockStatistics(); // 鍔犺浇缁熻鏁版嵁
- }, 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(); // 鍔犺浇缁熻鏁版嵁
+ }, 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: '' };
@@ -345,160 +272,160 @@
}
},
'form.warehouseType'(newVal) {
- if (newVal) {
- this.form.locationType = null;
+ 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
+*/
+ 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 {
- this.locationTypes = [];
+ callback();
+ }
+ },
+ /**
+ * 鍒濆鍖栦粨搴撳尯鍩熸暟鎹�
+ */
+ 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;
}
},
- 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 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 = '';
- /**
- * 鍒濆鍖栦粨搴撴暟鎹�
- */
- 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;
- }
- },
+ 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);
- }
- });
-},
+ /**
+ * 浠撳簱鍖哄煙鍙樻洿澶勭悊
+ */
+ handleLocationChange(value) {
+ console.log('閫夋嫨浠撳簱鍖哄煙:', value, '绫诲瀷:', typeof value, this.currentLocationDesc);
-/**
- * 浠撳簱鍙樻洿澶勭悊
- */
-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);
- }
- });
-},
-
+ // 绔嬪嵆娓呴櫎閿欒淇℃伅
+ 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) {
@@ -510,8 +437,8 @@
this.sumError = '';
try {
// 璋冪敤鍚庣缁熻鎺ュ彛锛堟浛鎹负浣犵殑瀹為檯鎺ュ彛璺緞锛�
- const response = await http.post('/api/InboundOrder/UnPalletQuantity?orderNo='+this.docNo, {
-
+ const response = await http.post('/api/InboundOrder/UnPalletQuantity?orderNo=' + this.docNo, {
+
});
// 缁戝畾鏁版嵁锛堝尮閰� PalletSumQuantityDTO 缁撴瀯锛�
@@ -529,82 +456,91 @@
this.sumLoading = false;
}
},
-/**
- * 琛ㄥ崟楠岃瘉
- */
-async validateForm() {
- return new Promise((resolve) => {
- if (!this.$refs.locationForm) {
- this.error = '琛ㄥ崟鏈垵濮嬪寲';
- this.$message.warning('璇峰厛閫夋嫨浠撳簱鍖哄煙');
- resolve(false);
- return;
- }
+ /**
+ * 琛ㄥ崟楠岃瘉
+ */
+ 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='璇峰厛閫夋嫨浠撳簱';
+ 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';
}
- 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';
- }
- }
- },
-
- // 鑱氱劍鍒扮墿鏂欒緭鍏ユ
- 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';
- }
- }
- },
- // 閲嶇疆鎵�鏈夋暟鎹�
+ },
+ // 鑱氱劍鍒颁粨搴撳尯鍩熼�夋嫨
+ 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';
+ }
+ }
+ },
+
+ // 鑱氱劍鍒扮墿鏂欒緭鍏ユ
+ 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 = '';
@@ -623,20 +559,20 @@
this.totalStockCount = 0;
this.sumLoading = false;
this.sumError = '';
- this.form={
- warehouseType:null,
- locationType:null
+ this.form = {
+ warehouseType: null,
+ locationType: null
+ }
+ this.warehouseTypes = [];
+ this.locationTypes = [];
+ // 娓呴櫎琛ㄥ崟楠岃瘉鐘舵��
+ this.$nextTick(() => {
+ if (this.$refs.locationForm) {
+ this.$refs.locationForm.clearValidate();
}
- this.warehouseTypes=[];
- this.locationTypes=[];
- // 娓呴櫎琛ㄥ崟楠岃瘉鐘舵��
- this.$nextTick(() => {
- if (this.$refs.locationForm) {
- this.$refs.locationForm.clearValidate();
- }
- });
+ });
},
-
+
// 娓呴櫎鎵�鏈夎鏃跺櫒
clearAllTimers() {
if (this.manualInputTimer) {
@@ -648,7 +584,7 @@
this.scanTimer = null;
}
},
-
+
// 寮规鎵撳紑鏃堕噸缃暟鎹�
handleDialogOpen() {
console.log('寮规鎵撳紑锛岄噸缃暟鎹�');
@@ -656,676 +592,691 @@
// 浣跨敤setTimeout纭繚DOM瀹屽叏娓叉煋鍚庡啀鑱氱劍
this.$nextTick(() => {
setTimeout(() => {
- this.initwarehouseTypes();
- this.initLocationTypes(); // 鍒濆鍖栦粨搴撳尯鍩�
- // 纭繚琛ㄥ崟寮曠敤瀛樺湪鍚庡啀鑱氱劍
- if (this.$refs.locationForm) {
- this.focusWarehouseSelect();
- } else {
- // 濡傛灉琛ㄥ崟寮曠敤杩樹笉瀛樺湪锛岀◢鍚庨噸璇�
- setTimeout(() => {
- this.focusWarehouseSelect();
- }, 500);
- }
+ 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;
},
-
+
// 纭鎸夐挳
- async handleConfirm() {
- if (!await this.validateForm()) return;
+ 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,
+ 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;
},
// 澶勭悊鎵樼洏杈撳叆
- 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;
- }
+ handleTrayInput() {
+ // 鏍囪涓烘墜鍔ㄨ緭鍏ユā寮�
+ this.isManualInput = true;
+ this.isScanning = false;
- this.error = '';
-
- // 璁剧疆鎵樼洏鏉＄爜鍚庯紝鑷姩鑱氱劍鍒扮墿鏂欒緭鍏ユ
- this.focusBarcodeInput();
-
- this.$message({
- message: `鎵樼洏鏉＄爜宸茶缃�: ${currentTrayBarcode}`,
- type: 'success',
- duration: 2000
- });
-},
-
- // 娓呴櫎鎵樼洏
- clearTray() {
- this.trayBarcode = '';
- this.materials = [];
- this.focusTrayInput();
+ // 娓呴櫎涔嬪墠鐨勮鏃跺櫒
+ 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 = '';
+
+ // 璁剧疆鎵樼洏鏉＄爜鍚庯紝鑷姩鑱氱劍鍒扮墿鏂欒緭鍏ユ
+ 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: 'info',
+ message: '璇ユ潯鐮佸凡瀛樺湪褰撳墠鎵樼洏鐨勫垪琛ㄤ腑',
+ type: 'warning',
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;
- }
+ } else {
- this.error = '';
- this.loading = true;
+ materialData.forEach(item => {
- 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,
- locationType: this.form.locationType,
- locationDesc: this.currentLocationDesc,
- scanTime: this.formatTime(new Date())
+ // 濡傛灉涓嶅瓨鍦紝娣诲姞鏂扮墿鏂�
+ this.materials.push({
+ ...item,
+ trayCode: this.trayBarcode,
+ locationType: this.form.locationType,
+ locationDesc: this.currentLocationDesc,
+ scanTime: this.formatTime(new Date())
+ });
});
- });
-
-
-
-
- this.$message({
- message: `鎴愬姛娣诲姞鏉＄爜: ${currentBarcode}`,
- type: 'success',
- duration: 2000
- });
-
- this.fetchStockStatistics();
- // 娓呯┖鐗╂枡杈撳叆妗嗗苟淇濇寔鑱氱劍
- 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',
- {
+
+ this.$message({
+ message: `鎴愬姛娣诲姞鏉＄爜: ${currentBarcode}`,
+ type: 'success',
+ duration: 2000
+ });
+
+ this.fetchStockStatistics();
+ // 娓呯┖鐗╂枡杈撳叆妗嗗苟淇濇寔鑱氱劍
+ this.barcode = '';
+ this.scanCode = ''; // 娓呯┖鎵爜缂撳瓨
+ this.isScanning = false;
+
+ 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;
+ }
+ },
+
+ // API璇锋眰 - 鏇挎崲涓哄疄闄呯殑API璋冪敤
+ async fetchMaterialData(barcode) {
+ try {
+ const response = await http.post('/api/InboundOrder/BarcodeMaterielGroup',
+ {
palletCode: this.trayBarcode,
orderNo: this.docNo,
barcodes: barcode,
- locationTypeDesc: this.currentLocationDesc,
+ locationTypeDesc: this.currentLocationDesc,
locationType: this.form.locationType, // 娣诲姞浠撳簱鍖哄煙淇℃伅
- warehouseType:this.form.warehouseType
- }
+ 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 || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
- }
+ if (!response.status) {
+ this.error = response.message || '鏌ヨ鏉＄爜淇℃伅澶辫触锛岃閲嶈瘯';
+ }
- return materialData;
-
+ return materialData;
+
} catch (error) {
console.error('API璋冪敤澶辫触:', error);
-
-
- }
- },
-
- // 澶勭悊鎵爜鏋緭鍏�
- 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();
- }
- }
- 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}`;
- }
+
}
+ },
+
+ // 澶勭悊鎵爜鏋緭鍏�
+ 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();
+ }
+ }
+ 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: 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;
- }
+.barcode-scanner-container {
+ max-width: 1200px;
+ margin: 0 auto;
+ padding: 10px;
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ gap: 8px;
+}
- /* 杈撳叆妗嗙粍鏍峰紡璋冩暣 */
- .custom-input-group {
- display: flex;
- align-items: center;
- width: 100%;
- margin: 8px 0;
- border: 1px solid #DCDFE6;
- border-radius: 4px;
- overflow: hidden;
- background: #fff;
- }
+/* 绱у噾甯冨眬鏍峰紡 */
+.compact {
+ margin-bottom: 0;
+}
- .input-label {
- padding: 0 12px;
- background: #F5F7FA;
- border-right: 1px solid #DCDFE6;
- color: #606266;
- font-size: 13px;
- white-space: nowrap;
- height: 36px;
- line-height: 36px;
- flex-shrink: 0;
- min-width: 70px;
- text-align: center;
- }
+.compact-form {
+ margin-bottom: 0;
+}
- .input-container {
- display: flex;
- flex: 1;
- align-items: center;
- }
+.compact-item {
+ margin-bottom: 0;
+}
- .custom-input {
- flex: 1;
- }
+.compact-card {
+ margin-bottom: 0;
+}
- .custom-input >>> .el-input__inner {
- border: none;
- border-radius: 0;
- 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;
- }
- }
+.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: 8px 0;
+ border: 1px solid #DCDFE6;
+ border-radius: 4px;
+ overflow: hidden;
+ background: #fff;
+}
+
+.input-label {
+ padding: 0 12px;
+ background: #F5F7FA;
+ border-right: 1px solid #DCDFE6;
+ color: #606266;
+ font-size: 13px;
+ white-space: nowrap;
+ height: 36px;
+ line-height: 36px;
+ flex-shrink: 0;
+ min-width: 70px;
+ text-align: center;
+}
+
+.input-container {
+ display: flex;
+ flex: 1;
+ align-items: center;
+}
+
+.custom-input {
+ flex: 1;
+}
+
+.custom-input>>>.el-input__inner {
+ border: none;
+ border-radius: 0;
+ 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;
+ }
+}
</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/SelectedStock.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/SelectedStock.vue"
index d0ef793..2050161 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/SelectedStock.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/SelectedStock.vue"
@@ -182,14 +182,19 @@
"鏌ヨ涓�"
)
.then((x) => {
-
var label=[
{ label: '宸插垎閰�', value: 0 },
{ label: '鍑哄簱涓�', value: 1 },
- { label: '鍑哄簱瀹屾垚', value: 2 },
- { label: '鎷ｉ�夊畬鎴�', value: 3 },
+ { label: '閮ㄥ垎鎷ｉ��', value: 2 },
+ { label: '宸叉嫞閫�', value: 3 },
+ { label: '宸插嚭搴�', value: 4 },
+ { label: '鍑哄簱瀹屾垚', value: 5 },
+ { label: '鎷ｉ�夊畬鎴�', value: 6 },
+ { label: '鍥炲簱涓�', value: 7 },
+ { label: '宸插洖搴�', value: 8 },
{ label: '鎾ら攢', value: 99 }
]
+
this.tableData=x.map((i) => ({
...i,
status:label.find((j) => j.value === i.status).label
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue"
index bbb9cdb..0b599d2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/SelectedStock.vue"
@@ -190,12 +190,17 @@
.then((x) => {
var label=[
- { label: '宸插垎閰�', value: 0 },
+ { label: '宸插垎閰�', value: 0 },
{ label: '鍑哄簱涓�', value: 1 },
- { label: '鍑哄簱瀹屾垚', value: 2 },
- { label: '鎷ｉ�夊畬鎴�', value: 3 },
+ { label: '閮ㄥ垎鎷ｉ��', value: 2 },
+ { label: '宸叉嫞閫�', value: 3 },
+ { label: '宸插嚭搴�', value: 4 },
+ { label: '鍑哄簱瀹屾垚', value: 5 },
+ { label: '鎷ｉ�夊畬鎴�', value: 6 },
+ { label: '鍥炲簱涓�', value: 7 },
+ { label: '宸插洖搴�', value: 8 },
{ label: '鎾ら攢', value: 99 }
- ]
+ ];
this.tableData=x.map((i) => ({
...i,
status:label.find((j) => j.value === i.status).label
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
index 2e9ea3c..e8aff0e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
@@ -1,365 +1,366 @@
//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
import http from '@/api/http.js'
-import { h,createVNode, render,reactive ,ref } from 'vue';
-import { ElDialog , ElForm, ElFormItem, ElInput, ElButton, ElMessage ,ElSelect, ElOption} from 'element-plus';
+import { h, createVNode, render, reactive, ref } from 'vue';
+import { ElDialog, ElForm, ElFormItem, ElInput, ElButton, ElMessage, ElSelect, ElOption } from 'element-plus';
import gridBody from './extend/outOrderDetail.vue'
let extension = {
- components: {
- //鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
- gridBody: gridBody,
- gridFooter: '',
- //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
- modelHeader: '',
- modelBody: '',
- modelFooter: ''
- },
- tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
- buttons: { view: [
- /* {
- name: '鍑哄簱',
- type: 'primary',
- value: '鍑哄簱',
- onClick: function () { // 淇锛氱敤ElMessage鏇夸唬this.$message
- const selectedRows = this.$refs.table.getSelected();
- if (selectedRows.length === 0) {
- ElMessage.warning('璇峰厛閫夋嫨瑕佺敓鎴愪换鍔＄殑琛�');
- return;
- }
- if (selectedRows.length > 1) {
- ElMessage.warning('鍙兘閫夋嫨涓�琛�');
- return;
- }
-
-
- // 鎵�鏈夋牎楠岄�氳繃锛岃Е鍙戜富缁勪欢鎵撳紑鍑哄簱寮圭獥
- console.log('鎵�鏈夋牎楠岄�氳繃锛岃Е鍙憃penOutboundDialog浜嬩欢锛屽崟鎹暟鎹細', selectedRows[0]);
-
- this.$emit('openOutboundDialog', {
- transNo: selectedRows[0].transNo, // 鍑哄簱鍗曠紪鍙�
- createDate: selectedRows[0].createDate || new Date().toLocaleDateString() // 鍑哄簱鏃ユ湡
- });
- }
- }, */
- {
- name: '绌烘墭鐩樺嚭搴�',
- type: 'primary',
- value: '绌烘墭鐩樺嚭搴�',
- onClick: function () {
-
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: gridBody,
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: {
+ view: [
+ /* {
+ name: '鍑哄簱',
+ type: 'primary',
+ value: '鍑哄簱',
+ onClick: function () { // 淇锛氱敤ElMessage鏇夸唬this.$message
+ const selectedRows = this.$refs.table.getSelected();
+ if (selectedRows.length === 0) {
+ ElMessage.warning('璇峰厛閫夋嫨瑕佺敓鎴愪换鍔＄殑琛�');
+ return;
+ }
+ if (selectedRows.length > 1) {
+ ElMessage.warning('鍙兘閫夋嫨涓�琛�');
+ return;
+ }
- const platformOptions = Array.from({ length: 1 }, (_, i) => {
- const num = 1;
- return { label: `绔欏彴${num}`, value: `1-2` };
- });
- const quantityOptions = Array.from({ length: 6 }, (_, i) => ({
- label: (i + 1).toString(),
- value: i + 1
- }));
-
- const warehouseOptions = ref([]);
- const isLoadingWarehouses = ref(false);
-
- const getWarehouseList = async () => {
- isLoadingWarehouses.value = true;
- try {
- const { data, status } = await http.post('/api/LocationInfo/GetLocationTypes');
- if (status && Array.isArray(data)) {
- // 鏍煎紡鍖栦粨搴撻�夐」锛氶�傞厤ElSelect鐨刲abel-value鏍煎紡
- warehouseOptions.value = data.map(item => ({
- label: item.locationTypeDesc,
- value: item.locationType
- }));
- } else {
- ElMessage.error('鑾峰彇鍖哄煙鍒楄〃澶辫触');
- warehouseOptions.value = [];
- }
- } catch (err) {
- ElMessage.error('鍖哄煙鏁版嵁璇锋眰寮傚父锛岃绋嶅悗閲嶈瘯');
- warehouseOptions.value = [];
- } finally {
- isLoadingWarehouses.value = false;
- }
- };
-
- const mountNode = document.createElement('div');
- document.body.appendChild(mountNode);
-
-
- const formData = reactive({
- warehouseCode:'',
- palletCode: '',
- selectedPlatform: platformOptions[0].value,
- quantity:1
- });
-
- const vnode = createVNode(ElDialog, {
- title: '绌烘墭鐩樺嚭搴�',
- width: '500px',
- modelValue: true,
- appendToBody: true,
- onOpened: async () => {
- await getWarehouseList();
- const inputRef = vnode.component.refs.boxCodeInput;
- inputRef?.focus();
- },
- 'onUpdate:modelValue': (isVisible) => {
- if (!isVisible) {
- render(null, mountNode);
- document.body.removeChild(mountNode);
- }
- },
- style: {
- padding: '20px 0',
- borderRadius: '8px'
- }
- }, {
- default: () => h(ElForm, {
- model: formData,
- rules: {
- warehouseCode:[
- { required: true, message: '璇烽�夋嫨鍖哄煙', trigger: ['change', 'blur'] }
- ],
- palletCode: [
- { type: 'string', message: '鏂欑鍙峰繀椤讳负瀛楃涓�', trigger: 'blur' }
- ],
- selectedPlatform: [
- { required: true, message: '璇烽�夋嫨鍑哄簱绔欏彴', trigger: 'change' }
- ],
- quantity:[
- { required: true, message: '璇烽�夋嫨绌虹鏁伴噺', trigger: 'change'}
- ]
- },
- ref: 'batchOutForm',
- labelWidth: '100px',
- style: {
- padding: '0 30px',
- }
- },
- [
- // h(ElFormItem, {
- // label: '浠撳簱鍖哄煙',
- // prop: 'warehouseCode',
- // style: {
- // marginBottom: '24px'
- // }
- // }, [
- // h(ElSelect, {
- // placeholder: '璇烽�夋嫨浠撳簱鍖哄煙',
- // modelValue: formData.warehouseCode,
- // 'onUpdate:modelValue': (val) => {
- // formData.warehouseCode = val;
- // },
- // style: {
- // width: '100%',
- // height: '40px',
- // borderRadius: '4px',
- // borderColor: '#dcdfe6'
- // }
- // }, warehouseOptions.value.map(platform =>
- // h(ElOption, { label: platform.label, value: platform.value })
- // ))
- // ]),
- h(ElFormItem, {
- label: '鍑哄簱绔欏彴',
- prop: 'selectedPlatform',
- style: {
- marginBottom: '24px'
- }
- }, [
- h(ElSelect, {
- placeholder: '璇烽�夋嫨鍑哄簱绔欏彴',
- modelValue: formData.selectedPlatform,
- 'onUpdate:modelValue': (val) => {
- formData.selectedPlatform = val;
- },
- style: {
- width: '100%',
- height: '40px',
- borderRadius: '4px',
- borderColor: '#dcdfe6'
- }
- }, platformOptions.map(platform =>
- h(ElOption, { label: platform.label, value: platform.value })
- ))
- ]),
- // h(ElFormItem,{
- // label:'鍑哄簱鏁伴噺',
- // prop:'quantity',
- // style:{
- // marginBottom:'24px'
- // }
- // },[h(ElSelect,{
- // placeholder:'璇烽�夋嫨绌虹鏁伴噺',
- // modelValue:formData.quantity,
- // 'onUpdate:modelValue':(val)=>{
- // formData.quantity=val;
- // },
- // style:{
- // width:'100%',
- // height:'40px',
- // borderRadius:'4px',
- // borderColor:'#dcdfe6'
- // },
- // filterable:false
- // },
- // quantityOptions.map(option=>
- // h(ElOption,{
- // label:option.label,
- // value:option.value
- // })
- // )
- // )]),
- h(ElFormItem, {
- label: '鏂欑鍙�',
- prop: 'palletCode',
- style: {
- marginBottom: '16px'
- }
- }, [
- h(ElInput, {
- type: 'text',
- placeholder: '鍙�夎緭鍏ユ枡绠卞彿锛屼笉濉垯鑷姩鍒嗛厤绌烘枡绠�',
- modelValue: formData.palletCode,
- 'onUpdate:modelValue': (val) => {
- formData.palletCode = val;
- },
- style: {
- width: '100%',
- height: '40px',
- borderRadius: '4px',
- borderColor: '#dcdfe6'
- },
- attrs: {
- placeholderStyle: 'color: #909399;'
- }
- })
- ]),
+ // 鎵�鏈夋牎楠岄�氳繃锛岃Е鍙戜富缁勪欢鎵撳紑鍑哄簱寮圭獥
+ console.log('鎵�鏈夋牎楠岄�氳繃锛岃Е鍙憃penOutboundDialog浜嬩欢锛屽崟鎹暟鎹細', selectedRows[0]);
- h('div', {
- style: {
- textAlign: 'right',
- marginTop: '8px',
- paddingRight: '4px'
- }
- }, [
- h(ElButton, {
- type: 'text',
- onClick: () => {
- render(null, mountNode);
- document.body.removeChild(mountNode);
- ElMessage.info('鍙栨秷鍑哄簱鎿嶄綔');
- },
- style: {
- marginRight: '8px',
- color: '#606266'
- }
- }, '鍙栨秷'),
- h(ElButton, {
- type: 'primary',
- onClick: async () => {
- const formRef = vnode.component.refs.batchOutForm;
- try {
- await formRef.validate();
- } catch (err) {
- return;
+ this.$emit('openOutboundDialog', {
+ transNo: selectedRows[0].transNo, // 鍑哄簱鍗曠紪鍙�
+ createDate: selectedRows[0].createDate || new Date().toLocaleDateString() // 鍑哄簱鏃ユ湡
+ });
+ }
+ }, */
+ {
+ name: '绌烘墭鐩樺嚭搴�',
+ type: 'primary',
+ value: '绌烘墭鐩樺嚭搴�',
+ onClick: function () {
+
+
+ const platformOptions = Array.from({ length: 1 }, (_, i) => {
+ const num = 1;
+ return { label: `绔欏彴${num}`, value: `1-2` };
+ });
+
+ const quantityOptions = Array.from({ length: 6 }, (_, i) => ({
+ label: (i + 1).toString(),
+ value: i + 1
+ }));
+
+ const warehouseOptions = ref([]);
+ const isLoadingWarehouses = ref(false);
+
+ const getWarehouseList = async () => {
+ isLoadingWarehouses.value = true;
+ try {
+ const { data, status } = await http.post('/api/LocationInfo/GetLocationTypes');
+ if (status && Array.isArray(data)) {
+ // 鏍煎紡鍖栦粨搴撻�夐」锛氶�傞厤ElSelect鐨刲abel-value鏍煎紡
+ warehouseOptions.value = data.map(item => ({
+ label: item.locationTypeDesc,
+ value: item.locationType
+ }));
+ } else {
+ ElMessage.error('鑾峰彇鍖哄煙鍒楄〃澶辫触');
+ warehouseOptions.value = [];
}
+ } catch (err) {
+ ElMessage.error('鍖哄煙鏁版嵁璇锋眰寮傚父锛岃绋嶅悗閲嶈瘯');
+ warehouseOptions.value = [];
+ } finally {
+ isLoadingWarehouses.value = false;
+ }
+ };
- http.post('/api/Task/PalletOutboundTask?palletCode='+formData.palletCode+'&endStation='+formData.selectedPlatform, {
-
- }).then(({ data, status, message }) => {
- if (status) {
+ const mountNode = document.createElement('div');
+ document.body.appendChild(mountNode);
- ElMessage.success(`鍑哄簱鎴愬姛`);
- this.refresh();
- render(null, mountNode);
- document.body.removeChild(mountNode);
- } else {
- ElMessage.error(message || data?.message || '鍑哄簱澶辫触');
- }
- }).catch(() => {
- ElMessage.error('璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯');
- });
+
+ const formData = reactive({
+ warehouseCode: '',
+ palletCode: '',
+ selectedPlatform: platformOptions[0].value,
+ quantity: 1
+ });
+
+ const vnode = createVNode(ElDialog, {
+ title: '绌烘墭鐩樺嚭搴�',
+ width: '500px',
+ modelValue: true,
+ appendToBody: true,
+ onOpened: async () => {
+ await getWarehouseList();
+ const inputRef = vnode.component.refs.boxCodeInput;
+ inputRef?.focus();
+ },
+ 'onUpdate:modelValue': (isVisible) => {
+ if (!isVisible) {
+ render(null, mountNode);
+ document.body.removeChild(mountNode);
+ }
},
style: {
- borderRadius: '4px',
- padding: '8px 20px'
+ padding: '20px 0',
+ borderRadius: '8px'
}
- }, '纭畾')
- ])
- ])
- });
+ }, {
+ default: () => h(ElForm, {
+ model: formData,
+ rules: {
+ warehouseCode: [
+ { required: true, message: '璇烽�夋嫨鍖哄煙', trigger: ['change', 'blur'] }
+ ],
+ palletCode: [
+ { type: 'string', message: '鏂欑鍙峰繀椤讳负瀛楃涓�', trigger: 'blur' }
+ ],
+ selectedPlatform: [
+ { required: true, message: '璇烽�夋嫨鍑哄簱绔欏彴', trigger: 'change' }
+ ],
+ quantity: [
+ { required: true, message: '璇烽�夋嫨绌虹鏁伴噺', trigger: 'change' }
+ ]
+ },
+ ref: 'batchOutForm',
+ labelWidth: '100px',
+ style: {
+ padding: '0 30px',
+ }
+ },
+ [
+ // h(ElFormItem, {
+ // label: '浠撳簱鍖哄煙',
+ // prop: 'warehouseCode',
+ // style: {
+ // marginBottom: '24px'
+ // }
+ // }, [
+ // h(ElSelect, {
+ // placeholder: '璇烽�夋嫨浠撳簱鍖哄煙',
+ // modelValue: formData.warehouseCode,
+ // 'onUpdate:modelValue': (val) => {
+ // formData.warehouseCode = val;
+ // },
+ // style: {
+ // width: '100%',
+ // height: '40px',
+ // borderRadius: '4px',
+ // borderColor: '#dcdfe6'
+ // }
+ // }, warehouseOptions.value.map(platform =>
+ // h(ElOption, { label: platform.label, value: platform.value })
+ // ))
+ // ]),
+ h(ElFormItem, {
+ label: '鍑哄簱绔欏彴',
+ prop: 'selectedPlatform',
+ style: {
+ marginBottom: '24px'
+ }
+ }, [
+ h(ElSelect, {
+ placeholder: '璇烽�夋嫨鍑哄簱绔欏彴',
+ modelValue: formData.selectedPlatform,
+ 'onUpdate:modelValue': (val) => {
+ formData.selectedPlatform = val;
+ },
+ style: {
+ width: '100%',
+ height: '40px',
+ borderRadius: '4px',
+ borderColor: '#dcdfe6'
+ }
+ }, platformOptions.map(platform =>
+ h(ElOption, { label: platform.label, value: platform.value })
+ ))
+ ]),
+ // h(ElFormItem,{
+ // label:'鍑哄簱鏁伴噺',
+ // prop:'quantity',
+ // style:{
+ // marginBottom:'24px'
+ // }
+ // },[h(ElSelect,{
+ // placeholder:'璇烽�夋嫨绌虹鏁伴噺',
+ // modelValue:formData.quantity,
+ // 'onUpdate:modelValue':(val)=>{
+ // formData.quantity=val;
+ // },
+ // style:{
+ // width:'100%',
+ // height:'40px',
+ // borderRadius:'4px',
+ // borderColor:'#dcdfe6'
+ // },
+ // filterable:false
+ // },
+ // quantityOptions.map(option=>
+ // h(ElOption,{
+ // label:option.label,
+ // value:option.value
+ // })
+ // )
+ // )]),
+ h(ElFormItem, {
+ label: '鏂欑鍙�',
+ prop: 'palletCode',
+ style: {
+ marginBottom: '16px'
+ }
+ }, [
+ h(ElInput, {
+ type: 'text',
+ placeholder: '鍙�夎緭鍏ユ枡绠卞彿锛屼笉濉垯鑷姩鍒嗛厤绌烘枡绠�',
+ modelValue: formData.palletCode,
+ 'onUpdate:modelValue': (val) => {
+ formData.palletCode = val;
+ },
+ style: {
+ width: '100%',
+ height: '40px',
+ borderRadius: '4px',
+ borderColor: '#dcdfe6'
+ },
+ attrs: {
+ placeholderStyle: 'color: #909399;'
+ }
+ })
+ ]),
- vnode.appContext = this.$.appContext;
- render(vnode, mountNode);
- }
-}
- ], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
- methods: {
- //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
- onInit() {
- //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
- this.columns.push({
- field: '鎿嶄綔',
- title: '鎿嶄綔',
- width: 90,
- fixed: 'right',
- align: 'center',
- formatter: (row) => {
- return (
- '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅鏄庣粏</i>'
- );
- },
- click: (row) => {
- const table = this.$refs.table.$refs.table;
- if(table){
- table.clearSelection();
- table.toggleRowSelection(row,true);
- }
- const rowId =row.id;
- console.log(rowId);
- this.$refs.gridBody.open(row);
- }
- });
- },
- onInited() {
- //妗嗘灦鍒濆鍖栭厤缃悗
- //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
- //this.detailOptions.columns.forEach(column=>{ });
- },
- searchBefore(param) {
- //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
- //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
- return true;
- },
- searchAfter(result) {
- //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
- return true;
- },
- addBefore(formData) {
- //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
- return true;
- },
- updateBefore(formData) {
- //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
- return true;
- },
- rowClick({ row, column, event }) {
- //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
- this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
- },
- modelOpenAfter(row) {
- //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
- //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
- //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
- //(3)this.editFormFields.瀛楁='xxx';
- //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
- //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+ h('div', {
+ style: {
+ textAlign: 'right',
+ marginTop: '8px',
+ paddingRight: '4px'
+ }
+ }, [
+ h(ElButton, {
+ type: 'text',
+ onClick: () => {
+ render(null, mountNode);
+ document.body.removeChild(mountNode);
+ ElMessage.info('鍙栨秷鍑哄簱鎿嶄綔');
+ },
+ style: {
+ marginRight: '8px',
+ color: '#606266'
+ }
+ }, '鍙栨秷'),
+ h(ElButton, {
+ type: 'primary',
+ onClick: async () => {
+ const formRef = vnode.component.refs.batchOutForm;
+ try {
+ await formRef.validate();
+ } catch (err) {
+ return;
+ }
+
+ http.post('/api/Task/PalletOutboundTask?palletCode=' + formData.palletCode + '&endStation=' + formData.selectedPlatform, {
+
+ }).then(({ data, status, message }) => {
+ if (status) {
+
+ ElMessage.success(`鍑哄簱鎴愬姛`);
+ this.refresh();
+ render(null, mountNode);
+ document.body.removeChild(mountNode);
+ } else {
+ ElMessage.error(message || data?.message || '鍑哄簱澶辫触');
+ }
+ }).catch(() => {
+ ElMessage.error('璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯');
+ });
+ },
+ style: {
+ borderRadius: '4px',
+ padding: '8px 20px'
+ }
+ }, '纭畾')
+ ])
+ ])
+ });
+
+ vnode.appContext = this.$.appContext;
+ render(vnode, mountNode);
+ }
}
+ ], box: [], detail: []
+ }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
+ //鎵╁睍椤甸潰鍒濆鍖栨搷浣�
+ this.columns.push({
+ field: '鎿嶄綔',
+ title: '鎿嶄綔',
+ width: 90,
+ fixed: 'right',
+ align: 'center',
+ formatter: (row) => {
+ return (
+ '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅鏄庣粏</i>'
+ );
+ },
+ click: (row) => {
+ const table = this.$refs.table.$refs.table;
+ if (table) {
+ table.clearSelection();
+ table.toggleRowSelection(row, true);
+ }
+ const rowId = row.id;
+ console.log(rowId);
+ this.$refs.gridBody.open(row);
+ }
+ });
+ },
+ onInited() {
+ //妗嗘灦鍒濆鍖栭厤缃悗
+ //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
+ //this.detailOptions.columns.forEach(column=>{ });
+ },
+ searchBefore(param) {
+ //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
+ //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+ return true;
+ },
+ searchAfter(result) {
+ //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
+ return true;
+ },
+ addBefore(formData) {
+ //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
+ return true;
+ },
+ updateBefore(formData) {
+ //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
+ return true;
+ },
+ rowClick({ row, column, event }) {
+ //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
+ this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+ },
+ modelOpenAfter(row) {
+ //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
+ //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
+ //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
+ //(3)this.editFormFields.瀛楁='xxx';
+ //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
+ //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
}
- };
- export default extension;
-
\ No newline at end of file
+ }
+};
+export default extension;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index e4defc7..1b81cea 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -57,6 +57,7 @@
type: "select",
dataKey: "inOrderType",
data: [],
+ hidden:true
},
{
field: "inboundOrderNo",
@@ -94,6 +95,7 @@
type: "select",
dataKey: "inOrderType",
data: [0],
+ hidden:true
},
{
title: "鍗曟嵁鐘舵��",
@@ -148,6 +150,7 @@
width: 150,
align: "left",
bind: { key: "inOrderType", data: [] },
+ hidden:true
},
{
field: "businessType",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index 270d8d1..47ab893 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -114,6 +114,7 @@
type: "select",
dataKey: "outOrderType",
data: [],
+ hidden:true
},
{
title: "鍗曟嵁鐘舵��",
@@ -168,6 +169,7 @@
width: 150,
align: "left",
bind: { key: "outOrderType", data: [] },
+ hidden:true
},
{
field: "businessType",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index a84110c..8d1282f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -92,6 +92,7 @@
width: 100,
align: "left",
bind: { key: "warehouses", data: [] },
+ hidden:true
},
{
field: "creater",
@@ -113,7 +114,7 @@
type: "string",
width: 100,
align: "left",
- hidden:true
+ // hidden:true
},
{
field: "modifyDate",
@@ -121,7 +122,7 @@
type: "datetime",
width: 160,
align: "left",
- hidden:true
+ // hidden:true
},
{
field: "remark",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index e117602..9daf138 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -647,7 +647,7 @@
{
return WebResponseContent.Instance.Error("鎵樼洏鍙蜂笉鑳戒负绌�");
}
- var stock= _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(o=>o.Details).First(x => x.PalletCode == palletCode );
+ var stock= _stockRepository.Db.Queryable<Dt_StockInfo>().Includes(o=>o.Details).First(x => x.PalletCode == palletCode && x.StockStatus ==(int)StockStatusEmun.缁勭洏鏆傚瓨);
if (stock == null)
{
return WebResponseContent.Instance.Error($"鏈壘鍒版墭鐩樺彿{palletCode}瀵瑰簲鐨勫簱瀛樿褰�");
--
Gitblit v1.9.3