From 68e75f8e483accd14d34ea64e228678c58b498bc Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 22 一月 2026 21:46:38 +0800
Subject: [PATCH] 虚拟出入库合单优化
---
项目代码/WIDESEA_WMSClient/src/views/Home.vue | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Home.vue"
index 4189cf2..d941502 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/Home.vue"
@@ -31,7 +31,7 @@
<Download />
</el-icon>
</div>
- <div class="card-title">浠婃棩鍏ュ簱瀹屾垚鏁�</div>
+ <div class="card-title">浠婃棩鍏ュ簱瀹屾垚绠辨暟</div>
<div class="card-value">{{ bigscreendata.inboundCount }}</div>
</div>
</el-col>
@@ -42,7 +42,7 @@
<Upload />
</el-icon>
</div>
- <div class="card-title">浠婃棩鍑哄簱瀹屾垚鏁�</div>
+ <div class="card-title">浠婃棩鍑哄簱瀹屾垚绠辨暟</div>
<div class="card-value">{{ bigscreendata.outboundCount }}</div>
</div>
</el-col>
@@ -114,7 +114,7 @@
</el-col>
<el-col :span="8">
<div class="chart-card">
- <div class="chart-title">杩�7鏃ュ嚭鍏ュ簱瓒嬪娍锛堝浘鍍忓寲璧板娍锛�</div>
+ <div class="chart-title">杩�7鏃ュ嚭鍏ュ簱鍗曟嵁瓒嬪娍锛堝浘鍍忓寲璧板娍锛�</div>
<div ref="stockTrendRef" class="chart-container"></div>
</div>
</el-col>
@@ -203,9 +203,9 @@
const uniqueMap = new Map();
expirationList.forEach(item => {
const uniqueKey = [
- item.materielCode || '鏈煡缂栫爜',
- item.batchNo || '鏈煡鎵规',
- item.palletCode || '鏈煡鎵樼洏',
+ item.materielCode,
+ item.batchNo,
+ item.palletCode,
].join('|');
if (!uniqueMap.has(uniqueKey)) {
uniqueMap.set(uniqueKey, item);
@@ -227,16 +227,16 @@
expireLevel = '30澶╀互涓�';
}
return {
- materielCode: item.materielCode || '鏈煡缂栫爜',
- materielName: item.materielName || '鏈煡鍚嶇О',
- batchNo: item.batchNo || '鏈煡鎵规',
- validDate: item.validDate || '鏈煡鏈夋晥鏈�',
+ materielCode: item.materielCode,
+ materielName: item.materielName,
+ batchNo: item.batchNo,
+ validDate: item.validDate,
daysToExpiration: daysToExpiration,
expireLevel: expireLevel,
stockQuantity: item.stockQuantity || 0,
- locationCode: item.locationCode || '鏈煡搴撲綅',
- palletCode: item.palletCode || '鏈煡鎵樼洏',
- unit: item.unit || 'PCS'
+ locationCode: item.locationCode,
+ palletCode: item.palletCode,
+ unit: item.unit
};
});
});
@@ -293,12 +293,12 @@
// 鏍煎紡鍖栧叆搴撹鍗�
const formattedInbound = inboundOrders.map(item => ({
- upperOrderNo: item.upperOrderNo || item.inboundOrderNo || '鏈煡鍗曞彿',
+ upperOrderNo: item.upperOrderNo || item.inboundOrderNo,
taskStatus: item.orderStatus || 0,
taskType: 'inbound',
businessType: item.businessType || '',
returnToMESStatus: item.returnToMESStatus || 0,
- factoryArea: item.factoryArea || '鏈煡鍘傚尯',
+ factoryArea: item.factoryArea,
modifier: item.modifier,
createDate: item.createDate,
modifyDate: item.modifyDate
@@ -306,15 +306,15 @@
// 鏍煎紡鍖栧嚭搴撹鍗�
const formattedOutbound = outboundOrders.map(item => ({
- upperOrderNo: item.upperOrderNo || item.orderNo || '鏈煡鍗曞彿',
+ upperOrderNo: item.upperOrderNo || item.orderNo,
taskStatus: item.orderStatus || 0,
taskType: 'outbound',
businessType: item.businessType || '',
returnToMESStatus: item.returnToMESStatus || 0,
- factoryArea: item.factoryArea || '鏈煡鍘傚尯',
- modifier: item.modifier || '鏈煡淇敼浜�',
- createDate: item.createDate || '鏈煡鏃堕棿',
- modifyDate: item.modifyDate || '鏈煡鏃堕棿'
+ factoryArea: item.factoryArea,
+ modifier: item.modifier,
+ createDate: item.createDate,
+ modifyDate: item.modifyDate
}));
const merged = [...formattedInbound, ...formattedOutbound];
--
Gitblit v1.9.3