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 a63e40e..0ed286b 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 @@ -23,7 +23,7 @@

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

-

驳回说明：

+

驳回说明：{{data.auditLog.rejectReason}}

diff --git a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html index cd3a5a5..aadc2ca 100644 --- a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html +++ b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html @@ -29,7 +29,7 @@ {{item.handleRemindDays}}天 {{item.closingRemindDaysDefault}}天 {{item.closingRemindDays}}天 - {{item.commitTime ? (item.commitTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}} + {{(item.auditLog && item.auditLog.committedTime) ? (item.auditLog.committedTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}} {{item.auditStatus | auditStatus}} { + this.http.get(`/api/services/app/StationFileLicense/GetStationList`, { params }).subscribe((info: any) => { this.list = info.result + this.tableSpin = false console.log(info.result) }) } @@ -121,21 +123,21 @@ export class FileCategoryComponent implements OnInit { } //提交审核 - submitReview(item){ + submitReview(item) { if (!item.id) { return } let params = { id: item.id } - this.http.post('/api/services/app/StationFileLicense/Commit', {},{params}).subscribe(data => { + this.http.post('/api/services/app/StationFileLicense/Commit', {}, { params }).subscribe(data => { this.message.create('success', '提交审核成功！'); this.getStationList(); }) } //撤销审核 - cancelReview(item){ + cancelReview(item) { let params = { id: item.id } - this.http.post('/api/services/app/StationFileLicense/Uncommit', {},{params}).subscribe(data => { + this.http.post('/api/services/app/StationFileLicense/Uncommit', {}, { params }).subscribe(data => { this.message.create('success', '撤销审核成功！'); this.getStationList(); }) diff --git a/src/app/pages/license/histories/histories.component.html b/src/app/pages/license/histories/histories.component.html index 5f8b95f..3dcfc90 100644 --- a/src/app/pages/license/histories/histories.component.html +++ b/src/app/pages/license/histories/histories.component.html @@ -5,7 +5,7 @@ - 证件名称 + 证件名称 证件编号 证件有效期 @@ -20,17 +20,26 @@ - 证件名称 + {{item.licenseSnapshot.validityLicenseType.licenseName}} - 证件编号 - 证件有效期 - 有效期类型 - 办理类型 - 通知内容 - 通知状态 - 处置状态 + {{item.licenseSnapshot.licenseCode}} + {{item.licenseSnapshot.validityEndTime | date:"yyyy/MM/dd"}} + + + 长期 + + + {{item.licenseSnapshot.validityDays ? item.licenseSnapshot.validityDays+'天' : '/'}} + + + {{getHandleTypes(item.handleTypes)}} + {{item.notificationContent | notificationContent}} + + {{item.licenseSnapshot.licenseViolationType | licenseViolationType}} + {{item.handleState | handleState}} - 详情 + 详情 diff --git a/src/app/pages/license/histories/histories.component.ts b/src/app/pages/license/histories/histories.component.ts index 48dffe3..8600679 100644 --- a/src/app/pages/license/histories/histories.component.ts +++ b/src/app/pages/license/histories/histories.component.ts @@ -1,16 +1,22 @@ -import { Component, OnInit } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Component, OnInit, ViewContainerRef } from '@angular/core'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { Observable, fromEvent } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; +import { DetailsUpdateCategoryComponent } from '../update-category/details-update-category/details-update-category.component'; @Component({ selector: 'app-histories', templateUrl: './histories.component.html', styleUrls: ['./histories.component.scss'] }) + + export class HistoriesComponent implements OnInit { - constructor() { } + constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private http: HttpClient, private message: NzMessageService) { } tableSpin = false - list = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + list = [] tableScrollHeight ngOnInit(): void { @@ -19,14 +25,99 @@ export class HistoriesComponent implements OnInit { fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' }); + + + this.getInform() } + dispose() { + console.log('处置') + } + //获取当前油站通知 + SkipCount = '0' + MaxResultCount = '999' + getInform() { + this.tableSpin = true + let data = JSON.parse(sessionStorage.getItem('userdataOfgasstation')); + let params: any = { + OrganizationUnitId: data.organization.id || "", + Active: false, + SkipCount: this.SkipCount, + MaxResultCount: this.MaxResultCount + } + this.http.get(`/api/services/app/StationValidityLicenseNotificationRecord/GetAll`, { params: params }).subscribe((data: any) => { + this.list = data.result.items + this.tableSpin = false + console.log(data.result.items) + }) + } - dispose() { - console.log('处置') + //获取办理类型 + getHandleTypes(handleTypes: any[]): string { + if (!handleTypes || !handleTypes.length) { + return + } + let names: string[] = [] + let handleTypeList = JSON.parse(JSON.stringify(handleTypes)); + let list: handleTypeList[] = new handleType().list; + handleTypeList.forEach(item => { + list.find(element => { + item == element.value ? names.push(element.name) : null + }) + }) + return names.join(',') } + + + //处置 + details(item) { + const modal = this.modal.create({ + nzContent: DetailsUpdateCategoryComponent, + nzViewContainerRef: this.viewContainerRef, + nzWidth: 450, + nzBodyStyle: { + 'border': '1px solid #91CCFF', + 'border-radius': '0px', + 'padding': '7px', + 'box-shadow': '0 0 8px 0 #fff', + 'background-image': 'linear-gradient(#003665, #000f25)' + }, + nzComponentParams: { + data: item.licenseSnapshot + }, + nzFooter: null, + nzClosable: false, + nzOnOk: async () => { + + } + }); + const instance = modal.getContentComponent(); + modal.afterClose.subscribe(result => { }); + } + +} + + +//办理类型 +export class handleType { + list: handleTypeList[] = [ + { value: 0, name: "无" }, + { value: 1, name: "年度公示" }, + { value: 2, name: "年检" }, + { value: 3, name: "到期换证" }, + { value: 4, name: "年度执行报告" }, + { value: 5, name: "到期检测" }, + { value: 6, name: "年度复训" }, + { value: 7, name: "年度检测" }, + { value: 8, name: "到期备案" }, + { value: 9, name: "到期评价" }, + ] } +export class handleTypeList { + value: number + name: string +} \ No newline at end of file diff --git a/src/app/pages/license/inform/inform.component.html b/src/app/pages/license/inform/inform.component.html index aff191f..f77cf12 100644 --- a/src/app/pages/license/inform/inform.component.html +++ b/src/app/pages/license/inform/inform.component.html @@ -5,7 +5,7 @@ - 证件名称 + 证件名称 证件编号 证件有效期 @@ -20,19 +20,28 @@ - 证件名称 + {{item.licenseSnapshot.validityLicenseType.licenseName}} - 证件编号 - 证件有效期 - 有效期类型 - 办理类型 - 通知内容 - 通知状态 - 处置状态 + {{item.licenseSnapshot.licenseCode}} + {{item.licenseSnapshot.validityEndTime | date:"yyyy/MM/dd"}} + + + 长期 + + + {{item.licenseSnapshot.validityDays ? item.licenseSnapshot.validityDays+'天' : '/'}} + + + {{getHandleTypes(item.handleTypes)}} + {{item.notificationContent | notificationContent}} + + {{item.licenseSnapshot.licenseViolationType | licenseViolationType}} + {{item.handleState | handleState}} - 忽略 - 处置 - 申请延期 + 忽略 + 处置 + 申请延期 diff --git a/src/app/pages/license/inform/inform.component.ts b/src/app/pages/license/inform/inform.component.ts index b201955..368e1f9 100644 --- a/src/app/pages/license/inform/inform.component.ts +++ b/src/app/pages/license/inform/inform.component.ts @@ -1,4 +1,6 @@ +import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; +import { NzMessageService } from 'ng-zorro-antd/message'; import { Observable, fromEvent } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; @Component({ @@ -8,9 +10,9 @@ import { debounceTime } from 'rxjs/operators'; }) export class InformComponent implements OnInit { - constructor() { } + constructor(private http: HttpClient, private message: NzMessageService) { } tableSpin = false - list = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + list = [] tableScrollHeight ngOnInit(): void { @@ -19,14 +21,83 @@ export class InformComponent implements OnInit { fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' }); + + + this.getInform() } + dispose() { + console.log('处置') + } + //获取当前油站通知 + SkipCount = '0' + MaxResultCount = '100' + getInform() { + this.tableSpin = true + let data = JSON.parse(sessionStorage.getItem('userdataOfgasstation')); + let params: any = { + OrganizationUnitId: data.organization.id || "", + Active: true, + SkipCount: this.SkipCount, + MaxResultCount: this.MaxResultCount + } + this.http.get(`/api/services/app/StationValidityLicenseNotificationRecord/GetAll`, { params: params }).subscribe((data: any) => { + this.list = data.result.items + this.tableSpin = false + console.log(data.result.items) + }) + } + //获取办理类型 + getHandleTypes(handleTypes: any[]): string { + if (!handleTypes || !handleTypes.length) { + return + } + let names: string[] = [] + let handleTypeList = JSON.parse(JSON.stringify(handleTypes)); + let list: handleTypeList[] = new handleType().list; + handleTypeList.forEach(item => { + list.find(element => { + item == element.value ? names.push(element.name) : null + }) + }) + return names.join(',') + } - dispose() { - console.log('处置') + + //处置 + updateState(item, type) { + let body = { + id: item.id, + operation: type + } + this.http.put('/api/services/app/StationValidityLicenseNotificationRecord/UpdateState', body).subscribe(data => { + this.getInform() + this.message.create('success', '操作成功'); + }, err => { + this.message.create('error', '操作失败'); + }) } } +//办理类型 +export class handleType { + list: handleTypeList[] = [ + { value: 0, name: "无" }, + { value: 1, name: "年度公示" }, + { value: 2, name: "年检" }, + { value: 3, name: "到期换证" }, + { value: 4, name: "年度执行报告" }, + { value: 5, name: "到期检测" }, + { value: 6, name: "年度复训" }, + { value: 7, name: "年度检测" }, + { value: 8, name: "到期备案" }, + { value: 9, name: "到期评价" }, + ] +} +export class handleTypeList { + value: number + name: string +} \ No newline at end of file diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html index 64cad8a..51399ec 100644 --- a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html +++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html @@ -17,8 +17,8 @@

有效期类型:   {{data.validityDays || 0}}天

-

是否年检:   是否

-
+

证件图片:    diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html index 2d3f7ad..5020e33 100644 --- a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html +++ b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html @@ -31,7 +31,7 @@

有效期类型: {{data2.validityDays || 0}}天 - 是否年检: 是否 +

办理类型

diff --git a/src/app/pages/license/update-category/update-category.component.html b/src/app/pages/license/update-category/update-category.component.html index 5a29bec..aecc0c2 100644 --- a/src/app/pages/license/update-category/update-category.component.html +++ b/src/app/pages/license/update-category/update-category.component.html @@ -5,14 +5,14 @@ - 证件名称 + 证件名称 证件编号 证件有效期 附件 有效期类型 办理类型 - 是否年检 + 提交时间 审核状态 预警状态 @@ -22,18 +22,29 @@ - {{item.licenseTypeName || ''}} + {{item.licenseTypeName || ''}} {{item.licenseCode || ''}} - {{item.validityEndTime | date:"yyyy/MM/dd"}} + {{item.isLongTerm ? '长期证照' : (item.validityEndTime | date:"yyyy/MM/dd")}} - - - + + + + + + + 长期 + + + {{item.validityDays ? item.validityDays+'天' : '/'}} + + - {{item.validityDays || 0}}天 {{getHandleTypes(item.handleTypes)}} - 是否 + {{item.committedTime | date:"yyyy/MM/dd"}}未提交审核 无 @@ -53,7 +64,8 @@ 编辑 详情 撤销审核 - 提交审核 + 提交审核 审核完成 diff --git a/src/app/pages/license/update-category/update-category.component.ts b/src/app/pages/license/update-category/update-category.component.ts index b6472cc..e4f824f 100644 --- a/src/app/pages/license/update-category/update-category.component.ts +++ b/src/app/pages/license/update-category/update-category.component.ts @@ -32,9 +32,11 @@ export class UpdateCategoryComponent implements OnInit { //获取当前油站档案类证照 getStationList() { + this.tableSpin = true let data = JSON.parse(sessionStorage.getItem('userdataOfgasstation')); let params = { orgId: data.organization.id || "" } this.http.get(`/api/services/app/StationValidityLicense/GetCurStationLicense`,{params}).subscribe((info: any)=>{ + this.tableSpin = false this.list = info.result console.log(info.result) }) diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 2c806d3..86730fd 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -81,13 +81,13 @@ import { AuditInformTimeComponent } from './audit/audit-inform-time/audit-inform import { AuditDisposeComponent } from './audit/audit-ing/audit-dispose/audit-dispose.component'; import { EditInformTimeComponent } from './audit/audit-inform-time/edit-inform-time/edit-inform-time.component'; import { AuditDetailsInformTimeComponent } from './audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component'; -import { auditStatusPipe } from '../pipes/type.pipe'; +import { auditStatusPipe, handleState, licenseViolationType, notificationContent } from '../pipes/type.pipe'; import { GasBaseInfoComponent } from './audit/gas-base-info/gas-base-info.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, MisinformationListComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent,auditStatusPipe, GasBaseInfoComponent], + AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, MisinformationListComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent,auditStatusPipe, GasBaseInfoComponent,notificationContent,licenseViolationType,handleState], imports: [ diff --git a/src/app/pipes/type.pipe.ts b/src/app/pipes/type.pipe.ts index b5342d7..40610c1 100644 --- a/src/app/pipes/type.pipe.ts +++ b/src/app/pipes/type.pipe.ts @@ -6,4 +6,31 @@ export class auditStatusPipe implements PipeTransform { let arr = ['未提交审核', '审核中', '审核通过', '审核驳回', '已撤销审核', '审核完成'] return arr[value] } +} + +// 通知内容 +@Pipe({ name: 'notificationContent' }) +export class notificationContent implements PipeTransform { + transform(value: number): string { + let arr = ['有效期', '年检'] + return arr[value] + } +} + +// 通知状态 +@Pipe({ name: 'licenseViolationType' }) +export class licenseViolationType implements PipeTransform { + transform(value: number): string { + let arr = ['无效', '办理提醒', '临期提醒', '逾期报警'] + return arr[value] + } +} + +// 处置状态 +@Pipe({ name: 'handleState' }) +export class handleState implements PipeTransform { + transform(value: number): string { + let arr = ['未启动', '已启动', '已关闭', '已延期'] + return arr[value] + } } \ No newline at end of file diff --git a/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.html b/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.html index 8f177ee..7983bdb 100644 --- a/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.html +++ b/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.html @@ -24,5 +24,11 @@ + + 是否年检 + + + + \ No newline at end of file diff --git a/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.ts b/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.ts index 14a809b..ca3640d 100644 --- a/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.ts +++ b/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.ts @@ -18,7 +18,8 @@ export class AddUpdateOfLicenseComponent implements OnInit { this.validateForm = this.fb.group({ name: [null, [Validators.required]], handleRemindDays: [90, [Validators.required]], - closingRemindDays: [30, [Validators.required]] + closingRemindDays: [30, [Validators.required]], + isYearlyCheck: [true, [Validators.required]] }); } destroyModal(): void { diff --git a/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.html b/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.html index 8f177ee..7983bdb 100644 --- a/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.html +++ b/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.html @@ -24,5 +24,11 @@ + + 是否年检 + + + + \ No newline at end of file diff --git a/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.ts b/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.ts index f96e458..13fd904 100644 --- a/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.ts +++ b/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.ts @@ -18,7 +18,8 @@ export class EditUpdateOfLicenseComponent implements OnInit { this.validateForm = this.fb.group({ name: [this.data.licenseName, [Validators.required]], handleRemindDays: [this.data.handleRemindDays, [Validators.required]], - closingRemindDays: [this.data.closingRemindDays, [Validators.required]] + closingRemindDays: [this.data.closingRemindDays, [Validators.required]], + isYearlyCheck: [this.data.isYearlyCheck, [Validators.required]] }); } destroyModal(): void { diff --git a/src/app/system-management/update-of-license/update-of-license.component.html b/src/app/system-management/update-of-license/update-of-license.component.html index 2dcaaf6..49b64d4 100644 --- a/src/app/system-management/update-of-license/update-of-license.component.html +++ b/src/app/system-management/update-of-license/update-of-license.component.html @@ -9,12 +9,14 @@
- + 更新类证件 办理提醒时间 临期提醒时间 + 是否年检 操作 @@ -23,6 +25,7 @@ {{data.licenseName}} {{data.handleRemindDays}}天 {{data.closingRemindDays}}天 + {{data.isYearlyCheck ? '是' : '否'}} 编辑 删除 diff --git a/src/app/system-management/update-of-license/update-of-license.component.ts b/src/app/system-management/update-of-license/update-of-license.component.ts index 4517a3e..19df34e 100644 --- a/src/app/system-management/update-of-license/update-of-license.component.ts +++ b/src/app/system-management/update-of-license/update-of-license.component.ts @@ -52,7 +52,8 @@ export class UpdateOfLicenseComponent implements OnInit { let body = { licenseName: instance.validateForm.value.name, handleRemindDays: instance.validateForm.value.handleRemindDays, - closingRemindDays: instance.validateForm.value.closingRemindDays + closingRemindDays: instance.validateForm.value.closingRemindDays, + isYearlyCheck: instance.validateForm.value.isYearlyCheck } this.http.post('/api/services/app/ValidityLicenseType/Create', body).subscribe(data => { resolve(data) @@ -91,7 +92,8 @@ export class UpdateOfLicenseComponent implements OnInit { id: item.id, licenseName: instance.validateForm.value.name, handleRemindDays: instance.validateForm.value.handleRemindDays, - closingRemindDays: instance.validateForm.value.closingRemindDays + closingRemindDays: instance.validateForm.value.closingRemindDays, + isYearlyCheck: instance.validateForm.value.isYearlyCheck } this.http.put('/api/services/app/ValidityLicenseType/Update', body).subscribe(data => { resolve(data) diff --git a/src/theme.less b/src/theme.less index daaa707..3c9c6d8 100644 --- a/src/theme.less +++ b/src/theme.less @@ -187,6 +187,17 @@ -webkit-border-radius: 0px; -webkit-font-size: 16px !important; } + + + .ant-select-selection-item { + background: #143c61; + color: #fff; + } + + .ant-select-selection-item-remove { + color: #fff; + } + }