From 42ed8b5f072716c64702d298e5d8eca4498f8591 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 19 Jan 2022 17:09:14 +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

---
 .../routes/order-management/components/bulk/bulk.component.ts | 4 +++-
 .../order-management/components/vehicle/vehicle.component.ts  | 4 +++-
 .../supply-management/components/bulk/bulk.component.ts       | 4 +++-
 .../supply-management/components/vehicle/vehicle.component.ts | 4 +++-
 .../waybill-management/components/bulk/bulk.component.ts      | 4 +++-
 .../components/vehicle/vehicle.component.ts                   | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

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 7b6c32d7..62c9c0d0 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -112,7 +112,9 @@ export class OrderManagementBulkComponent implements OnInit {
       GoingQuantity: 0,
       totalCount: 0
     };
-    this.service.request(this.service.$api_getBulkStatistical, { ...this.reqParams }).subscribe(res => {
+    const params: any = Object.assign({}, this.reqParams || {});
+    delete params.billStatus
+    this.service.request(this.service.$api_getBulkStatistical, params).subscribe(res => {
       if (res) {
         let totalCount = 0;
         res.forEach((element: any) => {
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 45244384..3f39db6c 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -127,7 +127,9 @@ resourceStatus: any;
       GoingQuantity: 0,
       totalCount: 0
     };
-    this.service.request(this.service.$api_statisticalStatus,{...this.reqParams}).subscribe(res => {
+    const params: any = Object.assign({}, this.reqParams || {});
+    delete params.billStatus
+    this.service.request(this.service.$api_statisticalStatus,params).subscribe(res => {
       if (res) {
         let totalCount = 0;
        res.forEach((element: any) => {
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts
index 76242f83..64f926f2 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@@ -578,7 +578,9 @@ export class SupplyManagementBulkComponent implements OnInit {
         receivedQuantity: 0,
         stayQuantity: 0
       };
-      this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 2, ...this.reqParams }).subscribe(res => {
+      const params: any = Object.assign({}, this.reqParams || {});
+      delete params.resourceStatus
+      this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 2, ...params }).subscribe(res => {
         if (res) {
           console.log(res)
           this.tabs = res;
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index f3857706..99690312 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -309,7 +309,9 @@ export class SupplyManagementVehicleComponent implements OnInit {
       receivedQuantity: 0,
       stayQuantity: 0
     };
-    this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 1, ...this.reqParams }).subscribe(res => {
+    const params: any = Object.assign({}, this.reqParams || {});
+    delete params.resourceStatus
+    this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 1, ...params }).subscribe(res => {
       if (res) {
         console.log(res);
         this.tabs = res;
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 e7671334..395f9cf6 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -398,7 +398,9 @@ tabs = {
       compolatelQuantity: 0,
       deltQuantity: 0
     };
-    this.service.request(this.service.$api_get_getBulkStatistics, this.reqParams).subscribe(res => {
+    const params: any = Object.assign({}, this.reqParams || {});
+    delete params.wayBillStatus
+    this.service.request(this.service.$api_get_getBulkStatistics, params).subscribe(res => {
       if (res) {
         let totalCount = 0;
         res.forEach((ele: any) => {
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 8aeb29ca..a0f2caba 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -387,7 +387,9 @@ export class WaybillManagementVehicleComponent implements OnInit {
       compolatelQuantity: 0,
       deltQuantity: 0
     };
-    this.service.request(this.service.$api_get_getWholeStatistics, this.reqParams).subscribe(res => {
+    const params: any = Object.assign({}, this.reqParams || {});
+    delete params.wayBillStatus
+    this.service.request(this.service.$api_get_getWholeStatistics, params).subscribe(res => {
       if (res) {
         let totalCount = 0;
         res.forEach((ele: any) => {