From d0d9de314fc06ad2773d6583b941c354c177988e Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 5 Jul 2022 16:08:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E7=94=A8=E6=88=B7=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../audit-details-inform-time.component.html | 2 - .../audit-dispose.component.html | 12 +++ .../audit/audit-ing/audit-ing.component.html | 1 + .../audit/audit-ing/audit-ing.component.ts | 21 ++-- .../user-details/user-details.component.html | 25 +++++ .../user-details/user-details.component.scss | 66 +++++++++++++ .../user-details/user-details.component.ts | 21 ++++ .../audit-record/audit-record.component.html | 2 + .../audit-record/audit-record.component.ts | 14 ++- src/app/pages/pages.module.ts | 8 +- .../system-management.module.ts | 4 +- .../user/adduser/adduser.component.ts | 7 +- .../user/edituser/edituser.component.ts | 3 + .../user/user.component.html | 26 +++-- .../system-management/user/user.component.ts | 95 +++++++++++++------ src/theme.less | 7 ++ 16 files changed, 251 insertions(+), 63 deletions(-) create mode 100644 src/app/pages/audit/audit-ing/user-details/user-details.component.html create mode 100644 src/app/pages/audit/audit-ing/user-details/user-details.component.scss create mode 100644 src/app/pages/audit/audit-ing/user-details/user-details.component.ts diff --git a/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html index dbece97..36ffc5a 100644 --- a/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html +++ b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html @@ -31,6 +31,4 @@

审核说明: {{data.auditLog? data.auditLog.rejectReason : ''}}

- - \ No newline at end of file diff --git a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html index 03ffd02..df2b4c7 100644 --- a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html +++ b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html @@ -64,6 +64,18 @@

说明:   {{data.getData.remark}}

+
+

账号:   {{data.getData.userName}}

+
+

姓名:   {{data.getData.name}}

+
+

所属机构:   {{data.getData.organizationName}}

+
+

角色:    {{item}}

+
+

手机号:   {{data.getData.phoneNumber}}

+

附件:   

经营类证照提醒时间 经营类证照 资产类证照 + 用户信息 diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.ts b/src/app/pages/audit/audit-ing/audit-ing.component.ts index d3af722..86c93bc 100644 --- a/src/app/pages/audit/audit-ing/audit-ing.component.ts +++ b/src/app/pages/audit/audit-ing/audit-ing.component.ts @@ -9,6 +9,7 @@ import { DetailsUpdateCategoryComponent } from '../../license/update-category/de import { AuditDetailsInformTimeComponent } from '../audit-inform-time/audit-details-inform-time/audit-details-inform-time.component'; import { GasBaseInfoComponent } from '../gas-base-info/gas-base-info.component'; import { AuditDisposeComponent } from './audit-dispose/audit-dispose.component'; +import { UserDetailsComponent } from './user-details/user-details.component'; @Component({ selector: 'app-audit-ing', @@ -80,10 +81,9 @@ export class AuditIngComponent implements OnInit { dispose(item) { - // if (item.auditStatus != 1) { - // return - // } + console.log(item) this.getData(item).then(res => { + console.log('审批具体信息', res) item.getData = res const modal = this.modal.create({ nzContent: AuditDisposeComponent, @@ -107,15 +107,6 @@ export class AuditIngComponent implements OnInit { nzOnOk: async () => { await new Promise(resolve => { let url = '/api/services/app/ContentAuditLog/Audit' - // if (item.auditType == 0) { - // url = '/api/services/app/GasStation/Audit' - // } else if (item.auditType == 1) { - // url = '/api/services/app/OrganizationValidityLicenseRule/Audit' - // } else if (item.auditType == 2) { - // url = '/api/services/app/StationValidityLicense/Audit' - // } else if (item.auditType) { - // url = '/api/services/app/StationFileLicense/Audit' - // } let params = { id: item.id, rejectReason: instance.textarea @@ -144,14 +135,14 @@ export class AuditIngComponent implements OnInit { component = GasBaseInfoComponent } else if (item.auditType == 1) { component = AuditDetailsInformTimeComponent - } else if (item.auditType == 2) { component = DetailsUpdateCategoryComponent + } else if (item.auditType == 4) { + component = UserDetailsComponent } else if (item.auditType) { component = DetailsFileCategoryComponent } this.getData(item).then((res: any) => { - // console.log('res', res) item.getData = res if (item.auditType == 1) { item.getData.isYearlyCheckDefault = res.licenseType.isYearlyCheck @@ -191,6 +182,8 @@ export class AuditIngComponent implements OnInit { url = '/api/services/app/OrganizationValidityLicenseRule/Get' } else if (item.auditType == 2) { url = '/api/services/app/StationValidityLicense/Get' + } else if (item.auditType == 4) { + url = '/api/services/app/EdittingUser/Get' } else if (item.auditType) { url = '/api/services/app/StationFileLicense/Get' } diff --git a/src/app/pages/audit/audit-ing/user-details/user-details.component.html b/src/app/pages/audit/audit-ing/user-details/user-details.component.html new file mode 100644 index 0000000..a7d9139 --- /dev/null +++ b/src/app/pages/audit/audit-ing/user-details/user-details.component.html @@ -0,0 +1,25 @@ +
+
+
+ 详情 +
+ +
+ +
+ +

