This commit is contained in:
Taric Xin
2022-01-20 17:27:41 +08:00
parent 3a0ae6a54e
commit 121fcce44c
22 changed files with 727 additions and 215 deletions

View File

@ -28,7 +28,8 @@
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [scroll]="{ y: '370px' }">
<ng-template st-row="availableBalance" let-item let-index="index">
<a (click)="showAccountDetail(item)">{{ item.availableBalance | currency}}</a>
<a (click)="showAccountDetail(item)">{{ (parseFloat(item.availableBalance) +
parseFloat(item.freezeBalance)).toFixed(2) | currency}}</a>
</ng-template>
</st>
</nz-card>

View File

@ -187,7 +187,7 @@ export class DriverAccountComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.withdrawBalance }) }
},
{ title: '账户总余额', render: 'availableBalance', className: 'text-right' },
{ title: '账户总余额', render: 'availableBalance', className: 'text-right', width: 180 },
{ title: '创建时间', index: 'createTime', type: 'date', width: 150 },
{
title: '操作',
@ -213,4 +213,8 @@ export class DriverAccountComponent implements OnInit {
}
];
}
parseFloat(num: any) {
return parseFloat(num);
}
}

View File

@ -28,7 +28,8 @@
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [scroll]="{ y: '370px' }">
<ng-template st-row="description" let-item let-index="index">
<a (click)="showAccountDetail(item)">{{ item.availableBalance | currency}}</a>
<a (click)="showAccountDetail(item)">{{ (parseFloat(item.availableBalance) +
parseFloat(item.freezeBalance)).toFixed(2) | currency}}</a>
</ng-template>
</st>
</nz-card>

View File

@ -7,6 +7,7 @@ import { CurrencyService } from '@delon/util';
import { CurrencyCNYPipe } from '@delon/util/pipes/currency/cny.pipe';
import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { parse } from 'path';
import { SystemService } from 'src/app/routes/sys-setting/services/system.service';
import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
import { FreightAccountService } from '../../services/freight-account.service';
@ -215,4 +216,8 @@ export class FreightAccountComponent implements OnInit {
}
];
}
parseFloat(num: any) {
return parseFloat(num);
}
}

View File

@ -181,7 +181,7 @@ export class RechargeRecordComponent implements OnInit {
this.service.getReceiptUrl(item.receiptUrl, {
bankType: item.bankType,
rmYll: item.roleId,
snglFlgCd: item.paySerialNumber,
snglFlgCd: item.paySerialNumber2,
bussType: '06'
})
}

View File

@ -272,7 +272,7 @@ export class WithdrawalsRecordComponent implements OnInit {
this.service.getReceiptUrl(item.receiptUrl, {
bankType: item.bankType,
rmYll: item.userId,
snglFlgCd: item.bankSerialNumber,
snglFlgCd: item.coreSerNo,
bussType: '06'
})
},