From e2aeba236fb3bd2b8c34dc08aeec41910959b72b Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 2 Mar 2022 11:02:57 +0800
Subject: [PATCH] fix bug

---
 .../bulk-detail/bulk-detail.component.html    | 10 +++-------
 .../bulk-detail/bulk-detail.component.ts      |  3 ++-
 .../vehicle-detail.component.html             | 19 ++++++-------------
 .../vehicle-detail.component.ts               |  3 ++-
 4 files changed, 13 insertions(+), 22 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 dba9b035..27813203 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-03-02 10:39:35
+ * @LastEditTime : 2022-03-02 11:00:09
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -62,17 +62,13 @@
     <div style="width: 60%; margin: 0 auto">
        
       <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
-         
         <nz-step
           *ngFor="let item of i?.scheduleVOList"
           [nzTitle]="item.state"
           [nzSubtitle]="item.stateTime"
           [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"
-        >
-           
-        </nz-step>
-         </nz-steps
-      >
+        ></nz-step>
+      </nz-steps>
     </div>
   </div>
 </nz-card>
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
index b6d7fd88..f2f04f4e 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 19:47:14
+ * @LastEditTime : 2022-03-02 11:01:15
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -72,6 +72,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
         this.i = res;
         this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
         this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
+        this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE");
       }
     });
   }
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 e9308ad5..79fe1100 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
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 10:39:01
+ * @LastEditTime : 2022-03-02 11:02:35
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -62,18 +62,11 @@
   <div class="approval-status">
     <div style="width: 60%; margin: 0 auto">
        
-      <nz-steps [nzCurrent]="approvalLsit?.length + 1" nzLabelPlacement="vertical">
-         
-        <nz-step
-          *ngFor="let item of approvalLsit"
-          [nzTitle]="item?.state"
-          [nzSubtitle]="item?.stateTime"
-          [nzStatus]="item?.displayStatus === 'SHOW' ? 'finish' : 'wait'"
-        >
-           
-        </nz-step>
-         </nz-steps
-      >
+      <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
+        <nz-step *ngFor="let item of i?.scheduleVOList" [nzTitle]="item.state" [nzSubtitle]="item.stateTime"
+          [nzDescription]="item.cancelReason ? '取消原因：' + item.cancelReason : ''"
+          [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"></nz-step>
+      </nz-steps>
     </div>
   </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 5b8e5ba6..38785244 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-28 11:45:39
+ * @LastEditTime : 2022-03-02 11:02:35
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -83,6 +83,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
             delete this.approvalLsit[key];
           }
         });
+        this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE");
       }
     });
   }