From 833108cd0d756bcfde677c604aea935527f24aef Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Thu, 9 May 2019 11:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=88=96=E8=A7=92=E8=89=B2?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=E5=BD=B1=E5=93=8D=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/pages.component.html | 30 ++++++++++++++-
src/app/pages/pages.component.ts | 37 +++++++++++--------
.../department-management.component.ts | 31 ++++++++++------
.../role-management-modify.component.html | 4 +-
.../role-management-modify.component.ts | 27 ++++++--------
.../role-management.component.ts | 20 +++++++---
.../user-management-modify.component.html | 2 +-
7 files changed, 99 insertions(+), 52 deletions(-)
diff --git a/src/app/pages/pages.component.html b/src/app/pages/pages.component.html
index e13df21..b7d03b9 100644
--- a/src/app/pages/pages.component.html
+++ b/src/app/pages/pages.component.html
@@ -97,14 +97,34 @@
原密码
- 请输入原密码
+
+
+ 请输入原密码!
+
+
+ 最小2个字符!
+
+
+ 最大15个字符!
+
+
新密码
- 请输入新密码
+
+
+ 请输入新密码!
+
+
+ 最小2个字符!
+
+
+ 最大15个字符!
+
+
@@ -118,6 +138,12 @@
两次密码不一致!
+
+ 最小2个字符!
+
+
+ 最大15个字符!
+
diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts
index 606e732..4e1d5ec 100644
--- a/src/app/pages/pages.component.ts
+++ b/src/app/pages/pages.component.ts
@@ -81,9 +81,9 @@ export class PagesComponent implements OnInit {
});
this.validateForm = this.fb.group({
- oldPassword: ['', [Validators.required]],
- newPassword: ['', [Validators.required]],
- confirmPassword: ['', [Validators.required, this.confirmationValidator]],
+ oldPassword: ['', [Validators.required, Validators.minLength(2), Validators.maxLength(15)]],
+ newPassword: ['', [Validators.required, Validators.minLength(2), Validators.maxLength(15)]],
+ confirmPassword: ['', [Validators.required, this.confirmationValidator, Validators.minLength(2), Validators.maxLength(15)]],
});
}
@@ -111,19 +111,26 @@ export class PagesComponent implements OnInit {
}
modifyHandleOk(): void {
this.isConfirmLoading = true;
-
- this.httpClient.post('/adminapi/xxxxx', this.validateForm.value).subscribe((response) => {
+ let params = {
+ "curPassword":this.validateForm.get('oldPassword').value,
+ "newPassword":this.validateForm.get('newPassword').value
+ }
+ this.httpClient.put('/sysapi/setting/user/cur/password', params).subscribe((response) => {
// console.log(response);
- this.message.success('修改密码成功！');
- this.validateForm.patchValue({
- oldPassword: '',
- newPassword: '',
- confirmPassword: ''
- })
- for (const i in this.validateForm.controls) {
- this.validateForm.controls[i].markAsPristine();
- this.validateForm.controls[i].markAsUntouched();
- this.validateForm.controls[i].updateValueAndValidity();
+ if(response.is_success){
+ this.message.success('修改密码成功！');
+ this.validateForm.patchValue({
+ oldPassword: '',
+ newPassword: '',
+ confirmPassword: ''
+ })
+ for (const i in this.validateForm.controls) {
+ this.validateForm.controls[i].markAsPristine();
+ this.validateForm.controls[i].markAsUntouched();
+ this.validateForm.controls[i].updateValueAndValidity();
+ }
+ }else{
+ this.message.error(response.err_msg + '，修改失败！');
}
this.modalIsVisible = false;
this.isConfirmLoading = false;
diff --git a/src/app/pages/system-management/department-management/department-management.component.ts b/src/app/pages/system-management/department-management/department-management.component.ts
index 1201d89..c505070 100644
--- a/src/app/pages/system-management/department-management/department-management.component.ts
+++ b/src/app/pages/system-management/department-management/department-management.component.ts
@@ -140,16 +140,23 @@ export class DepartmentManagementComponent implements OnInit {
nzTitle: '删除',
nzContent: '确定删除【' + this.orgDetail.organization + '】?',
nzOnOk: () => new Promise((resolve, reject) => {
- this.http.delete('/sysapi/setting/organization/delOrgByid/' + this.orgDetail.id).subscribe((json) => {
- if (json.is_success) {
- resolve();
- this.message.success(`删除成功!`);
- this.initTree();
- } else {
- reject();
- this.message.error(`删除失败!`);
- }
- })
+ if (this.userList && this.userList.length > 0) {
+ setTimeout(()=>{
+ this.message.error('删除失败，请删除此机构下的用户后再执行此操作！');
+ reject()
+ },500);
+ } else {
+ this.http.delete('/sysapi/setting/organization/delOrgByid/' + this.orgDetail.id).subscribe((json) => {
+ if (json.is_success) {
+ resolve();
+ this.message.success(`删除成功!`);
+ this.initTree();
+ } else {
+ reject();
+ this.message.error(`删除失败!`);
+ }
+ })
+ }
}).catch(() => console.log('Oops errors!'))
});
@@ -411,10 +418,10 @@ export class DepartmentManagementComponent implements OnInit {
this.orgDetail = treeNode;
this.oldLoginName = this.orgDetail.code;
this.queryUserById();
- if(this.treeSelected.children&&this.treeSelected.children.length>0){
+ if (this.treeSelected.children && this.treeSelected.children.length > 0) {
this.canDel = false;
this.canEdit = true;
- }else{
+ } else {
this.canDel = true;
this.canEdit = true;
}
diff --git a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html
index 12963f9..6085ddf 100644
--- a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html
+++ b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html
@@ -27,10 +27,10 @@
-
-
+
| 姓名 |
用户名 |
电话 |
diff --git a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts
index 8d61f37..4d78fbd 100644
--- a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts
+++ b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts
@@ -142,9 +142,6 @@ export class RoleManagementModifyComponent implements OnInit {
item.disabled = false;
this.userSelecteds = [...this.userSelecteds, item];
})
-
- } else {
-
}
})
}
@@ -186,18 +183,18 @@ export class RoleManagementModifyComponent implements OnInit {
this.visibleUsers = false;
}
//处理机构负责人选择和数据回填
- userSelect() {
- if (this.userData) {
- this.userData.forEach(item => {
- this.userSelecteds.forEach(option => {
- if (item.uid == option.uid) {
- item.checked = true;
- item.disabled = true;
- }
- })
- })
- }
- }
+ // userSelect() {
+ // if (this.userData) {
+ // this.userData.forEach(item => {
+ // this.userSelecteds.forEach(option => {
+ // if (item.uid == option.uid) {
+ // item.checked = true;
+ // item.disabled = true;
+ // }
+ // })
+ // })
+ // }
+ // }
//删除机构负责人
delectConfirm(item) {
this.userSelecteds = this.userSelecteds.filter(function (option) {
diff --git a/src/app/pages/system-management/role-management/role-management.component.ts b/src/app/pages/system-management/role-management/role-management.component.ts
index d59f76c..d0e0bcb 100644
--- a/src/app/pages/system-management/role-management/role-management.component.ts
+++ b/src/app/pages/system-management/role-management/role-management.component.ts
@@ -47,12 +47,22 @@ export class RoleManagementComponent implements OnInit {
}
//删除
delectConfirm(item) {
- this.http.delete('/sysapi/setting/role/delete/' + item.rid).subscribe((json) => {
- if (json.is_success) {
- this.message.success(`删除成功!`);
- this.queryTable();
+ this.http.get('/sysapi/setting/role/users/' + item.rid).subscribe((response) => {
+ if (response.is_success) {
+ if (response.body && response.body.length > 0) {
+ this.message.error('删除失败，请删除此角色下的用户后再执行此操作！')
+ } else {
+ this.http.delete('/sysapi/setting/role/delete/' + item.rid).subscribe((json) => {
+ if (json.is_success) {
+ this.message.success(`删除成功！`);
+ this.queryTable();
+ } else {
+ this.message.error(`删除失败！`)
+ }
+ })
+ }
} else {
- this.message.error(`删除失败`)
+ this.message.error('获取此角色下的用户列表失败！')
}
})
}
diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html
index 12e55b0..4ab3630 100644
--- a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html
+++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html
@@ -76,7 +76,7 @@
身份证号
- 身份证号最长20个字符
+ 身份证号最长18个字符