diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.html b/src/app/routes/financial-management/components/payment-record/payment-record.component.html index 5d57d415..9e0d9a94 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html @@ -36,9 +36,8 @@ {{ item.orderPaymentCode }}
{{ item.paymentStatusLabel }} - {{item.costName}}:{{ item.price | currency }}
- - 附加费: {{ item.surcharge| currency }} + + {{detail.costName}}:{{ detail.surcharge | currency }}
diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts index 39524123..4de1e25f 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts @@ -252,13 +252,9 @@ export class PaymentRecordComponent implements OnInit { render: 'amountDetails', width: 160, format: item => { - let surcharge = 0; (item.amountDetails as Array).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 ''; } }, diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html index 0fd711da..41e4adf1 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html @@ -55,7 +55,7 @@ [scroll]="{ x: '2000px' }" [data]="service.$api_networkTransporter_page" [columns]="columns" - [req]="{ params: reqParams }" + [req]="{ params: reqParams }" [page]="{}" [loading]="service.http.loading" (change)="stChange($event)" >