Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/sys-setting/components/staff-management/staff-management.component.html
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>

15
src/app/routes/sys-setting/components/staff-management/staff-management.component.ts
View File

@ -52,27 +52,32 @@ export class StaffManagementComponent implements OnInit {
buttons: [
{
text: '编辑',
click: item => this.staffAction(item)
click: item => this.staffAction(item),
acl: { ability: ['SYSTEM-STAFF-edit'] },
},
{
text: '恢复',
iif: item => item.stateLocked === 1,
click: item => this.action(item, 2)
click: item => this.action(item, 2),
acl: { ability: ['SYSTEM-STAFF-lock'] },
},
{
text: '冻结',
iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1,
click: item => this.action(item, 1)
click: item => this.action(item, 1),
acl: { ability: ['SYSTEM-STAFF-lock'] },
},
{
text: '超管转授',
iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1,
click: item => this.transpowerAction(item)
click: item => this.transpowerAction(item),
acl: { ability: ['SYSTEM-STAFF-shiftAdmin'] },
},
{
text: '删除',
iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1,
click: item => this.action(item, 3)
click: item => this.action(item, 3),
acl: { ability: ['SYSTEM-STAFF-delete'] },
}
]
}