Commit 752f9630 authored by wangqinghua's avatar wangqinghua

update

parent 1c6e8601
<!--添加资源--> <!--添加资源-->
<nz-modal [nzWidth]="1080" [(nzVisible)]="isVisible" [nzTitle]="title" (nzOnCancel)="handleEditCancel()" <nz-modal [nzWidth]="780" [(nzVisible)]="isVisible" [nzTitle]="title" (nzOnCancel)="handleEditCancel()"
(nzOnOk)="handEditleOk()"> (nzOnOk)="handEditleOk()">
<div nz-form class="ant-advanced-search-form form-select"> <div nz-form class="ant-advanced-search-form form-select">
<div nz-row [nzGutter]="24"> <div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="8" class="padding-8-0"> <div nz-col [nzSpan]="6" class="padding-8-0">
<nz-tree [(ngModel)]="nodes"></nz-tree> <nz-tree
[(ngModel)]="nodes"
(nzClick)="getOrg($event)"
></nz-tree>
</div> </div>
<div nz-col [nzSpan]="8"> <div nz-col [nzSpan]="10">
<nz-table #basicTable [nzData]="userList" <nz-table #basicTable [nzData]="userList"
(nzCurrentPageDataChange)="currentPageDataChange($event)" (nzCurrentPageDataChange)="currentPageDataChange($event)"
(nzPageIndexChange)="refreshStatus()" (nzPageIndexChange)="refreshStatus()"
......
...@@ -18,11 +18,15 @@ export class SelectPersonComponent implements OnInit { ...@@ -18,11 +18,15 @@ export class SelectPersonComponent implements OnInit {
selectList = []; selectList = [];
nodes: any[]; nodes: any[];
allChecked = false; allChecked = false;
checkedNumber = 0;
disabledButton = true; disabledButton = true;
indeterminate = false; indeterminate = false;
roleId; roleId;
deleteList=[]; deleteList=[];
pageNum = 1;
pageSize = 10;
organizationId = null;
displayData: Array<{ key1: string; key2: number; key3: string; key4: string; checked: boolean }> = []; displayData: Array<{ key1: string; key2: number; key3: string; key4: string; checked: boolean }> = [];
constructor(private systemSer: SystemService, private commonSer: CommonService) { constructor(private systemSer: SystemService, private commonSer: CommonService) {
...@@ -71,7 +75,6 @@ export class SelectPersonComponent implements OnInit { ...@@ -71,7 +75,6 @@ export class SelectPersonComponent implements OnInit {
this.allChecked = allChecked; this.allChecked = allChecked;
this.indeterminate = (!allChecked) && (!allUnChecked); this.indeterminate = (!allChecked) && (!allUnChecked);
this.disabledButton = !this.userList.some(value => value.checked); this.disabledButton = !this.userList.some(value => value.checked);
this.checkedNumber = this.userList.filter(value => value.checked).length;
} }
ngOnInit() { ngOnInit() {
...@@ -82,7 +85,6 @@ export class SelectPersonComponent implements OnInit { ...@@ -82,7 +85,6 @@ export class SelectPersonComponent implements OnInit {
this.selectList = []; this.selectList = [];
this.deleteList=[]; this.deleteList=[];
this.allChecked = false; this.allChecked = false;
this.checkedNumber = 0;
this.disabledButton = true; this.disabledButton = true;
this.indeterminate = false; this.indeterminate = false;
} }
...@@ -101,12 +103,10 @@ export class SelectPersonComponent implements OnInit { ...@@ -101,12 +103,10 @@ export class SelectPersonComponent implements OnInit {
getUser() { getUser() {
const data = { const data = {
'userBo': { 'search': null,
search:null, 'organizationId': this.organizationId = this.organizationId == '' ? null : this.organizationId,
organizationId:null 'pageNum': this.pageNum,
}, 'pageSize': this.pageSize
'pageNum': '1',
'pageSize': '10'
}; };
this.systemSer.user(data).subscribe( this.systemSer.user(data).subscribe(
(res) => { (res) => {
...@@ -115,6 +115,11 @@ export class SelectPersonComponent implements OnInit { ...@@ -115,6 +115,11 @@ export class SelectPersonComponent implements OnInit {
); );
} }
getOrg(e) {
this.organizationId = e.node.key;
this.getUser();
}
//组织信息 //组织信息
getGroup() { getGroup() {
this.systemSer.organization().subscribe( this.systemSer.organization().subscribe(
......
...@@ -105,7 +105,6 @@ export class GroupComponent implements OnInit { ...@@ -105,7 +105,6 @@ export class GroupComponent implements OnInit {
} }
getOrg(e) { getOrg(e) {
console.log(e);
this.organizationId = e.key; this.organizationId = e.key;
this.getUser(); this.getUser();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment