From 6d30bc636d931c5aa53d0336cf67db99649d41a7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 21 三月 2026 13:31:18 +0800
Subject: [PATCH] 军泰伟业 1.订单分批发货后,对应仓库出库数据有误 2.新增退货单并处理成功后,已退货数量、未退货数量显示有误 3.自制、外购、委外来源需拆分为合格来源、不合格来源 4.规格型号改为图纸编号
---
src/views/inventoryManagement/receiptManagement/Record.vue | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 0b67f42..b85e79b 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -73,7 +73,7 @@
<el-table-column label="浜у搧澶х被"
prop="productName"
show-overflow-tooltip/>
- <el-table-column label="瑙勬牸鍨嬪彿"
+ <el-table-column label="鍥剧焊缂栧彿"
prop="model"
show-overflow-tooltip/>
<el-table-column label="鍗曚綅"
@@ -212,17 +212,27 @@
// 鑾峰彇鏉ユ簮绫诲瀷閫夐」
const fetchStockRecordTypeOptions = () => {
- if (props.type === 1 || props.type === 2) {
- findAllQualifiedStockInRecordTypeOptions()
- .then(res => {
- stockRecordTypeOptions.value = res.data;
- })
- } else {
+ Promise.all([
+ findAllQualifiedStockInRecordTypeOptions(),
findAllUnQualifiedStockInRecordTypeOptions()
- .then(res => {
- stockRecordTypeOptions.value = res.data;
- })
- }
+ ])
+ .then(([qualifiedRes, unQualifiedRes]) => {
+ const qualifiedData = qualifiedRes.data || [];
+ const unQualifiedData = unQualifiedRes.data || [];
+ const allData = [...qualifiedData, ...unQualifiedData];
+ const uniqueData = [];
+ const valueSet = new Set();
+ allData.forEach(item => {
+ if (!valueSet.has(item.value)) {
+ valueSet.add(item.value);
+ uniqueData.push(item);
+ }
+ });
+ stockRecordTypeOptions.value = uniqueData;
+ })
+ .catch(() => {
+ stockRecordTypeOptions.value = [];
+ });
}
// 琛ㄦ牸閫夋嫨鏁版嵁
--
Gitblit v1.9.3