diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html index f08ba3c6..f830ca80 100644 --- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 09:53:23 + * @LastEditTime : 2022-03-31 14:20:41 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -22,13 +22,16 @@ {{item.PRE | currency}} - {{ item.RECE | currency }} + {{item.RECE | currency}} - {{ item.BACK | currency }} + {{item.BACK | currency}} - {{ item.traiPrice | currency }} + {{item.surcharge + item.traiPrice | currency}} + + + {{item.surcharge | currency}} diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts index 6d6170e4..e20e427b 100644 --- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts +++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 13:52:27 + * @LastEditTime : 2022-03-31 14:21:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -121,7 +121,9 @@ export class VehicleConfirReceiptComponent implements OnInit { cost.RECE = element.price; } else if (element.expenseName === '回单付' || element.expenseCode === 'BACK') { cost.BACK = element.price; - } else if (element.expenseName === '总费用') { + } else if (element.expenseCode === 'ATT') { + cost.surcharge = element.price; + } else if (element.expenseCode === 'TOTAL') { cost.traiPrice = element.price; } }); @@ -160,6 +162,11 @@ export class VehicleConfirReceiptComponent implements OnInit { index: 'BACK', render:'BACK' }, + { + title: '附加费', + index: 'surcharge', + render:'surcharge' + }, { title: '总运费', index: 'traiPrice',