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

Merge pull request 'fix: 订单pdf单位数据错误' (#359) from fix_recordfdf into @hera/dev

Browse Source 
Reviewed-on: daoyoucloud/tachycode#359
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
This commit is contained in:
sealday 2024-03-13 14:00:49 +08:00
commit ed1a46283e
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,10 +349,7 @@ const PreviewDocument = ({
)}
{detail.category === RecordCategory.lease && (
<View style={styles.tableHeader}>
<Text style={styles.headerLeftLeft}>
项目名称：{detail.contract?.project?.id + ' ' || ''}
{detail.contract?.project?.name || ''}
</Text>
<Text style={styles.headerLeftLeft}>项目名称：{detail.contract?.project?.name || ''}</Text>
<Text style={styles.headerLeftRight}>流水号：{number}</Text>
</View>
)}
@ -471,9 +468,7 @@ const PreviewDocument = ({
? printSetup === PrintSetup.DisplayAndPrice && item.total
? '元'
: ''
: item.conversion_unit === 'KG'
? '吨'
: item.conversion_unit}
: item.conversion_unit}
</Text>
<Text
style={detail.category === RecordCategory.purchase ? styles.tableCell2Last : styles.tableCellLast}
@ -533,9 +528,7 @@ const PreviewDocument = ({
? printSetup === PrintSetup.DisplayAndPrice && item.left_total
? '元'
: '' // 不记录合同不需要单位
: item.left_conversion_unit === 'KG'
? '吨'
: item.left_conversion_unit}
: item.left_conversion_unit}
</Text>
<Text style={detail.category === RecordCategory.purchase ? styles.tableCell2 : styles.tableCell}>
{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}
</Text>
<Text
style={detail.category === RecordCategory.purchase ? styles.tableCell2Last : styles.tableCellLast}

9
packages/plugins/@hera/plugin-rental/src/server/services/record-pdf-service.ts
View File

@ -271,9 +271,16 @@ export class RecordPdfService {
product_correlation.push(itemB);
}
});
const recordPdfData = [...product_correlation, ...no_product_fee, ...excludedFee].map((item) => {
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,