解决冲突
This commit is contained in:
@ -32,8 +32,8 @@
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['INSURANCE-LIST-search']">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['INSURANCE-LIST-export']">导出</button>
|
||||
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
@ -77,7 +77,7 @@
|
||||
{{ item.premium | currency }}
|
||||
</ng-template>
|
||||
<ng-template st-row="processMessage" let-item let-index="index">
|
||||
{{ item.processResult == '2' ? item.processMessage : '' }}
|
||||
{{ item.processResult == '2' ? item.processMessage : '' }}
|
||||
</ng-template>
|
||||
<ng-template st-row="driverName" let-item let-index="index">
|
||||
<div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.carNo }} </div>
|
||||
@ -123,6 +123,6 @@
|
||||
|
||||
<ng-template #extraTemplate>
|
||||
<div>
|
||||
<button nz-button nzType="primary" (click)="changeOrder()"> 保险配置 </button>
|
||||
<button nz-button nzType="primary" (click)="changeOrder()" acl [acl-ability]="['INSURANCE-LIST-insuranceConfig']"> 保险配置 </button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
Reference in New Issue
Block a user