解决冲突

This commit is contained in:
wangshiming
2022-02-23 19:38:18 +08:00
parent c27874bb3f
commit f40c5a53a4
19 changed files with 520 additions and 150 deletions

View File

@ -9,7 +9,7 @@
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['FINANCIAL-VOUCHER-list']">查询</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<!-- <button nz-button [disabled]="service.http.loading"> 导出</button>
<button nz-button [disabled]="service.http.loading"> 导出明细</button> -->

View File

@ -328,7 +328,8 @@ export class VoucherManagementComponent implements OnInit {
buttons: [
{
text: '浏览',
click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id])
click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id]),
acl: { ability: ['FINANCIAL-VOUCHER-view'] },
},
// {
// text: '修改'