From 2ddbe8e59639c39c2560d7dd5a7cd0e8fc58c7fc Mon Sep 17 00:00:00 2001 From: "hello@lv" <2256334253@qq.com> Date: Sat, 23 Mar 2024 22:29:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20pdf=E5=8F=8C=E5=88=97=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E9=87=8D=E5=A4=8D=20(#471)?= =?UTF-8?q?=20fix=20#472?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachycode/pulls/471 Reviewed-by: sealday Co-authored-by: hello@lv <2256334253@qq.com> Co-committed-by: hello@lv <2256334253@qq.com> --- .../src/server/pdf-documents/records-documentV2.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 2c8aa96cc..247d0e9d6 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 @@ -475,7 +475,7 @@ const PreviewDocument = ({ - {item.isExcluded ? '不计入合同' : item.comment || ''} + {item.isExcluded ? '不计入合同 ' + (item.comment || '') : item.comment || ''} ))} @@ -533,7 +533,7 @@ const PreviewDocument = ({ : item.left_conversion_unit} - {item.left_isExcluded ? '不计入合同' : item.left_comment || ''} + {item.left_isExcluded ? '不计入合同 ' + (item.left_comment || '') : item.left_comment || ''} {item.right_name} @@ -555,8 +555,9 @@ const PreviewDocument = ({ - {item.right_comment || ''} - {item.right_name && item.right_isExcluded ? '不计入合同' : item.right_comment || ''} + {item.right_name && item.right_isExcluded + ? '不计入合同 ' + (item.right_comment || '') + : item.right_comment || ''} ))}