From a8a160c1cd0d6d3921ffcce706286f5b67806607 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 28 Feb 2022 11:56:03 +0800
Subject: [PATCH] fix bug

---
 .../bulk-detail-change.component.html         | 11 ++++++++---
 .../bulk-detail/bulk-detail.component.html    |  2 +-
 .../vehicle-detail-change.component.html      | 18 ++++++++++++------
 .../vehicle-detail-change.component.ts        | 19 ++++++++++++++-----
 .../vehicle-detail.component.html             |  2 +-
 .../vehicle-detail.component.ts               |  2 +-
 .../bulk-detail/bulk-detail.component.html    |  2 +-
 7 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
index 0d42260f..1ed70615 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
@@ -272,12 +272,17 @@
 <nz-card nzTitle="运费信息" #distannce3>
   <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）</h2>
   <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-
+    <ng-template st-row="price" let-item let-index="index">
+      {{ item.price | currency }}
+    </ng-template>
+    <ng-template st-row="surcharge" let-item let-index="index">
+      {{ item.surcharge | currency }}
+    </ng-template>
   </st>
   <div>
     <div>
-      总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price  | currency }}</span> （运费￥{{
-        totalObj?.price - attObj?.price  | currency}}，附加费￥{{ attObj?.price  | currency }}，附加费率{{i?.attPercent }}%）
+      总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
+      附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
     </div>
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
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 860c4990..041f49e8 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
@@ -151,7 +151,7 @@
   <div>
     <div>
       总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
-      附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 }}%）
+      附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
     </div>
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
index 3b0216e5..2ac64a21 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-14 10:33:38
+ * @LastEditTime : 2022-02-28 11:48:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -237,13 +237,19 @@
 </nz-card>
 
 <nz-card nzTitle="运费信息" #distannce3>
-  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
+  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+    <ng-template st-row="price" let-item let-index="index">
+      {{ item.price | currency }}
+    </ng-template>
+    <ng-template st-row="surcharge" let-item let-index="index">
+      {{ item.surcharge | currency }}
+    </ng-template>
+  </st>
   <div>
-    总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span>
-     （运费{{totalObj?.price - attObj?.price | currency}}，
-     附加费{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%）
+    总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
+    附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}%）
   </div>
-  <div>收款人：{{ i?.payeeName }}{{ i?.payeePhone }}</div>
+  <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
index 3c24a693..4df2dd3f 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 20:28:33
+ * @LastEditTime : 2022-02-28 11:53:31
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -72,9 +72,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
   ui: SFUISchema = {};
   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: '支付状态',
@@ -201,6 +201,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
           },
           default: ''
         },
+        no7: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'text'
+          },
+          default: ''
+        },
         unloadingLadingBillFilePath: {
           type: 'string',
           title: '卸货凭证',
@@ -305,7 +313,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
       $loadingLadingBillFilePath: { grid: { span: 12 } },
       $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
-      $no5: { grid: { span: 24 } }
+      $no4: { grid: { span: 24 } }
     };
   }
   initData() {
@@ -783,6 +791,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
         grid: { span: 24 }
       },
       $weightModel: {
+        spanLabelFixed: 120,
         grid: { span: 12 }
       },
       $drivers: {
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 7cf882ae..70d32f23 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
@@ -149,7 +149,7 @@
   </st>
   <div>
     总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
-    附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 }}%）
+    附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
 </nz-card>
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 29f2a898..5b8e5ba6 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-02-22 10:13:22
+ * @LastEditTime : 2022-02-28 11:45:39
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index 0ea0d602..47d54679 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-02-22 14:30:29
+ * @LastEditTime : 2022-02-28 11:50:00
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html