diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index 3ed0e0cd..38ff5a0d 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -121,10 +121,10 @@
{{i?.insuranceTypeLabel}}
- {{i?.goodsValue}}
+ {{i?.goodsValue |currency}}
- {{i?.insuranceAmount |currency: '¥'}} 元
+ {{i?.insuranceAmount |currency}} 元
@@ -132,29 +132,28 @@
- {{item?.totalAmount | currency: '¥'}}
+ {{item?.totalAmount | currency}}
(含附加费)
+
+
+ {{item?.price | currency}}
+
+
- {{(i?.totalAmount) | currency: '¥'}}
+ {{(i?.totalAmount) | currency}}
- (运费{{i?.totalFreight | currency: '¥'}}含附加运费 {{i?.totalSurcharge| currency: '¥' }})
+ (运费{{i?.totalFreight | currency}}含附加运费 {{i?.totalSurcharge| currency}})
收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
-
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
index 7676967e..b70c8827 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -47,7 +47,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
title: '协议金额(元)',
width: '150px',
className: 'text-center',
- index: 'price'
+ render: 'price'
},
];
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
index 5b38b910..882bda81 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
- * @LastEditTime : 2022-02-10 14:39:40
+ * @LastEditTime : 2022-02-11 10:30:16
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -67,6 +67,9 @@
{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}
{{ item?.resourceStatusLabel }}
+
+ {{ item?.totalAmount + item?.surcharge | currency }}
+
{{ item?.totalAmount | currency }}
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 3b617820..15cf133d 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -488,8 +488,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
title: '总费用',
className: 'text-right',
width: '120px',
- index: 'totalAmount',
- render: 'totalAmount'
+ render: 'total'
},
{
title: '总运费',