diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/user-editer/user-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/user-editer/user-editer.component.html index 8d4322ad5..64b49f43c 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/user-editer/user-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/user-editer/user-editer.component.html @@ -7,45 +7,66 @@ {{ 'mxk.text.id' | i18n }} - - + +
- {{ 'mxk.users.displayName' | i18n }} - - - + {{ 'mxk.users.displayName' | i18n }} + +
- {{ 'mxk.users.username' | i18n }} - - - + {{ 'mxk.users.username' | i18n }} + +
- {{ 'mxk.users.password' | i18n }} - - - + {{ 'mxk.users.password' | i18n }} + + + + + + +
{{ 'mxk.users.gender' | i18n }} - + @@ -56,16 +77,21 @@ {{ 'mxk.users.picture' | i18n }}
- +
Upload
- + @@ -75,49 +101,50 @@
- {{ 'mxk.users.employeeNumber' | i18n }} - - - + {{ 'mxk.users.employeeNumber' | i18n }} + + - {{ 'mxk.users.windowsAccount' | i18n }} - + {{ 'mxk.users.windowsAccount' | i18n }} - +
{{ 'mxk.users.mobile' | i18n }} - - + + {{ 'mxk.users.email' | i18n }} - +
- {{ 'mxk.users.userType' | i18n }} - - - + {{ 'mxk.users.userType' | i18n }} + + @@ -131,12 +158,9 @@ - {{ 'mxk.users.userstate' | i18n }} - - - + {{ 'mxk.users.userstate' | i18n }} + + @@ -148,21 +172,21 @@
- {{ 'mxk.text.sortIndex' | i18n }} - - - + {{ 'mxk.text.sortIndex' | i18n }} + + - {{ 'mxk.text.status' | i18n }} - - - + {{ 'mxk.text.status' | i18n }} + + @@ -178,15 +202,25 @@ {{ 'mxk.users.familyName' | i18n }} - + {{ 'mxk.users.middleName' | i18n }} - +
@@ -194,15 +228,13 @@ {{ 'mxk.users.givenName' | i18n }} - + {{ 'mxk.users.nickName' | i18n }} - +
@@ -210,8 +242,7 @@ {{ 'mxk.users.idtype' | i18n }} - + @@ -223,8 +254,7 @@ {{ 'mxk.users.idCardNo' | i18n }} - +
@@ -232,8 +262,7 @@ {{ 'mxk.users.married' | i18n }} - + @@ -245,8 +274,7 @@ {{ 'mxk.users.birthDate' | i18n }} - + @@ -254,34 +282,33 @@ {{ 'mxk.users.education' | i18n }} - + - {{ 'mxk.users.graduateFrom' | i18n - }} + {{ 'mxk.users.graduateFrom' | i18n }} - +
- {{ 'mxk.users.graduateDate' | i18n - }} + {{ 'mxk.users.graduateDate' | i18n }} - + - {{ 'mxk.users.startWorkDate' | i18n }} - + {{ 'mxk.users.startWorkDate' | i18n }} - +
@@ -289,16 +316,19 @@ {{ 'mxk.users.timeZone' | i18n }} - + - {{ 'mxk.users.preferredLanguage' | i18n }} - + {{ 'mxk.users.preferredLanguage' | i18n }} - + @@ -306,15 +336,13 @@ {{ 'mxk.users.website' | i18n }} - + {{ 'mxk.users.ims' | i18n }} - + @@ -322,116 +350,121 @@
- {{ 'mxk.users.organization' | i18n }} - - - + {{ 'mxk.users.organization' | i18n }} + + {{ 'mxk.users.division' | i18n }} - - + +
- {{ 'mxk.users.departmentId' | i18n - }} - - + {{ 'mxk.users.departmentId' | i18n }} + + - {{ 'mxk.users.department' | i18n }} - - + {{ 'mxk.users.department' | i18n }} + - +
{{ 'mxk.users.costCenter' | i18n }} - - + + {{ 'mxk.users.jobLevel' | i18n }} - - + +
{{ 'mxk.users.jobTitle' | i18n }} - - + + {{ 'mxk.users.manager' | i18n }} - - + +
{{ 'mxk.users.assistant' | i18n }} - - + + - {{ 'mxk.users.workOfficeName' | i18n }} - - - + {{ 'mxk.users.workOfficeName' | i18n }} + +
{{ 'mxk.users.entryDate' | i18n }} - - + + {{ 'mxk.users.quitDate' | i18n }} - - + +
@@ -439,77 +472,81 @@
- {{ 'mxk.users.workPhoneNumber' | i18n }} - - - + {{ 'mxk.users.workPhoneNumber' | i18n }} + + {{ 'mxk.users.workEmail' | i18n }} - - + +
- {{ 'mxk.users.workCountry' | i18n }} - - - + {{ 'mxk.users.workCountry' | i18n }} + + {{ 'mxk.users.workRegion' | i18n }} - - + +
{{ 'mxk.users.workLocality' | i18n }} - - + + - {{ 'mxk.users.workStreetAddress' | i18n }} - - - + {{ 'mxk.users.workStreetAddress' | i18n }} + +
- {{ 'mxk.users.workPostalCode' | i18n }} - - - + {{ 'mxk.users.workPostalCode' | i18n }} + + {{ 'mxk.users.workFax' | i18n }} - - + +
@@ -518,76 +555,80 @@
{{ 'mxk.users.homeEmail' | i18n }} - - + + - {{ 'mxk.users.homePhoneNumber' | i18n }} - - - + {{ 'mxk.users.homePhoneNumber' | i18n }} + +
{{ 'mxk.users.homeFax' | i18n }} - - + + - {{ 'mxk.users.homePostalCode' | i18n }} - - - + {{ 'mxk.users.homePostalCode' | i18n }} + +
- {{ 'mxk.users.homeCountry' | i18n }} - - - + {{ 'mxk.users.homeCountry' | i18n }} + + {{ 'mxk.users.homeRegion' | i18n }} - - + +
{{ 'mxk.users.homeLocality' | i18n }} - - + + - {{ 'mxk.users.homeStreetAddress' | i18n }} - - - + {{ 'mxk.users.homeStreetAddress' | i18n }} + +
@@ -600,4 +641,4 @@
-
\ No newline at end of file + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/user-editer/user-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/user-editer/user-editer.component.ts index bfc964fed..fad1096f1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/user-editer/user-editer.component.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/users/user-editer/user-editer.component.ts @@ -130,6 +130,15 @@ export class UserEditerComponent implements OnInit { } } } + + onPassword(e: MouseEvent): void { + e.preventDefault(); + this.usersService.generatePassword({}).subscribe(res => { + this.form.model.password = res.data; + this.cdr.detectChanges(); + }); + } + onDeptChange(key: string): void { let node = this.orgTree.getTreeNodeByKey(key); if (node) {