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

Merge branch '@hera/dev' of ssh://git.daoyoucloud.com:13004/daoyoucloud/tachycode into @hera/dev

Browse Source
This commit is contained in:
sealday 2024-03-20 16:42:51 +08:00
commit fa5135ce33
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,7 +456,9 @@ const PreviewDocument = ({
record.map((item) => (
<View key={'key'} style={styles.tableContent}>
<Text style={styles.tableCell2}>{item.name}</Text>
<Text style={styles.tableCell}>{!item.count ? '' : formatQuantity(item.count, 2) + item.unit}</Text>
<Text style={styles.tableCell}>
{!item.count || item.isFee ? '' : formatQuantity(item.count, 2) + item.unit}
</Text>
<Text style={styles.tableCell}>
{(printSetup === PrintSetup.Display && !item.product_id && !item.isTotal) ||
(printSetup === PrintSetup.Manual && !item.product_id && !item.isTotal)
@ -515,7 +517,7 @@ const PreviewDocument = ({
<View key={'key'} style={styles.tableContent}>
<Text style={styles.tableCell2}>{item.left_name}</Text>
<Text style={styles.tableCell}>
{!item.left_count ? '' : formatQuantity(item.left_count, 2) + item.left_unit}
{!item.left_count || item.left_isFee ? '' : formatQuantity(item.left_count, 2) + item.left_unit}
</Text>
<Text style={styles.tableCell}>
{(printSetup === PrintSetup.Display && !item.left_product_id && !item.left_isTotal) ||
@ -535,7 +537,7 @@ const PreviewDocument = ({
</Text>
<Text style={styles.tableCell2}>{item.right_name}</Text>
<Text style={styles.tableCell}>
{!item.right_count ? '' : formatQuantity(item.right_count, 2) + item.right_unit}
{!item.right_count || item.right_isFee ? '' : formatQuantity(item.right_count, 2) + item.right_unit}
</Text>
<Text style={styles.tableCell}>
{(printSetup === PrintSetup.Display && !item.right_product_id && !item.right_isTotal) ||

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

@ -76,7 +76,7 @@ export class RecordService {
async _checkPlateNumber(record: MagicAttributeModel, options: CreateOptions) {
const { transaction, context } = options;
if (record.dataValues?.vehicles) {
const ids = record.dataValues.vehicles.join(',');
const ids = record.dataValues.vehicles.filter((item) => typeof item === 'number').join(',');
const vehicles = await this.db.sequelize.query(`select * from vehicles where id in (${ids})`, {
transaction,
});