From aa1ac020bbc8a22435b60bf5c8707ec0cfe74ec9 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 11 Feb 2022 10:42:02 +0800
Subject: [PATCH] fix bug

---
 .../vehicle-detail.component.html             | 21 +++++++++----------
 .../vehicle-detail.component.ts               |  2 +-
 .../components/vehicle/vehicle.component.html |  5 ++++-
 .../components/vehicle/vehicle.component.ts   |  3 +--
 4 files changed, 16 insertions(+), 15 deletions(-)

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}}
       </sv>
       <sv label="货物价值">
-        {{i?.goodsValue}}
+        {{i?.goodsValue |currency}}
       </sv>
       <sv label="保价费金额">
-        {{i?.insuranceAmount |currency: '￥'}} 元
+        {{i?.insuranceAmount |currency}} 元
       </sv>
     </sv-container>
   </nz-card>
@@ -132,29 +132,28 @@
     <st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{show:false}">
       <ng-template st-row="total" let-item>
         <div>
-          {{item?.totalAmount | currency: '￥'}}
+          {{item?.totalAmount | currency}}
           <span>(含附加费）</span>
         </div>
       </ng-template>
+      <ng-template st-row="price" let-item>
+        <div>
+          {{item?.price | currency}}
+        </div>
+      </ng-template>
     </st>
     <div class="freight-info-box mt-md" nz-row>
       <div nz-col nzSpan="24">
         <h3>
           <label>总计 :</label>
           <span class="text-error-dark text-xl">
-            {{(i?.totalAmount) | currency: '￥'}}
+            {{(i?.totalAmount) | currency}}
           </span>
-          <span>（运费{{i?.totalFreight | currency: '￥'}}含附加运费 {{i?.totalSurcharge| currency: '￥' }}）</span>
+          <span>（运费{{i?.totalFreight | currency}}含附加运费 {{i?.totalSurcharge| currency}}）</span>
         </h3>
         <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
       </div>
     </div>
-    <!-- <div>
-      总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '￥' }}</span> （运费￥{{
-        totalObj?.price - attObj?.price
-      }}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
-    </div>
-    <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div> -->
   </nz-card>
   <nz-card nzTitle="补充信息">
     <sv-container>
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 @@
         <p>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</p>
         <p>{{ item?.resourceStatusLabel }}</p>
       </ng-template>
+      <ng-template st-row="total" let-item let-index="index">
+        <div class="mr-xs">{{ item?.totalAmount + item?.surcharge | currency }} </div>
+      </ng-template>
       <ng-template st-row="totalAmount" let-item let-index="index">
         <div class="mr-xs">{{ item?.totalAmount | currency }} </div>
       </ng-template>
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: '总运费',