fix style

src/app/routes/sys-setting/components/network-freight/network-freight.component.ts

@@ -496,7 +496,7 @@ export class NetworkFreightComponent implements OnInit {
       .subscribe(res => {
         if (res) {
           this.st.load(1);
-          this.service.msgSrv.success('开户成功');
+          this.service.msgSrv.success(bankType === '1' ? res?.paMsg : res?.pfMsg);
         }
       });
   }

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 },

src/app/routes/sys-setting/components/role-management/role-management.component.html

@@ -20,6 +20,6 @@
             <button nz-button nzType="primary" (click)="roleAction()" acl  [acl-ability]="['SYSTEM-ROLE-add']">新建角色</button>
         </div>
     </div>
-    <st #st [data]="params.listUrl" [columns]="columns" [req]="{ process: beforeReq }" [loading]="service.http.loading"
+    <st #st [data]="params.listUrl" [columns]="columns" [req]="{ process: beforeReq }" [loading]="service.http.loading" [page]="{}"
         [scroll]="{ y: '370px' }"></st>
 </nz-card>

src/app/routes/sys-setting/components/role-management/role-management.component.ts

@@ -34,6 +34,7 @@ export class RoleManagementComponent implements OnInit {
     { title: '创建人手机号', className: 'text-center', index: 'telephone' },
     {
       title: '创建时间',
+      width: 170,
       index: 'createTime',
       type: 'date',
       className: 'text-center'

src/app/routes/sys-setting/components/staff-management/staff-management.component.html

@@ -32,7 +32,7 @@
         </nz-alert>
     </div>
 
-    <st #st [data]="service.$api_get_enterprise_staff_page" [columns]="columns"
+    <st #st [data]="service.$api_get_enterprise_staff_page" [columns]="columns" [page]="{}"
         [req]="{  params: {nameOrPhone: this.sf.value?.nameOrPhone} }" [loading]="service.http.loading"
         [scroll]="{ y: '370px' }" (change)="stChange($event)"></st>
 </nz-card>

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,8 +36,13 @@ export class StaffManagementComponent implements OnInit {
     {
       title: '最后登录时间',
       index: 'lastLoginDate',
+<<<<<<< HEAD
       className: 'text-center',
       type: 'date'
+=======
+      type: 'date',
+      format: item => `${item.lastLoginDate || '-'}`
+>>>>>>> 9894aafcc1c3326f1d6dcb9a0c3eb42079a623a9
     },
     {
       title: '成员状态',
@@ -55,31 +61,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'] }
         }
       ]
     }
@@ -92,7 +98,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 {}
 

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
         },