From 065232539ea79280e008a0757318cb008c8e5e6b Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 19 Jan 2022 14:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk/bulk.component.html           |  8 ++++----
 .../components/bulk/bulk.component.ts             | 14 +++++++++++++-
 .../components/vehicle/vehicle.component.html     |  2 +-
 .../components/vehicle/vehicle.component.ts       | 15 ++++++++++++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html
index 1e742b79..8ef249af 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.html
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html
@@ -1,10 +1,10 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-18 16:50:23
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2022-01-19 14:36:08
+ * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
 -->
 <!-- 搜索表单 -->
 <page-header-wrapper [title]="''">
@@ -43,7 +43,7 @@
   <nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
   <nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
   <nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'已取消'"></nz-tab>
+  <nz-tab [nzTitle]="'已取消('+tabs?.deltQuantity+')'"></nz-tab>
 </nz-tabset>
   <div style="margin-top: 15px;">
     <st
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
index 5082fc0d..f5e54d0b 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -32,7 +32,8 @@ tabs = {
   cancelQuantity: 0,
   receivedQuantity: 0,
   totalQuantity: 0,
-  compolatelQuantity: 0
+  compolatelQuantity: 0,
+  deltQuantity: 0
 };
   constructor(
     public service: WaybillManagementServe, 
@@ -390,6 +391,14 @@ tabs = {
     this.isVisibleEvaluate = true
   }
   getGoodsSourceStatistical() {
+    this.tabs = {
+      signQuantity: 0,
+      cancelQuantity: 0,
+      receivedQuantity: 0,
+      totalQuantity: 0,
+      compolatelQuantity: 0,
+      deltQuantity: 0
+    };
     this.service.request(this.service.$api_get_getBulkStatistics, this.reqParams).subscribe(res => {
       if (res) {
         let totalCount = 0;
@@ -407,6 +416,9 @@ tabs = {
             case '5':
               this.tabs.compolatelQuantity = ele?.count;
             break;
+            case '6':
+              this.tabs.deltQuantity = ele?.count;
+            break;
           }
           totalCount += ele.count
        });
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
index 8fe435a6..6aa1075d 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
@@ -44,7 +44,7 @@
     <nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
     <nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
     <nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
-    <nz-tab [nzTitle]="'已取消'"></nz-tab>
+    <nz-tab [nzTitle]="'已取消('+tabs?.deltQuantity+')'"></nz-tab>
   </nz-tabset>
   <div style="margin-top: 15px;">
     <st #st [bordered]="true" [scroll]="{ x: '2000px' }" [data]="service.$api_get_wholePage" [columns]="columns"
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
index 787421ef..91a3d1a1 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -32,7 +32,8 @@ export class WaybillManagementVehicleComponent implements OnInit {
     receivedQuantity: 0,
     stayQuantity: 0,
     totalQuantity: 0,
-    compolatelQuantity: 0
+    compolatelQuantity: 0,
+    deltQuantity: 0
   };
   constructor(
     public service: WaybillManagementServe,
@@ -378,6 +379,15 @@ export class WaybillManagementVehicleComponent implements OnInit {
     this.isVisibleEvaluate = true;
   }
   getGoodsSourceStatistical() {
+    this.tabs = {
+      signQuantity: 0,
+      cancelQuantity: 0,
+      receivedQuantity: 0,
+      stayQuantity: 0,
+      totalQuantity: 0,
+      compolatelQuantity: 0,
+      deltQuantity: 0
+    };
     this.service.request(this.service.$api_get_getWholeStatistics, this.reqParams).subscribe(res => {
       if (res) {
         let totalCount = 0;
@@ -398,6 +408,9 @@ export class WaybillManagementVehicleComponent implements OnInit {
               case '5':
                 this.tabs.compolatelQuantity = ele?.count;
               break;
+              case '6':
+                this.tabs.deltQuantity = ele?.count;
+              break;
           }
           totalCount += ele.count
         });