From a8c7b82a98761b4928cc7d420344da54a90da311 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 12 Jan 2022 18:34:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk/bulk.component.html                |  6 +++---
 .../order-management/components/bulk/bulk.component.ts |  8 +++++++-
 .../components/vehicle/vehicle.component.ts            | 10 +++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html
index be5993ef..563d7e54 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@@ -43,9 +43,9 @@
   <nz-tab [nzTitle]="'全部'"></nz-tab>
   <nz-tab [nzTitle]="'待发车('+tabs?.stayQuantity+')'"></nz-tab>
   <nz-tab [nzTitle]="'运输中('+tabs?.receivedQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'待签收('+tabs?.cancelQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'已完成'"></nz-tab>
-  <nz-tab [nzTitle]="'已取消'"></nz-tab>
+  <nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></nz-tab>
 </nz-tabset>
   <div style="margin-top: 15px;">
     <st
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index 216b3714..18ecdccb 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -59,7 +59,9 @@ export class OrderManagementBulkComponent implements OnInit {
 tabs = {
   cancelQuantity: 0,
   receivedQuantity: 0,
-  stayQuantity: 0
+  stayQuantity: 0,
+  signQuantity: 0,
+  compolatelQuantity: 0,
 };
   constructor(
     public service: OrderManagementService,
@@ -99,6 +101,10 @@ tabs = {
         } else if (element.billStatusLabel === '待接单') {
           this.tabs.receivedQuantity = element.quantity
         } else if (element.billStatusLabel === '待签收') {
+          this.tabs.signQuantity = element.quantity
+        } else if (element.billStatusLabel === '已完成') {
+          this.tabs.compolatelQuantity = element.quantity
+        } else if (element.billStatusLabel === '已取消') {
           this.tabs.cancelQuantity = element.quantity
         } 
        });
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 4b4d6d9d..a2362a40 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -348,11 +348,11 @@ resourceStatus: any;
         className: 'text-center',
         render: 'billCode'
       },
-      // {
-      //   title: '我的出价',
-      //   width: '150px',
-      //   render: 'mybidInfo'
-      // },
+      {
+        title: '我的出价',
+        width: '150px',
+        render: 'mybidInfo'
+      },
       {
         title: '运费明细',
         width: '200px',