From 79e429ee8d0a9bf75407fe4ae798322b32bbcd48 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 6 Dec 2021 13:20:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E7=BC=96=E8=BE=91=E6=A1=86?= =?UTF-8?q?=E6=89=93=E5=BC=80=E6=97=B6loading=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../role/editrole/editrole.component.ts | 3 +- .../system-management/role/role.component.ts | 3 +- .../user/adduser/adduser.component.html | 2 +- .../user/edituser/edituser.component.html | 2 +- .../user/edituser/edituser.component.ts | 42 ++++++++++--------- .../system-management/user/user.component.ts | 4 +- 6 files changed, 31 insertions(+), 25 deletions(-) diff --git a/src/app/system-management/role/editrole/editrole.component.ts b/src/app/system-management/role/editrole/editrole.component.ts index 2dae734..474dc53 100644 --- a/src/app/system-management/role/editrole/editrole.component.ts +++ b/src/app/system-management/role/editrole/editrole.component.ts @@ -31,7 +31,8 @@ export class EditroleComponent implements OnInit { loadMore() { this.http.get('/api/services/app/Role/GetAllPermissions').subscribe((data:any) => { this.optionList = data.result.items - console.log('所有权限',data) + this.modal.containerInstance.config.nzOkLoading = false + // console.log('所有权限',data) }) } diff --git a/src/app/system-management/role/role.component.ts b/src/app/system-management/role/role.component.ts index b4165c6..35a6e10 100644 --- a/src/app/system-management/role/role.component.ts +++ b/src/app/system-management/role/role.component.ts @@ -75,7 +75,8 @@ export class RoleComponent implements OnInit { nzTitle: '编辑角色', nzContent: EditroleComponent, nzViewContainerRef: this.viewContainerRef, - nzWidth: 288, + nzWidth: 325, + nzOkLoading: true, nzComponentParams: { data: item }, diff --git a/src/app/system-management/user/adduser/adduser.component.html b/src/app/system-management/user/adduser/adduser.component.html index 954b570..f5a8682 100644 --- a/src/app/system-management/user/adduser/adduser.component.html +++ b/src/app/system-management/user/adduser/adduser.component.html @@ -24,7 +24,7 @@ - + diff --git a/src/app/system-management/user/edituser/edituser.component.html b/src/app/system-management/user/edituser/edituser.component.html index f7084b7..3470db9 100644 --- a/src/app/system-management/user/edituser/edituser.component.html +++ b/src/app/system-management/user/edituser/edituser.component.html @@ -24,7 +24,7 @@ - + diff --git a/src/app/system-management/user/edituser/edituser.component.ts b/src/app/system-management/user/edituser/edituser.component.ts index c20d1c4..02a736c 100644 --- a/src/app/system-management/user/edituser/edituser.component.ts +++ b/src/app/system-management/user/edituser/edituser.component.ts @@ -23,11 +23,9 @@ export class EdituserComponent implements OnInit { role: [null, [Validators.required]], phonenum: [null, [Validators.required]] }); - - - console.log(this.data) - this.getAllRoles() - this.getAllOrganization() + Promise.all([this.getAllRoles(), this.getAllOrganization()]).then(()=>{ + this.modal.containerInstance.config.nzOkLoading = false + }) } destroyModal(): void { this.modal.destroy({ data: 'this the result data' }); @@ -36,29 +34,33 @@ export class EdituserComponent implements OnInit { listOfData: any[] = []; //获取角色列表 - getAllRoles() { - this.http.get('/api/services/app/Role/GetAll').subscribe((data: any) => { - console.log('角色列表', data.result.items) - this.listOfData = data.result.items + async getAllRoles() { + await new Promise((resolve, reject) => { + this.http.get('/api/services/app/Role/GetAll').subscribe((data: any) => { + resolve(data) + this.listOfData = data.result.items + }) }) } //获取所有组织机构 - nodes:any = [] - getAllOrganization() { + nodes: any = [] + async getAllOrganization() { let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id let params = { OrganizationUnitId: OrganizationUnitId, IsContainsChildren: "true" } - this.http.get('/api/services/app/Organization/GetAll', { - params: params - }).subscribe((data: any) => { - data.result.items.forEach(element => { - element.key = element.id - element.title = element.displayName - }); - this.nodes = [...this.toTree.toTree(data.result.items)] + await new Promise((resolve, reject) => { + this.http.get('/api/services/app/Organization/GetAll', { + params: params + }).subscribe((data: any) => { + data.result.items.forEach(element => { + element.key = element.id + element.title = element.displayName + }); + this.nodes = [...this.toTree.toTree(data.result.items)] + resolve(data) + }) }) } - } diff --git a/src/app/system-management/user/user.component.ts b/src/app/system-management/user/user.component.ts index 0460206..f18c41b 100644 --- a/src/app/system-management/user/user.component.ts +++ b/src/app/system-management/user/user.component.ts @@ -71,6 +71,7 @@ export class UserComponent implements OnInit { subtitle: '' }, nzOnOk: async () => { + // console.log(instance.validateForm.value) if (instance.validateForm.valid) { await new Promise(resolve => { let body = { @@ -114,6 +115,7 @@ export class UserComponent implements OnInit { nzContent: EdituserComponent, nzViewContainerRef: this.viewContainerRef, nzWidth: 288, + nzOkLoading: true, nzComponentParams: { data: data, }, @@ -122,7 +124,7 @@ export class UserComponent implements OnInit { if (instance.validateForm.valid) { await new Promise(resolve => { let body = { - id:data.id, + id: data.id, userName: instance.validateForm.value.account, name: instance.validateForm.value.name, organizationUnitId: instance.validateForm.value.organization,