From 0c4429a719f5c95a7690fae51efaaa799ef4e77d Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 25 五月 2026 10:02:48 +0800
Subject: [PATCH] fix: 投入重量改成投入重量/数量
---
src/views/inventoryManagement/dispatchLog/Record.vue | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 1637226..55fe152 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -66,6 +66,11 @@
prop="model"
show-overflow-tooltip
/>
+ <el-table-column
+ label="鏂欏彿"
+ prop="materialCode"
+ show-overflow-tooltip
+ />
<el-table-column
label="鍗曚綅"
prop="unit"
@@ -82,11 +87,8 @@
show-overflow-tooltip
/>
<el-table-column label="鏉ユ簮"
- prop="recordType"
+ prop="recordTypeName"
show-overflow-tooltip>
- <template #default="scope">
- {{ getRecordType(scope.row.recordType) }}
- </template>
</el-table-column>
</el-table>
<pagination
@@ -133,6 +135,12 @@
type: String,
required: true,
default: '0'
+ },
+
+ productId: {
+ type: Number,
+ required: true,
+ default: 0
}
})
@@ -163,7 +171,7 @@
};
const getList = () => {
tableLoading.value = true;
- getStockOutPage({ ...searchForm.value, ...page, type: props.type })
+ getStockOutPage({ ...searchForm.value, ...page, topParentProductId: props.productId })
.then((res) => {
tableLoading.value = false;
tableData.value = res.data.records;
@@ -188,11 +196,10 @@
.then(res => {
stockRecordTypeOptions.value = res.data;
})
- return
}
findAllUnQualifiedStockOutRecordTypeOptions()
.then(res => {
- stockRecordTypeOptions.value = res.data;
+ stockRecordTypeOptions.value.push(...res.data);
})
}
@@ -212,7 +219,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/stockOutRecord/exportStockOutRecord", {type: props.type}, props.type === '0' ? "鍚堟牸鍑哄簱鍙拌处.xlsx" : "涓嶅悎鏍煎嚭搴撳彴璐�.xlsx");
+ proxy.download("/stockOutRecord/exportStockOutRecord", {topParentProductId: props.productId}, "鍑哄簱鍙拌处.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
@@ -405,7 +412,7 @@
<div class="print-page">
<div class="delivery-note">
<div class="header">
- <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+ <div class="company-name">婀栧崡楣忓垱鐢靛瓙鏈夐檺鍏徃</div>
<div class="document-title">闆跺敭鍙戣揣鍗�</div>
</div>
@@ -432,6 +439,7 @@
<tr>
<th>浜у搧鍚嶇О</th>
<th>瑙勬牸鍨嬪彿</th>
+ <th>鏂欏彿</th>
<th>鍗曚綅</th>
<th>鍗曚环</th>
<th>闆跺敭鏁伴噺</th>
@@ -442,6 +450,7 @@
<tr>
<td>${item.productName || '鐮傜伆鐮�'}</td>
<td>${item.model || '鏍囧噯'}</td>
+ <td>${item.materialCode || ''}</td>
<td>${item.unit || '鍧�'}</td>
<td>${item.taxInclusiveUnitPrice || '0'}</td>
<td>${item.inboundNum || '2000'}</td>
--
Gitblit v1.9.3