diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 59f4b6bf..19e038cf 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-02-10 10:30:22 + * @LastEditTime : 2022-02-10 14:44:36 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -138,7 +138,12 @@

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}(以发货为准,保留小数)

- + + {{ item.price | currency}} + + + {{ item.surcharge | currency}} +
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 8419ef3c..701800a8 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -33,8 +33,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit { isVisible = false; logColumns: STColumn[] = [ { title: '款项', index: 'expenseName' }, - { title: '运输费(元)', index: 'price' }, - { title: '附加费(元)', index: 'surcharge' }, + { title: '运输费(元)', render: 'price' }, + { title: '附加费(元)', render: 'surcharge' }, { title: '支付时间', index: ' paymentTime' }, { title: '支付状态', diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 0a6a41e7..d2c9c9ee 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-02-10 14:24:33 + * @LastEditTime : 2022-02-10 14:45:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -128,7 +128,14 @@ - + + + {{ item.price | currency}} + + + {{ item.surcharge | currency}} + +
总计:{{ i?.totalAmount | currency }} (运费{{i?.totalFreight | currency}}, diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index 44155165..5a4e24b5 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 20:09:47 + * @LastEditTime : 2022-02-10 14:45:47 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -35,9 +35,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit { isVisible = false; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, - { title: '小计(元)', index: 'price' }, - { title: '运输费(元)', index: 'price' }, - { title: '附加费(元)', index: 'surcharge' }, + { title: '小计(元)', render: 'price' }, + { title: '运输费(元)', render: 'price' }, + { title: '附加费(元)', render: 'surcharge' }, { title: '支付时间', index: 'paymentTime' }, { title: '支付状态',