From 7e330ba2dfa3fef13b936f44b16cdba8895f5eaa Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 17 Feb 2022 17:26:03 +0800
Subject: [PATCH] fix bug

---
 .../vehicle/components/audit/audit.component.html |  9 ++++++++-
 .../vehicle/components/audit/audit.component.ts   | 12 +++++++++++-
 .../vehicle/components/list/list.component.html   |  8 ++------
 .../vehicle/components/list/list.component.ts     | 15 ++-------------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/app/routes/vehicle/components/audit/audit.component.html b/src/app/routes/vehicle/components/audit/audit.component.html
index f0ee9c1b..b6e44428 100644
--- a/src/app/routes/vehicle/components/audit/audit.component.html
+++ b/src/app/routes/vehicle/components/audit/audit.component.html
@@ -47,7 +47,7 @@
 <nz-card>
   <!-- 数据列表 -->
   <!-- [data]="service.$api_get_supplier_page" -->
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs'>
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs' [nzTabBarExtraContent]="extraTemplate">
   <nz-tab [nzTitle]="'全部'"></nz-tab>
   <nz-tab [nzTitle]="'待审核'"></nz-tab>
   <nz-tab [nzTitle]="'审核通过'"></nz-tab>
@@ -83,3 +83,10 @@
     </ng-template>
   </st>
 </nz-card>
+<ng-template #extraTemplate>
+    <!-- 工具栏 -->
+    <div class="toolbar" style="float: right;
+    padding-bottom: 15px;">
+      <button nz-button nzType="primary" (click)="addModal()">添加车辆</button>
+    </div>
+</ng-template>
diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts
index a11c32f4..6a46ee14 100644
--- a/src/app/routes/vehicle/components/audit/audit.component.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.ts
@@ -2,10 +2,12 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ModalHelper } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { of, Subject } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { VehicleService } from '../../../vehicle/services/vehicle.service';
+import { CarSettleCarauthComponent } from '../list/carauth/carauth.component';
 @Component({
   selector: 'app-Vehicle-components-audit',
   templateUrl: './audit.component.html',
@@ -20,7 +22,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
 
-  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) {}
   /**
    * 查询字段个数navigate
    */
@@ -224,4 +226,12 @@ export class VehicleComponentsAuditComponent implements OnInit {
   exportFire() {
     this.service.downloadFile(this.service.$api_carLicenseAudit_export,  this.reqParams );
   }
+  addModal() {
+    const i = {
+      appUserId: '',
+    }
+    this.modalHelper.create(CarSettleCarauthComponent, {i}, { size: 900 }).subscribe((res) => {
+      this.st.load()
+    });
+  }
 }
diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html
index 4179d935..7e3b450d 100644
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime : 2022-01-26 15:31:03
+ * @LastEditTime : 2022-02-17 17:25:34
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\list\\list.component.html
@@ -37,11 +37,7 @@
 </nz-card>
 <nz-card>
   <!-- 数据列表 -->
-  <!-- 工具栏 -->
-  <div class="toolbar" style="float: right;
-  padding-bottom: 15px;">
-    <button nz-button nzType="primary" (click)="addModal()">添加车辆</button>
-  </div>
+
   <st
     #st
     [bordered]="true"
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index df68b1f4..817881c3 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -1,14 +1,11 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
+import { STColumn, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { ModalHelper } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { format } from 'path';
 import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { VehicleService } from '../../../vehicle/services/vehicle.service';
-import { CarSettleCarauthComponent } from './carauth/carauth.component';
 @Component({
   selector: 'app-Vehicle-components-list',
   templateUrl: './list.component.html'
@@ -22,7 +19,7 @@ export class VehicleComponentsListComponent implements OnInit {
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
 
-  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute,  private modalHelper: ModalHelper) {}
+  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
 
   /**
    * 查询参数
@@ -288,12 +285,4 @@ export class VehicleComponentsListComponent implements OnInit {
   exportFire() {
     this.service.downloadFile(this.service.$api_carLicense_export, this.reqParams);
   }
-  addModal() {
-    const i = {
-      appUserId: '',
-    }
-    this.modalHelper.create(CarSettleCarauthComponent, {i}, { size: 900 }).subscribe((res) => {
-      this.st.load()
-    });
-  }
 }