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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-04-28 19:58:17 +08:00
parent 3053d1120f 17da1ee45d
commit 7907be1a85
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts
View File

@ -122,8 +122,17 @@ export class MenuTreeComponent implements OnInit, OnChanges {
});
}
} else {
console.log(event);
if (event.node?.isChecked) {
this.recursionSetNodeAuth(event.node.origin);
if (event.node.parentNode) {
this._NodeAuthMap.set(event.node.parentNode.origin.id, {
authorityId: event.node.parentNode.origin.id,
buttonAuthorityIds: [],
isUpdateAuthority: 1
});
}
if (this.origin.checked) {
this.origin.buttonInfoList.forEach((auth: any) => this._apiAuthSet.add(auth.functionButtonId));
}

8
src/app/routes/tax-management/components/individual-income/individual-income.component.html
View File

@ -45,10 +45,10 @@
已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div>
<button nz-button nzType="primary" (click)="upload()" acl [acl-ability]="['TAX-ORDERREPORT-declare ']">申报</button>
<button nz-button nzType="primary" (click)="corrections()" acl [acl-ability]="['TAX-ORDERREPORT-change ']">更正</button>
<button nz-button nzType="primary" (click)="resetData()" acl [acl-ability]="['TAX-ORDERREPORT-threshold ']">修改起征点</button>
<button nz-button nzType="primary" (click)="uploadSetting()" acl [acl-ability]="['TAX-ORDERREPORT-resetData ']">更新数据</button>
<button nz-button nzType="primary" (click)="upload()" acl [acl-ability]="['TAX-INCOME-declare']">申报</button>
<button nz-button nzType="primary" (click)="corrections()" acl [acl-ability]="['TAX-INCOME-change']">更正</button>
<button nz-button nzType="primary" (click)="resetData()" acl [acl-ability]="['TAX-INCOME-threshold']">修改起征点</button>
<button nz-button nzType="primary" (click)="uploadSetting()" acl [acl-ability]="['TAX-INCOME-resetData']">更新数据</button>
</div>
</ng-template>