From 916e0f9c0f613e878a8c094664a5c37f22e8721a Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 7 Mar 2022 15:35:40 +0800 Subject: [PATCH] e --- .../role-management/edit/edit.component.ts | 2 +- .../role-management.component.html | 2 +- .../role-management.component.ts | 1 + .../staff-management.component.html | 2 +- .../staff-management.component.ts | 24 +++++++++++-------- .../staff-modal/staff-modal.component.ts | 2 +- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts index 14fd9ca1..95aba48d 100644 --- a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts +++ b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts @@ -46,7 +46,7 @@ export class SettingRoleEditComponent implements OnInit { roleDescription: { title: '角色描述', type: 'string', - maxLength: 100, + maxLength: 50, default: this.roleInfoData.roleDescription, ui: { autosize: { minRows: 3 }, diff --git a/src/app/routes/sys-setting/components/role-management/role-management.component.html b/src/app/routes/sys-setting/components/role-management/role-management.component.html index 4835d533..7ab1b55b 100644 --- a/src/app/routes/sys-setting/components/role-management/role-management.component.html +++ b/src/app/routes/sys-setting/components/role-management/role-management.component.html @@ -20,6 +20,6 @@ - \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/role-management/role-management.component.ts b/src/app/routes/sys-setting/components/role-management/role-management.component.ts index f51eddad..dc2d61ba 100644 --- a/src/app/routes/sys-setting/components/role-management/role-management.component.ts +++ b/src/app/routes/sys-setting/components/role-management/role-management.component.ts @@ -34,6 +34,7 @@ export class RoleManagementComponent implements OnInit { { title: '创建人手机号', index: 'telephone' }, { title: '创建时间', + width: 170, index: 'createTime', type: 'date', className: 'text-left', diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.html b/src/app/routes/sys-setting/components/staff-management/staff-management.component.html index 5dbf2377..fe324f27 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.html +++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.html @@ -32,7 +32,7 @@ - \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts index b1c6f48e..26bc0497 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts +++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema } from '@delon/form'; +import { SettingsService } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; import { SystemService } from '../../services/system.service'; import { SystemStaffStaffModalComponent } from './staff-modal/staff-modal.component'; @@ -35,7 +36,8 @@ export class StaffManagementComponent implements OnInit { { title: '最后登录时间', index: 'lastLoginDate', - type: 'date' + type: 'date', + format: item => `${item.lastLoginDate || '-'}` }, { title: '成员状态', @@ -53,31 +55,31 @@ export class StaffManagementComponent implements OnInit { { text: '编辑', click: item => this.staffAction(item), - acl: { ability: ['SYSTEM-STAFF-edit'] }, + acl: { ability: ['SYSTEM-STAFF-edit'] } }, { text: '恢复', - iif: item => item.stateLocked === 1, + iif: item => item.stateLocked === 1 && item.telephone !== this.user.phone, click: item => this.action(item, 2), - acl: { ability: ['SYSTEM-STAFF-lock'] }, + acl: { ability: ['SYSTEM-STAFF-lock'] } }, { text: '冻结', - iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1, + iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone, click: item => this.action(item, 1), - acl: { ability: ['SYSTEM-STAFF-lock'] }, + acl: { ability: ['SYSTEM-STAFF-lock'] } }, { text: '超管转授', iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1, click: item => this.transpowerAction(item), - acl: { ability: ['SYSTEM-STAFF-shiftAdmin'] }, + acl: { ability: ['SYSTEM-STAFF-shiftAdmin'] } }, { text: '删除', - iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1, + iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone, click: item => this.action(item, 3), - acl: { ability: ['SYSTEM-STAFF-delete'] }, + acl: { ability: ['SYSTEM-STAFF-delete'] } } ] } @@ -90,7 +92,9 @@ export class StaffManagementComponent implements OnInit { 2: { title: '确认恢复？', text: '恢复后用户在本系统的权限将一并重新开启。' }, 3: { title: '确认删除？', text: '删除后该用户ID将在本系统中将无法登录使用并删除，请谨慎操作！' } }; - constructor(public service: SystemService, private nzModalService: NzModalService) {} + + user = this.setting.user; + constructor(public service: SystemService, private nzModalService: NzModalService, private setting: SettingsService) {} ngOnInit(): void {} diff --git a/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts index 81072a63..49b2cb27 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts +++ b/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts @@ -27,7 +27,7 @@ export class SystemStaffStaffModalComponent implements OnInit { staffName: { title: '员工姓名', type: 'string', - maxLength: 11, + maxLength: 10, ui: { widget: staff?.appUserId ? 'text' : 'string', placeholder: '请输入员工姓名' }, default: staff.name },