From da45d8ec0471567acaff69d375569bb94afea2c1 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 17 Dec 2021 16:43:44 +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       | 15 ++++--
 .../components/bulk/bulk.component.ts         | 50 +++++++------------
 .../components/vehicle/vehicle.component.html | 14 ++++--
 .../components/vehicle/vehicle.component.ts   | 50 +++++++------------
 4 files changed, 57 insertions(+), 72 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 3629e2ff..62aca8f9 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.html
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-17 16:00:41
+ * @LastEditTime: 2021-12-17 16:41:28
  * @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
@@ -36,10 +36,15 @@
 </nz-card>
 
 <nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate" >
-    <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
-    </nz-tab>
-  </nz-tabset>
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" 
+  [nzTabBarExtraContent]="extraTemplate">
+  <nz-tab [nzTitle]="'全部'"></nz-tab>
+  <nz-tab [nzTitle]="'待发车('+tabs?.receivedQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'待签收('+tabs?.cancelQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'已完成'"></nz-tab>
+  <nz-tab [nzTitle]="'已取消'"></nz-tab>
+</nz-tabset>
   <div style="margin-top: 15px;">
     <st
     #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 d248b40f..63fb9420 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -34,6 +34,7 @@ export class WaybillManagementBulkComponent implements OnInit {
   columnsFloat: STColumn[] = [];
   columnsFloatView: STColumn[] = [];
   demoValue: any;
+  resourceStatus: any;
   datass: any = [
     {
     one: '1',
@@ -48,44 +49,24 @@ export class WaybillManagementBulkComponent implements OnInit {
     id: 2
    },
 ];
-  tabs = [  {
-    name: '全部',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '待发车',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '运输中',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '代签收',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '已完成',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '已取消',
-    type: 5,
-    count: 0,
-  },
-  ];
+tabs = {
+  totalQuantity: 0,
+  cancelQuantity: 0,
+  receivedQuantity: 0,
+  stayQuantity: 0
+};
   constructor(public service: SupplyManagementService, private modal: NzModalService, public service2: ShipperBaseService) { }
 
   /**
  * 查询参数
  */
   get reqParams() {
+    const a:any = {};
+    if(this.resourceStatus) {
+      a.wayBillStatus = this.resourceStatus 
+    }
     return {
+      ...a,
       ...this.sf?.value,
     };
   }
@@ -537,6 +518,13 @@ export class WaybillManagementBulkComponent implements OnInit {
 
   selectChange(e: number) {
     console.log(e);
+    if(e>=1) {
+    this.resourceStatus = e + 1;
+    }
+    this.initST();
+    setTimeout(() => {
+      this.st.load();
+    }, 500);
   }
   /**
    * 导入货源
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 22358818..34f28924 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
@@ -36,10 +36,16 @@
 </nz-card>
 
 <nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
-    <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
-    </nz-tab>
-  </nz-tabset>
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" 
+  [nzTabBarExtraContent]="extraTemplate">
+  <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]="'待签收('+tabs?.cancelQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'已完成'"></nz-tab>
+  <nz-tab [nzTitle]="'已取消'"></nz-tab>
+</nz-tabset>
   <div style="margin-top: 15px;">
     <st
     #st
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 f2007f4b..e9470842 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -22,6 +22,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
   isVisibleEvaluate = false;
   isVisible = false;
   _$expand = false;
+  resourceStatus: any;
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('stFloat') private readonly stFloat!: STComponent;
   @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
@@ -44,44 +45,24 @@ export class WaybillManagementVehicleComponent implements OnInit {
     id: 2
    },
 ];
-  tabs = [  {
-    name: '全部',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '待发车',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '运输中',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '代签收',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '已完成',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '已取消',
-    type: 5,
-    count: 0,
-  },
-  ];
+tabs = {
+  totalQuantity: 0,
+  cancelQuantity: 0,
+  receivedQuantity: 0,
+  stayQuantity: 0
+};
   constructor(public service: SupplyManagementService, private modal: NzModalService, public service2: ShipperBaseService) { }
 
   /**
  * 查询参数
  */
-  get reqParams() {
+   get reqParams() {
+    const a:any = {};
+    if(this.resourceStatus) {
+      a.wayBillStatus = this.resourceStatus 
+    }
     return {
+      ...a,
       ...this.sf?.value,
     };
   }
@@ -448,6 +429,11 @@ export class WaybillManagementVehicleComponent implements OnInit {
 
   selectChange(e: number) {
     console.log(e);
+    this.resourceStatus = e;
+    this.initST();
+    setTimeout(() => {
+      this.st.load();
+    }, 500);
   }
   /**
    * 导入货源