UI

2022-05-06 10:38:22 +08:00
parent cb14f5f6cb
commit d3ab4611ba
19 changed files with 239 additions and 407 deletions
--- a/src/app/routes/vehicle/components/audit/audit.component.html
+++ b/src/app/routes/vehicle/components/audit/audit.component.html
@ -1,26 +1,6 @@
-<!--
- * @Author: your name
- * @Date: 2021-11-29 15:22:34
- * @LastEditTime : 2022-04-20 17:06:02
- * @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\\audit\\audit.component.html
-->
-<!-- 页头 -->
-<page-header-wrapper></page-header-wrapper>
+<!-- <page-header-wrapper></page-header-wrapper>
 <nz-card>
-  <!-- 搜索区 -->
-  <!-- 搜索表单 -->
  <div nz-row nzGutter="8">
-    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
-    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" (formSubmit)="st?.load(1)"
-        (formReset)="resetSF()"></sf>
-
-    </div>
-    <!-- [loading]="false" -->
-
-    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
    <ng-container *ngIf="queryFieldCount > 4">
      <div nz-col [nzSpan]="_$expand ? 24 : 18">
        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
@ -37,21 +17,34 @@
      </div>
    </ng-container>
  </div>
-</nz-card>
-<nz-card>
+</nz-card> -->
+<nz-card class="table-box">
+  <div class="tab_header">
+    <label class="page_title"><label class="driver">|</label>车辆审核列表</label>
+    <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs'
+      [nzTabBarExtraContent]="extraTemplate">
+      <nz-tab [nzTitle]="'全部'"></nz-tab>
+      <nz-tab [nzTitle]="'待审核'"></nz-tab>
+      <nz-tab [nzTitle]="'审核通过'"></nz-tab>
+      <nz-tab [nzTitle]="'驳回'"></nz-tab>
+    </nz-tabset>
+  </div>
+
+  <ng-template #extraTemplate>
+    <div class="mr-sm">
+      <button nz-button nzDanger [nzLoading]="service.http.loading" acl [acl-ability]="['VEHICLE-AUDIT-search']"
+        (click)="openDrawer()">筛选</button>
+      <button nz-button nzDanger (click)="exportFire()" acl [acl-ability]="['VEHICLE-AUDIT-export']">
+        导出</button>
+      <button nz-button nzType="primary" (click)="addModal()" acl [acl-ability]="['VEHICLE-AUDIT-add']">添加车辆</button>
+    </div>
+  </ng-template>
  <!-- 数据列表 -->
  <!-- [data]="service.$api_get_supplier_page" -->
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs'
-    [nzTabBarExtraContent]="extraTemplate">
-    <nz-tab [nzTitle]="'全部'"></nz-tab>
-    <nz-tab [nzTitle]="'待审核'"></nz-tab>
-    <nz-tab [nzTitle]="'审核通过'"></nz-tab>
-    <nz-tab [nzTitle]="'驳回'"></nz-tab>
-  </nz-tabset>
-  <st #st [bordered]="true" [scroll]="{ x: '1200px' }" [columns]="columns" [data]='service.$api_get_userCarLicense_list'
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
+
+  <st #st [bordered]="true" [scroll]="{ x: '1200px',y:scrollY }" [columns]="columns"
+    [data]='service.$api_get_userCarLicense_list' [req]="{  params: reqParams }" [res]="{  process: dataProcess }"
+    [page]="{  }" [loading]="false">
    <ng-template st-row="carLength" let-item let-index="index">
      <div>{{item?.carModel}}-{{item?.carLengthLabel? item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad?
        item?.carLoad + '吨' : ''}}</div>
@ -69,11 +62,4 @@
      <nz-tag *elseBlock nzColor="success">正常</nz-tag>
    </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>
+</nz-card>
--- a/src/app/routes/vehicle/components/audit/audit.component.spec.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.spec.ts
@ -1,31 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-12-01 20:05:59
- * @LastEditTime: 2021-12-01 20:35:33
- * @LastEditors: your name
- * @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.spec.ts
- */
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { VehicleComponentsListComponent } from './list.component';
-
-describe('VehicleComponentsListComponent', () => {
-  let component: VehicleComponentsListComponent;
-  let fixture: ComponentFixture<VehicleComponentsListComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [VehicleComponentsListComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(VehicleComponentsListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- a/src/app/routes/vehicle/components/audit/audit.component.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.ts
@ -3,37 +3,32 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ModalHelper } from '@delon/theme';
+import { SearchDrawerService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { of, Subject } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
 import { VehicleService } from '../../../vehicle/services/vehicle.service';
 import { CarSettleCarauthComponent } from '../list/carauth/carauth.component';
@Component({
  selector: 'app-Vehicle-components-audit',
-  templateUrl: './audit.component.html'
+  templateUrl: './audit.component.html',
+  styleUrls: ['../../../commom/less/commom-table.less']
 })
-export class VehicleComponentsAuditComponent implements OnInit {
-  _$expand = false;
+export class VehicleComponentsAuditComponent extends BasicTableComponent implements OnInit {
  resourceStatus: any = 1;
  defaultTabs = 1;
-  ui!: SFUISchema;
-  schema!: SFSchema;
  columns!: STColumn[];
  @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
-  ) {}
-  /**
-   * 查询字段个数navigate
-   */
-  get queryFieldCount(): number {
-    return Object.keys(this.schema?.properties || {}).length;
+    private modalHelper: ModalHelper,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
  }

  /**
@ -65,6 +60,11 @@ export class VehicleComponentsAuditComponent implements OnInit {
      this.st?.load(1);
    });
  }
+
+  search() {
+    this.st?.load(1);
+  }
+
  dataProcess(data: STData[]): STData[] {
    return data.map((i, index) => {
      i.showSortFlag = false;
@ -101,9 +101,6 @@ export class VehicleComponentsAuditComponent implements OnInit {
                return of([]);
              }
            },
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
          } as SFSelectWidgetSchema
        },
        carNoColor: {
@ -130,12 +127,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
        saveUser: {
          type: 'string',
          title: '录入人员',
-          ui: {
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
+        }
        // approvalStatus: {
        //   type: 'string',
        //   title: '审核状态',
@ -170,7 +162,6 @@ export class VehicleComponentsAuditComponent implements OnInit {
        // }
      }
    };
-    this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
  }

  initST() {
@ -228,20 +219,9 @@ export class VehicleComponentsAuditComponent implements OnInit {
  daoyun(item: any) {
    this.router.navigate(['./view', item], { relativeTo: this.ar });
  }
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
  creat() {
    this.router.navigate(['./new'], { relativeTo: this.ar });
  }
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
  // 导出
  exportFire() {
    let params = Object.assign({}, this.reqParams || {});