From 878d74493c18747097294f3e6b9c6ab2269783ec Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 20 四月 2026 14:59:18 +0800
Subject: [PATCH] 优化生产流程卡打印功能，增加产品名称变化的行渲染逻辑
---
src/views/salesManagement/salesLedger/components/processCardPrint.js | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/components/processCardPrint.js b/src/views/salesManagement/salesLedger/components/processCardPrint.js
index aa50b34..a48bc88 100644
--- a/src/views/salesManagement/salesLedger/components/processCardPrint.js
+++ b/src/views/salesManagement/salesLedger/components/processCardPrint.js
@@ -52,15 +52,28 @@
return columns || '<td class="route-col"></td>';
};
-const renderItems = (items, startIndex, routeNodes, totalCols) => {
+const renderItems = (
+ items,
+ startIndex,
+ routeNodes,
+ totalCols,
+ previousProductName,
+ fallbackProductName
+) => {
const list = Array.isArray(items) ? items : [];
if (list.length === 0) {
return `<tr><td colspan="${totalCols}" style="text-align:center;">鏆傛棤鏄庣粏</td></tr>`;
}
const routeEmptyCells = renderRouteEmptyCells(routeNodes);
+ let lastProductName = String(previousProductName ?? "").trim();
return list
- .map(
- (item, index) => `
+ .map((item, index) => {
+ const currentProductName =
+ String(item?.productDescription ?? "").trim() || fallbackProductName;
+ const shouldRenderProductRow = currentProductName !== lastProductName;
+ lastProductName = currentProductName;
+ return `
+ ${shouldRenderProductRow ? `<tr><td colspan="${totalCols}" class="section-title">浜у搧鍚嶇О:${escapeHtml(currentProductName)}</td></tr>` : ""}
<tr>
<td>${startIndex + index + 1}</td>
<td class="no-wrap">${escapeHtml(item?.floorCode)}</td>
@@ -70,8 +83,8 @@
<td class="no-wrap">${escapeHtml(item?.processRequirement)}</td>
${routeEmptyCells}
</tr>
- `
- )
+ `;
+ })
.join("");
};
@@ -89,8 +102,7 @@
const data = cardData ?? {};
const routeNodes = Array.isArray(data.routeNodes) ? data.routeNodes : [];
const items = Array.isArray(data.items) ? data.items : [];
- const firstItem = items[0] ?? {};
- const productName = firstItem.productDescription || "";
+ const fallbackProductName = String(data?.productName ?? "").trim();
const totalCols = 6 + Math.max(routeNodes.length, 1);
const signLabelCols = 2;
const signBlankCols = Math.max(totalCols - 5 - signLabelCols, 1);
@@ -187,6 +199,11 @@
.map((pageItems, pageIndex) => {
const isLastPage = pageIndex === totalPages - 1;
const startIndex = pageIndex * pageSize;
+ const previousProductName =
+ startIndex > 0
+ ? String(items[startIndex - 1]?.productDescription ?? "").trim() ||
+ fallbackProductName
+ : "";
return `
<div class="page">
<div class="header">
@@ -223,10 +240,14 @@
<tr>${renderRouteRow(routeNodes)}</tr>
</thead>
<tbody>
- <tr>
- <td colspan="${totalCols}" class="section-title">浜у搧鍚嶇О:${escapeHtml(productName)}</td>
- </tr>
- ${renderItems(pageItems, startIndex, routeNodes, totalCols)}
+ ${renderItems(
+ pageItems,
+ startIndex,
+ routeNodes,
+ totalCols,
+ previousProductName,
+ fallbackProductName
+ )}
${
isLastPage
? `<tr>
--
Gitblit v1.9.3