1.2.0

src/app/routes/vehicle/components/list/list.component.html

@@ -16,17 +16,10 @@
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-      <button
+      <button nz-button nzType="primary" acl [acl-ability]="['VEHICLE-LIST-search']" [nzLoading]="service.http.loading"
-        nz-button
+        (click)="st?.load(1)">查询</button>
-        nzType="primary"
+      <button nz-button nzType="primary" [disabled]="false" (click)="exportFire()" acl
-        acl
+        [acl-ability]="'VEHICLE-LIST-export'">导出</button>
-        [acl-ability]="['VEHICLE-LIST-search']"
-        [nzLoading]="service.http.loading"
-        (click)="st?.load(1)"
-        >查询</button>
-      <button nz-button nzType="primary" [disabled]="false" (click)="exportFire()" acl [acl-ability]="'VEHICLE-LIST-export'"
-        >导出</button
-      >
       <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
@@ -38,23 +31,14 @@
 <nz-card>
   <!-- 数据列表 -->
 
-  <st
+  <st #st [bordered]="true" [scroll]="{ x: '1200px' }" [columns]="columns" [data]="service.$api_get_operate_list"
-    #st
-    [bordered]="true"
-    [scroll]="{ x: '1200px' }"
-    [columns]="columns"
-    [data]="service.$api_get_operate_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] }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
-    [loading]="false"
-  >
     <ng-template st-row="carLength" let-item let-index="index">
-      <div
+      <div>{{ item?.carModelLabel }}-{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
-        >{{ item?.carModelLabel }}-{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
         item?.carLoad ? item?.carLoad + '吨' : ''
-        }}</div
+        }}</div>
-      >
     </ng-template>
     <ng-template st-row="isSelf" let-item let-index="index">
       <div>
@@ -68,13 +52,19 @@
     </ng-template>
     <ng-template st-row="approvalAuditStatus" let-item let-index="index">
       <div>
-        <span *ngIf="item?.approvalAuditStatus === -1 || (item?.approvalAuditStatus === '-1' && item?.isSelf)">未上传</span>
+        <span
+          *ngIf="item?.approvalAuditStatus === -1 || (item?.approvalAuditStatus === '-1' && item?.isSelf)">未上传</span>
         <span *ngIf="item?.approvalAuditStatus === 0 || (item?.approvalAuditStatus === '0' && item?.isSelf)">草稿</span>
-        <span *ngIf="item?.approvalAuditStatus === 10 || (item?.approvalAuditStatus === '10' && item?.isSelf)">待审核</span>
+        <span
-        <span *ngIf="item?.approvalAuditStatus === 15 || (item?.approvalAuditStatus === '15' && item?.isSelf)">已撤销</span>
+          *ngIf="item?.approvalAuditStatus === 10 || (item?.approvalAuditStatus === '10' && item?.isSelf)">待审核</span>
-        <span *ngIf="item?.approvalAuditStatus === 20 || (item?.approvalAuditStatus === '20' && item?.isSelf)">已审核</span>
+        <span
-        <span *ngIf="item?.approvalAuditStatus === 30 || (item?.approvalAuditStatus === '30' && item?.isSelf)">已驳回</span>
+          *ngIf="item?.approvalAuditStatus === 15 || (item?.approvalAuditStatus === '15' && item?.isSelf)">已撤销</span>
-        <span *ngIf="item?.approvalAuditStatus === 40 || (item?.approvalAuditStatus === '40' && item?.isSelf)">证件过期</span>
+        <span
+          *ngIf="item?.approvalAuditStatus === 20 || (item?.approvalAuditStatus === '20' && item?.isSelf)">已审核</span>
+        <span
+          *ngIf="item?.approvalAuditStatus === 30 || (item?.approvalAuditStatus === '30' && item?.isSelf)">已驳回</span>
+        <span
+          *ngIf="item?.approvalAuditStatus === 40 || (item?.approvalAuditStatus === '40' && item?.isSelf)">证件过期</span>
         <span *ngIf="!item?.isSelf">-</span>
       </div>
     </ng-template>

src/app/routes/vehicle/vehicle-routing.module.ts

@@ -14,10 +14,14 @@ import { VehicleComponentsListDetailComponent } from './components/list/detail/d
 import { VehicleComponentsListComponent } from './components/list/list.component';
 
 const routes: Routes = [
-  { path: 'list', component: VehicleComponentsListComponent },
+  { path: 'list', component: VehicleComponentsListComponent, data: { guard: { ability: ['VEHICLE-LIST-search'] } } },
-  { path: 'list/detail/:id', component: VehicleComponentsListDetailComponent },
+  { path: 'list/detail/:id', component: VehicleComponentsListDetailComponent, data: { guard: { ability: ['VEHICLE-LIST-DETAIL-list'] } } },
-  { path: 'audit', component: VehicleComponentsAuditComponent },
+  { path: 'audit', component: VehicleComponentsAuditComponent, data: { guard: { ability: ['VEHICLE-AUDIT-search'] } } },
-  { path: 'audit/detail/:id', component: VehicleComponentsAuditDetailComponent }
+  {
+    path: 'audit/detail/:id',
+    component: VehicleComponentsAuditDetailComponent,
+    data: { guard: { ability: ['VEHICLE-AUDIT-DETAIL-search'] } }
+  }
 ];
 
 @NgModule({