Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2022-03-10 09:11:02 +08:00
parent a2abb79379
commit 500126f019
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/routes/financial-management/components/payment-record/payment-record.component.html
View File

@ -36,9 +36,8 @@
{{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a> {{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a>
</ng-template> </ng-template>
<ng-template st-row="amountDetails" let-item let-index="index" let-column="column"> <ng-template st-row="amountDetails" let-item let-index="index" let-column="column">
{{item.costName}}:{{ item.price | currency }}<br /> <ng-container *ngFor="let detail of item.amountDetails">
<ng-container *ngIf="item.payType==='1'"> {{detail.costName}}:{{ detail.surcharge | currency }}<br />
附加费: {{ item.surcharge| currency }}
</ng-container> </ng-container>
</ng-template> </ng-template>
<ng-template st-row="billCode" let-item let-index="index" let-column="column"> <ng-template st-row="billCode" let-item let-index="index" let-column="column">

6
src/app/routes/financial-management/components/payment-record/payment-record.component.ts
View File

@ -252,13 +252,9 @@ export class PaymentRecordComponent implements OnInit {
render: 'amountDetails', render: 'amountDetails',
width: 160, width: 160,
format: item => { format: item => {
let surcharge = 0;
(item.amountDetails as Array<any>).forEach(detail => { (item.amountDetails as Array<any>).forEach(detail => {
surcharge += detail.surcharge || 0; detail.surcharge = ((detail.price + (detail.surcharge || 0)) as number).toFixed(2);
}); });
item.surcharge = surcharge.toFixed(2);
item.price = item.amountDetails?.[0]?.price || 0;
item.costName = item.amountDetails?.[0]?.costName;
return ''; return '';
} }
}, },

2
src/app/routes/sys-setting/components/network-freight/network-freight.component.html
View File

@ -55,7 +55,7 @@
[scroll]="{ x: '2000px' }" [scroll]="{ x: '2000px' }"
[data]="service.$api_networkTransporter_page" [data]="service.$api_networkTransporter_page"
[columns]="columns" [columns]="columns"
[req]="{ params: reqParams }" [req]="{ params: reqParams }" [page]="{}"
[loading]="service.http.loading" [loading]="service.http.loading"
(change)="stChange($event)" (change)="stChange($event)"
> >