From c9906c0588c83b36d623958bcbf32148021fe6e5 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 21 Dec 2021 11:20:04 +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       |  2 +-
 .../components/bulk/bulk.component.ts         | 17 +++++++++++-----
 .../components/vehicle/vehicle.component.ts   | 20 ++++++++++++++++---
 .../services/order-management.service.ts      |  8 +++++---
 4 files changed, 35 insertions(+), 12 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 ee3c8dbc..4c34c13c 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-21 10:37:32
+ * @LastEditTime: 2021-12-21 11:19:15
  * @LastEditors: Please set LastEditors
  * @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
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 56a006cd..4bbbaee6 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -54,7 +54,6 @@ export class OrderManagementBulkComponent implements OnInit {
    },
 ];
 tabs = {
-  totalQuantity: 0,
   cancelQuantity: 0,
   receivedQuantity: 0,
   stayQuantity: 0
@@ -67,7 +66,7 @@ tabs = {
    get reqParams() {
     const a:any = {};
     if(this.resourceStatus) {
-      a.billStatus = this.resourceStatus 
+      a.billStatus = this.resourceStatus + 1;
     }
     return {
       ...a,
@@ -78,10 +77,17 @@ tabs = {
     return this.st?.list.filter((item) => item.checked) || [];
   }
   getGoodsSourceStatistical() {
-    this.service.request(this.service.$api_statisticalStatus, { resourceType: 2 }).subscribe(res => {
+    this.service.request(this.service.$api_getBulkStatistical).subscribe(res => {
       if (res) {
-        console.log(res)
-        this.tabs = res;
+       res.forEach((element: any) => {
+        if(element.statusLabel === '待发车') {
+          this.tabs.stayQuantity = element.quantity
+        } else if (element.statusLabel === '待接单') {
+          this.tabs.receivedQuantity = element.quantity
+        } else if (element.statusLabel === '待签收') {
+          this.tabs.cancelQuantity = element.quantity
+        } 
+       });
       }
     })
   }
@@ -94,6 +100,7 @@ tabs = {
     }, 500);
   }
   ngOnInit(): void {
+    this.getGoodsSourceStatistical()
     this.initSF();
     this.initST();
     this.initSTFloat();
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 d89e2058..c9442806 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -53,7 +53,6 @@ export class OrderManagementVehicleComponent implements OnInit {
    },
 ];
 tabs = {
-  totalQuantity: 0,
   cancelQuantity: 0,
   receivedQuantity: 0,
   stayQuantity: 0
@@ -77,7 +76,7 @@ resourceStatus: any;
   get reqParams() {
     const a:any = {};
     if(this.resourceStatus) {
-      a.billStatus = this.resourceStatus 
+      a.billStatus = this.resourceStatus + 1;
     }
     return {
       ...a,
@@ -88,13 +87,28 @@ resourceStatus: any;
     return this.st?.list.filter((item) => item.checked) || [];
   }
   ngOnInit(): void {
+    this.getGoodsSourceStatistical()
     this.initSF();
     this.initST();
     this.initSTFloat();
     this.initSTFloatView();
   }
 
-
+  getGoodsSourceStatistical() {
+    this.service.request(this.service.$api_statisticalStatus).subscribe(res => {
+      if (res) {
+       res.forEach((element: any) => {
+        if(element.statusLabel === '待发车') {
+          this.tabs.stayQuantity = element.quantity
+        } else if (element.statusLabel === '待接单') {
+          this.tabs.receivedQuantity = element.quantity
+        } else if (element.statusLabel === '待签收') {
+          this.tabs.cancelQuantity = element.quantity
+        } 
+       });
+      }
+    })
+  }
 
   /**
  * 初始化查询表单
diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts
index a0a71430..5b466c31 100644
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-21 09:37:07
+ * @LastEditTime: 2021-12-21 11:13:19
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\services\order-management.service.ts
@@ -67,8 +67,10 @@ export class OrderManagementService extends BaseService {
   public $api_getUserDetailByAppUserId = `/cuc/user/getUserDetailByAppUserId`;
   // 根据车辆id查车辆信息
   public $api_getCarLicenseByIds = `/cuc/carLicense/getCarLicenseByIds`;
-  // 统计货源状态数量
-  public $api_statisticalStatus = `/api/sdc/billOperate/statisticalStatus`;
+  // 统计【整车】订单状态数量
+  public $api_statisticalStatus = `/api/sdc/billOperate/getWholeStatistical`;
+  // 统计【大宗】订单状态数量
+  public $api_getBulkStatistical = `/api/sdc/billOperate/getBulkStatistical`;
   constructor(public injector: Injector) {
     super(injector)
   }