账号: {{ data.userName}}

+
+

姓名: {{ data.name}}

+
+

所属机构: {{data.organizationName}}

+
+

角色: {{item}}

+
+

手机号: {{ data.phoneNumber}}

+
+

审核状态: {{data.auditStatus | auditStatus}}

+
+

审核说明: {{data.auditLog? data.auditLog.rejectReason : ''}}

+
+
\ No newline at end of file diff --git a/src/app/pages/audit/audit-ing/user-details/user-details.component.scss b/src/app/pages/audit/audit-ing/user-details/user-details.component.scss new file mode 100644 index 0000000..cae3e11 --- /dev/null +++ b/src/app/pages/audit/audit-ing/user-details/user-details.component.scss @@ -0,0 +1,66 @@ +.box { + .title { + font-family: sybold; + width: 100%; + height: 48px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + display: flex; + align-items: center; + position: relative; + + .titlecontent { + width: 100%; + height: 32px; + line-height: 32px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + text-align: center; + color: #91CCFF; + font-size: 16px; + } + + i { + position: absolute; + right: 12px; + color: #fff; + font-size: 18px; + cursor: pointer; + } + } + + .content { + box-sizing: border-box; + padding: 0 15px; + max-height: 580px; + overflow-y: auto; + + .circle { + width: 8px; + height: 8px; + background: linear-gradient(180deg, #36A2FF 0%, #FFFFFF 100%); + opacity: 1; + } + + .recordP { + display: flex; + justify-content: space-between; + align-items: center; + } + } + + p { + margin-bottom: 0; + color: #C4E2FC; + margin: 12px 0; + + img { + width: 88px; + height: 56px; + cursor: pointer; + } + } + + .flexp { + display: flex; + justify-content: space-between; + } +} diff --git a/src/app/pages/audit/audit-ing/user-details/user-details.component.ts b/src/app/pages/audit/audit-ing/user-details/user-details.component.ts new file mode 100644 index 0000000..1d69202 --- /dev/null +++ b/src/app/pages/audit/audit-ing/user-details/user-details.component.ts @@ -0,0 +1,21 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +@Component({ + selector: 'app-user-details', + templateUrl: './user-details.component.html', + styleUrls: ['./user-details.component.scss'] +}) +export class UserDetailsComponent implements OnInit { + + @Input() data?: any; + constructor(private modal: NzModalRef) { } + + + + ngOnInit(): void { + console.log(this.data) + } + destroyModal() { + this.modal.destroy({ data: 'this the result data' }); + } +} diff --git a/src/app/pages/audit/audit-record/audit-record.component.html b/src/app/pages/audit/audit-record/audit-record.component.html index f62ccf7..45de75b 100644 --- a/src/app/pages/audit/audit-record/audit-record.component.html +++ b/src/app/pages/audit/audit-record/audit-record.component.html @@ -9,6 +9,7 @@ + @@ -115,6 +116,7 @@ 经营类证照提醒时间 经营类证照 资产类证照 + 用户信息 diff --git a/src/app/pages/audit/audit-record/audit-record.component.ts b/src/app/pages/audit/audit-record/audit-record.component.ts index 13a16a2..2562c7d 100644 --- a/src/app/pages/audit/audit-record/audit-record.component.ts +++ b/src/app/pages/audit/audit-record/audit-record.component.ts @@ -8,6 +8,7 @@ import { TreeService } from 'src/app/service/tree.service'; import { DetailsFileCategoryComponent } from '../../license/file-category/details-file-category/details-file-category.component'; import { DetailsUpdateCategoryComponent } from '../../license/update-category/details-update-category/details-update-category.component'; import { AuditDetailsInformTimeComponent } from '../audit-inform-time/audit-details-inform-time/audit-details-inform-time.component'; +import { UserDetailsComponent } from '../audit-ing/user-details/user-details.component'; import { GasBaseInfoComponent } from '../gas-base-info/gas-base-info.component'; @Component({ @@ -123,7 +124,7 @@ export class AuditRecordComponent implements OnInit { typeLoading typeList - + typeListOfUsers typeListOfStationData typeListOfUpdate typeListOfFile @@ -153,10 +154,11 @@ export class AuditRecordComponent implements OnInit { Promise.all(promiseArr).then((result) => { // console.log('审批类型', result) + this.typeListOfUsers = [{ licenseName: '用户信息' }] this.typeListOfStationData = [{ licenseName: '油站信息' }] this.typeListOfUpdate = result[0].result.items this.typeListOfFile = result[1].result.items - this.typeList = [...this.typeListOfStationData, ...this.typeListOfUpdate, ...this.typeListOfFile] + this.typeList = [...this.typeListOfUsers, ...this.typeListOfStationData, ...this.typeListOfUpdate, ...this.typeListOfFile] this.typeLoading = false }).catch((error) => { @@ -212,6 +214,7 @@ export class AuditRecordComponent implements OnInit { } details(item) { + console.log('item', item) let or = item let component if (item.auditType == 0) { @@ -220,6 +223,8 @@ export class AuditRecordComponent implements OnInit { component = AuditDetailsInformTimeComponent } else if (item.auditType == 2) { component = DetailsUpdateCategoryComponent + } else if (item.auditType == 4) { + component = UserDetailsComponent } else if (item.auditType) { component = DetailsFileCategoryComponent } @@ -263,6 +268,8 @@ export class AuditRecordComponent implements OnInit { url = '/api/services/app/OrganizationValidityLicenseRule/Get' } else if (item.auditType == 2) { url = '/api/services/app/StationValidityLicense/Get' + } else if (item.auditType == 4) { + url = '/api/services/app/EdittingUser/Get' } else if (item.auditType) { url = '/api/services/app/StationFileLicense/Get' } @@ -280,6 +287,9 @@ export class AuditRecordComponent implements OnInit { if (item.auditType == 2 || item.auditType == 3) { data.result.auditLogId = item.id } + if (item.auditType == 4) { + data.result.auditLog = auditLog + } resolve(data.result) }) }) diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 6c46a0f..61ebaf4 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -86,11 +86,12 @@ import { EditAnnualInspectionComponent } from './audit/annual-inspection/edit-an import { DisposeequipmentComponent } from './records/warning-statistics-list/disposeequipment/disposeequipment.component'; import { WarningStatisticsListComponent } from './records/warning-statistics-list/warning-statistics-list.component'; import { RecordsNavComponent } from './records/records-nav/records-nav.component'; +import { UserDetailsComponent } from './audit/audit-ing/user-details/user-details.component'; @NgModule({ declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, - AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, auditStatusPipe, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent, RecordsNavComponent], + AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, auditStatusPipe, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent, RecordsNavComponent, UserDetailsComponent], imports: [ @@ -134,8 +135,9 @@ import { RecordsNavComponent } from './records/records-nav/records-nav.component NzToolTipModule, NzTimelineModule ], - entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, GasBaseInfoComponent, EditAnnualInspectionComponent], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, GasBaseInfoComponent, EditAnnualInspectionComponent, UserDetailsComponent], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + exports: [auditStatusPipe] }) export class PagesModule { } diff --git a/src/app/system-management/system-management.module.ts b/src/app/system-management/system-management.module.ts index c88a497..b356c5e 100644 --- a/src/app/system-management/system-management.module.ts +++ b/src/app/system-management/system-management.module.ts @@ -44,6 +44,7 @@ import { MenuComponent } from './menu/menu.component'; import { AddmenuComponent } from './menu/addmenu/addmenu.component'; import { EditmenuComponent } from './menu/editmenu/editmenu.component'; import { MenusComponent } from './role/menus/menus.component'; +import { PagesModule } from '../pages/pages.module'; @NgModule({ declarations: [OrganizationComponent, UserComponent, RoleComponent, NavigationComponent, AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, PushComponent, EditPushItemComponent, FileOfLicenseComponent, UpdateOfLicenseComponent, AddFileOfLicenseComponent, EditFileOfLicenseComponent, AddUpdateOfLicenseComponent, EditUpdateOfLicenseComponent, MenuComponent, AddmenuComponent, EditmenuComponent, MenusComponent], imports: [ @@ -65,7 +66,8 @@ import { MenusComponent } from './role/menus/menus.component'; NzTreeModule, NzSpinModule, NzTreeSelectModule, - NzCheckboxModule + NzCheckboxModule, + PagesModule ], entryComponents: [AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, EditPushItemComponent, AddFileOfLicenseComponent, EditFileOfLicenseComponent, AddUpdateOfLicenseComponent, EditUpdateOfLicenseComponent, AddmenuComponent, EditmenuComponent, MenusComponent] diff --git a/src/app/system-management/user/adduser/adduser.component.ts b/src/app/system-management/user/adduser/adduser.component.ts index b203ec2..83b19c0 100644 --- a/src/app/system-management/user/adduser/adduser.component.ts +++ b/src/app/system-management/user/adduser/adduser.component.ts @@ -43,12 +43,12 @@ export class AdduserComponent implements OnInit { this.http.get('/api/services/app/Role/GetAll', { params: params }).subscribe((data: any) => { - console.log('角色列表', data.result.items) + // console.log('角色列表', data.result.items) this.listOfData = data.result.items }) } //获取所有组织机构 - nodes:any = [] + nodes: any = [] getAllOrganization() { let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id let params = { @@ -59,6 +59,9 @@ export class AdduserComponent implements OnInit { params: params }).subscribe((data: any) => { data.result.items.forEach(element => { + if (element.id == OrganizationUnitId) { + element.parentId = null + } element.key = element.id element.title = element.displayName }); diff --git a/src/app/system-management/user/edituser/edituser.component.ts b/src/app/system-management/user/edituser/edituser.component.ts index 80fe234..d97d15c 100644 --- a/src/app/system-management/user/edituser/edituser.component.ts +++ b/src/app/system-management/user/edituser/edituser.component.ts @@ -66,6 +66,9 @@ export class EdituserComponent implements OnInit { params: params }).subscribe((data: any) => { data.result.items.forEach(element => { + if (element.id == OrganizationUnitId) { + element.parentId = null + } element.key = element.id element.title = element.displayName }); diff --git a/src/app/system-management/user/user.component.html b/src/app/system-management/user/user.component.html index 9fdc1b8..e059e21 100644 --- a/src/app/system-management/user/user.component.html +++ b/src/app/system-management/user/user.component.html @@ -59,8 +59,9 @@ 姓名 角色 所属机构 - 状态 - 操作 + 审核状态 + 用户状态 + 操作 @@ -74,17 +75,26 @@ {{data.organizationName}} + + {{data.auditStatus | auditStatus}} + - 状态 + + 已启用 + + + 已停用 + 编辑 重置密码 - 提交审核 - 撤销审核 - 注销 - 启用 - + 提交审核 + 撤销审核 + 启用 + 停用 + 注销 diff --git a/src/app/system-management/user/user.component.ts b/src/app/system-management/user/user.component.ts index 4550634..467835a 100644 --- a/src/app/system-management/user/user.component.ts +++ b/src/app/system-management/user/user.component.ts @@ -16,10 +16,27 @@ export class UserComponent implements OnInit { validateForm!: FormGroup; constructor(private fb: FormBuilder, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient, private toTree: TreeService) { } + level + getAllUrl + addUrl + editUrl + deleteUrl ngOnInit(): void { this.validateForm = this.fb.group({ search: [null] }); + this.level = JSON.parse(sessionStorage.getItem("userdata")).organization.level + if (this.level == 1) { + this.getAllUrl = '/api/services/app/User/GetAll' + this.addUrl = '/api/services/app/User/Create' + this.editUrl = '/api/services/app/User/Update' + this.deleteUrl = '/api/services/app/User/Delete' + } else { + this.getAllUrl = '/api/services/app/EdittingUser/GetAll' + this.addUrl = '/api/services/app/EdittingUser/Create' + this.editUrl = '/api/services/app/EdittingUser/Update' + this.deleteUrl = '/api/services/app/EdittingUser/Delete' + } this.getAllOrganization() this.getAllRoles() } @@ -41,7 +58,7 @@ export class UserComponent implements OnInit { OrganizationUnitId: this.OrganizationUnitId, IsContainsChildren: "true" } - this.http.get('/api/services/app/User/GetAll', { + this.http.get(this.getAllUrl, { params: params }).subscribe((data: any) => { this.usersLIst = data.result.items @@ -103,7 +120,6 @@ export class UserComponent implements OnInit { }) } - //搜索框提交 submitForm(): void { for (const i in this.validateForm.controls) { @@ -139,7 +155,7 @@ export class UserComponent implements OnInit { phoneNumber: instance.validateForm.value.phonenum, isActive: true } - this.http.post('/api/services/app/User/Create', body).subscribe(data => { + this.http.post(this.addUrl, body).subscribe(data => { resolve(data) this.message.create('success', '创建成功！'); this.SkipCount = 0 @@ -188,7 +204,7 @@ export class UserComponent implements OnInit { phoneNumber: instance.validateForm.value.phonenum, isActive: true } - this.http.put('/api/services/app/User/Update', body).subscribe(data => { + this.http.put(this.editUrl, body).subscribe(data => { resolve(data) this.message.create('success', '编辑成功！'); this.getAllUsers() @@ -230,19 +246,60 @@ export class UserComponent implements OnInit { }); } + //提交审核 + audit(data, type) { + if (type && data.auditStatus == 5) {//提交审核 + this.message.create('warning', '审核完成的不能重复提交,请编辑后提交'); + return + } + let url + type ? url = '/api/services/app/EdittingUser/Commit' : url = '/api/services/app/EdittingUser/Uncommit' + this.http.post(url, '', { + params: { + id: data.id + } + }).subscribe(data => { + this.message.create('success', type ? '提交审核成功' : '撤销审核成功'); + this.getAllUsers() + }, err => { + this.message.create('error', type ? '提交审核失败' : '撤销审核失败'); + }) + } + + //停用启用 + cancel(data, type) { + let url + if (this.level == 1) { + type ? url = '/api/services/app/User/Activate' : url = '/api/services/app/User/DeActivate' + + } else { + type ? url = '/api/services/app/EdittingUser/Activate' : url = '/api/services/app/EdittingUser/DeActivate' + } + let body = { + id: data.id + } + this.http.post(url, body).subscribe(data => { + this.message.create('success', type ? '启用成功' : '停用成功'); + this.getAllUsers() + }, err => { + this.message.create('error', type ? '启用失败' : '停用失败'); + }) + } + + //删除 delete(item) { this.modal.confirm({ - nzTitle: `确定要删除${item.userName}这个账户吗?`, + nzTitle: `确定要注销${item.userName}这个账户吗?`, nzOkText: '确定', nzOkType: 'danger', nzOnOk: () => { - this.http.delete('/api/services/app/User/Delete', { + this.http.delete(this.deleteUrl, { params: { Id: item.id } }).subscribe(data => { - this.message.create('success', '删除成功！'); + this.message.create('success', '注销成功！'); this.getAllUsers() }) }, @@ -252,28 +309,4 @@ export class UserComponent implements OnInit { } }); } - - - audit(data, type) { - - } - cancel(data, type) { - this.modal.confirm({ - nzTitle: `判定要注销${data.userName}用户吗?`, - nzOkText: '确定', - nzOkType: 'danger', - nzOnOk: () => { - let body = { - // id: this.data.id, - } - this.http.post('/api/services/app/ViolateRecordVerification/VerifyViolateRecord', body).subscribe(data => { - this.message.create('success', '已注销'); - }, err => { - this.message.create('error', '注销失败'); - }) - }, - nzCancelText: '取消', - nzOnCancel: () => console.log('Cancel') - }); - } } diff --git a/src/theme.less b/src/theme.less index 199cab3..09630bf 100644 --- a/src/theme.less +++ b/src/theme.less @@ -22,6 +22,10 @@ color: rgb(24, 187, 24); } +.greenColor2:hover { + color: rgb(24, 187, 24); +} + .redColor { color: #FF4B65; } @@ -188,6 +192,7 @@ #disposeequipment, #editupdatecategory, #detailsupdatecategory, +#detailsUser, #editfilecategory, #detailsfilecategory { @@ -231,6 +236,7 @@ #disposeequipment, #editupdatecategory, #detailsupdatecategory, +#detailsUser, #editfilecategory, #detailsfilecategory, #inform { @@ -277,6 +283,7 @@ //证件弹出框 #editupdatecategory, #detailsupdatecategory, +#detailsUser, #editfilecategory, #detailsfilecategory { nz-form-item {