解决冲突

This commit is contained in:
wangshiming
2022-02-23 16:20:39 +08:00
parent 8ef9e67941
commit 5832cc4fba
25 changed files with 253 additions and 215 deletions

View File

@ -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>

View File

@ -460,19 +460,22 @@ export class insuranceManagementListComponent implements OnInit {
buttons: [
{
text: '再次投保',
click: _record => this.retreatNext(_record)
click: _record => this.retreatNext(_record),
// acl: { ability: ['VEHICLE-LIST-view'] },
// iif: item =>
// item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
},
{
text: '查看保单',
click: _record => this.showImg(_record)
click: _record => this.showImg(_record),
// acl: { ability: ['VEHICLE-LIST-view'] },
// iif: item =>
// item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
},
{
text: '退保费',
click: _record => this.retreatPrice(_record)
click: _record => this.retreatPrice(_record),
// acl: { ability: ['VEHICLE-LIST-view'] },
}
]
}