ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: pdf双列备注信息展示重复 (#471) fix #472

Browse Source 
Reviewed-on: daoyoucloud/tachycode#471
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: hello@lv <2256334253@qq.com>
Co-committed-by: hello@lv <2256334253@qq.com>
This commit is contained in:
hello@lv 2024-03-23 22:29:03 +08:00 committed by sealday
parent 1ae578fe10
commit 2ddbe8e596
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/plugins/@hera/plugin-rental/src/server/pdf-documents/records-documentV2.tsx
View File

@ -475,7 +475,7 @@ const PreviewDocument = ({
<Text <Text
style={detail.category === RecordCategory.purchase ? styles.tableCell2Last : styles.tableCellLast} style={detail.category === RecordCategory.purchase ? styles.tableCell2Last : styles.tableCellLast}
> >
{item.isExcluded ? '不计入合同' : item.comment || ''} {item.isExcluded ? '不计入合同 ' + (item.comment || '') : item.comment || ''}
</Text> </Text>
</View> </View>
))} ))}
@ -533,7 +533,7 @@ const PreviewDocument = ({
: item.left_conversion_unit} : item.left_conversion_unit}
</Text> </Text>
<Text style={detail.category === RecordCategory.purchase ? styles.tableCell2 : styles.tableCell}> <Text style={detail.category === RecordCategory.purchase ? styles.tableCell2 : styles.tableCell}>
{item.left_isExcluded ? '不计入合同' : item.left_comment || ''} {item.left_isExcluded ? '不计入合同 ' + (item.left_comment || '') : item.left_comment || ''}
</Text> </Text>
<Text style={styles.tableCell2}>{item.right_name}</Text> <Text style={styles.tableCell2}>{item.right_name}</Text>
<Text style={styles.tableCell}> <Text style={styles.tableCell}>
@ -555,8 +555,9 @@ const PreviewDocument = ({
<Text <Text
style={detail.category === RecordCategory.purchase ? styles.tableCell2Last : styles.tableCellLast} style={detail.category === RecordCategory.purchase ? styles.tableCell2Last : styles.tableCellLast}
> >
{item.right_comment || ''} {item.right_name && item.right_isExcluded
{item.right_name && item.right_isExcluded ? '不计入合同' : item.right_comment || ''} ? '不计入合同 ' + (item.right_comment || '')
: item.right_comment || ''}
</Text> </Text>
</View> </View>
))} ))}