解决冲突

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

@ -8,7 +8,7 @@
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="8" nzOffset="1">
<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]="['SYSTEM-STAFF-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
</div>
@ -18,8 +18,8 @@
<div class="d-flex justify-content-between mb-sm">
<label style="font-size: 18px;">员工列表</label>
<div>
<button nz-button nzType="primary" (click)="staffAction()">添加员工</button>
<button nz-button>导出</button>
<button nz-button nzType="primary" (click)="staffAction()" acl [acl-ability]="['SYSTEM-STAFF-add']">添加员工</button>
<button nz-button acl [acl-ability]="['SYSTEM-STAFF-export']">导出</button>
</div>
</div>