diff --git a/packages/plugins/@hera/plugin-rental/src/server/pdf-documents/records-documentV2.tsx b/packages/plugins/@hera/plugin-rental/src/server/pdf-documents/records-documentV2.tsx index a2e536bf3..5bf5111a4 100644 --- a/packages/plugins/@hera/plugin-rental/src/server/pdf-documents/records-documentV2.tsx +++ b/packages/plugins/@hera/plugin-rental/src/server/pdf-documents/records-documentV2.tsx @@ -349,10 +349,7 @@ const PreviewDocument = ({ )} {detail.category === RecordCategory.lease && ( - - 项目名称:{detail.contract?.project?.id + ' ' || ''} - {detail.contract?.project?.name || ''} - + 项目名称:{detail.contract?.project?.name || ''} 流水号:{number} )} @@ -471,9 +468,7 @@ const PreviewDocument = ({ ? printSetup === PrintSetup.DisplayAndPrice && item.total ? '元' : '' - : item.conversion_unit === 'KG' - ? '吨' - : item.conversion_unit} + : item.conversion_unit} {item.left_isExcluded ? '不计入合同' : item.left_comment || ''} @@ -555,9 +548,7 @@ const PreviewDocument = ({ ? printSetup === PrintSetup.DisplayAndPrice && item.right_total ? '元' : '' // 不记录合同不需要单位 - : item.right_conversion_unit === 'KG' - ? '吨' - : item.right_conversion_unit} + : item.right_conversion_unit} { + return { + ...item, + total: item.conversion_unit === 'KG' ? item.total / 1000 : item.total, + conversion_unit: item.conversion_unit === 'KG' ? '吨' : item.conversion_unit, + }; + }); return await renderItV2({ detail: recordData, - record: [...product_correlation, ...no_product_fee, ...excludedFee], // 租金+费用,无关联费用 + record: recordPdfData, // 租金+费用,无关联费用 priceRule: make_price, isDouble, printSetup,