From 8c167c313a763bdffd59b0cf882ad4bd938d8f0c Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 8 Apr 2022 11:45:11 +0800
Subject: [PATCH] fix bug

---
 .../components/bulk-detail/bulk-detail.component.html       | 4 ++--
 .../components/bulk-detail/bulk-detail.component.html       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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 46a6cfea..13847da5 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-04-01 10:56:13
+ * @LastEditTime : 2022-04-08 11:42:40
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -137,7 +137,7 @@
   </div>
 </nz-card>
 <nz-card nzTitle="运费信息" #distannce3>
-  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）</h2>
+  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）</h2>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
     <ng-template st-row="prices" let-item let-index="index">
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 ae0c1cfb..6f5d861b 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-04-07 15:02:55
+ * @LastEditTime : 2022-04-08 11:44:33
  * @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
@@ -93,10 +93,10 @@
     <sv label="接单数量">
       {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方
     </sv>
-    <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量">
+    <sv *ngIf="i?.wayBillStatus =='3' || i?.wayBillStatus =='4' || i?.wayBillStatus =='5'" label="装货数量">
       {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方
     </sv>
-    <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量">
+    <sv *ngIf="i?.wayBillStatus =='4' || i?.wayBillStatus =='5'" label="卸货数量">
       {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
     </sv>
 </sv-container>