From 89c9f93daa0bc20924c639acb8d938b51c2e51ca Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 14 Apr 2022 16:40:39 +0800
Subject: [PATCH] fix bug

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

diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts
index 3c1448fd..26545ef6 100644
--- a/src/app/routes/datatable/components/datascreen/datascreen.component.ts
+++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts
@@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-14 16:19:06
+ * @LastEditTime : 2022-04-14 16:21:00
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -108,10 +108,6 @@ export class DatatableDatascreenComponent implements OnInit {
   }
    genData(): any{
     let value: any = [];
-    console.log('9999999');
-    
-    // let value: any = [{city: '深圳市', weight: 5070.4}
-    // ,{city: '济宁市', weight: 338}];
     this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => {
       console.log(res);
       res.forEach((element: any) => {
@@ -122,7 +118,6 @@ export class DatatableDatascreenComponent implements OnInit {
       });
       this.salesData2 = value
     });
-    console.log(value);
   }
   initPillarData(){
         // this.curve.reRender()
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 6f5d861b..b49c9148 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-08 11:44:33
+ * @LastEditTime : 2022-04-14 16:38:56
  * @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
@@ -176,7 +176,8 @@
       附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
     </div>
   </div>
-  <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
+  <div *ngIf=" i?.payee?.name !== i?.driver?.name">车队长：{{ i?.payee?.name }}{{ i?.payee?.phone ? "/" +
+    i?.payee?.phone : ''}}/{{ i?.payee?.idNo }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>