diff --git a/src/app/http-interceptors/base-interceptor.ts b/src/app/http-interceptors/base-interceptor.ts index ba06d87..de1f108 100644 --- a/src/app/http-interceptors/base-interceptor.ts +++ b/src/app/http-interceptors/base-interceptor.ts @@ -84,7 +84,7 @@ export class BaseInterceptor implements HttpInterceptor { this.message.create('error', `请核对您的输入信息或格式是否正确!`); } if (error.status === 500) { - this.message.create('error', `状态500,服务器错误!`); + this.message.create('error', `状态500,服务器错误!${error.error.message}`); } if (error.error instanceof ErrorEvent) { // 发生客户端或网络错误。相应处理。 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 8a8cfbe..b90112b 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 @@ -9,6 +9,10 @@

{{organizationName}}

+

证照名称: {{data.licenseType ? data.licenseType.licenseName : null}}

+
+

公司名称: {{data.organization ? data.organization.displayName : null}}

+

办理提醒时间：修改时间 {{data.handleRemindDays}}天 默认时间 {{data.handleRemindDaysDefault}}天 @@ -23,7 +27,7 @@

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

-

驳回说明：{{data.auditLog? data.auditLog.rejectReason : ''}}

+

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

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 82c9c24..0ed445b 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 @@ -11,6 +11,10 @@
+

公司名称:   {{data.organization.displayName}}

+
+

证件名称:   {{data.getData.licenseType.licenseName}}

+

办理提醒时间：修改时间   {{data.getData.handleRemindDays}}天 默认时间 {{data.getData.handleRemindDaysDefault}}天 @@ -39,7 +43,7 @@

证件名称:   {{data.getData.licenseTypeName}}

-

有效期类型:   不适用无有

+

有无证照:   不适用无有

证件图片:    diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.html b/src/app/pages/audit/audit-ing/audit-ing.component.html index 558691e..c03a84a 100644 --- a/src/app/pages/audit/audit-ing/audit-ing.component.html +++ b/src/app/pages/audit/audit-ing/audit-ing.component.html @@ -29,8 +29,17 @@ - - {{item.committedTime | date:"yyyy/MM/dd"}} + + + + + + + + + + + {{item.committedTime | date:"yyyy/MM/dd HH:mm:ss" }} {{item.auditStatusDesc}} 处置 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 1a29b58..b482f0f 100644 --- a/src/app/pages/audit/audit-ing/audit-ing.component.ts +++ b/src/app/pages/audit/audit-ing/audit-ing.component.ts @@ -188,6 +188,14 @@ export class AuditIngComponent implements OnInit { return new Promise((resolve, reject) => { let params = { id: item.itemId } this.http.get(url, { params }).subscribe((data: any) => { + let auditLog = { rejectReason: item.rejectReason } + let organization = { displayName: item.organization? item.organization.displayName : "" } + if (item.auditType == 1) { + data.result.auditLog = auditLog + data.result.organization = organization + data.result.handleRemindDaysDefault = data.result.licenseType.handleRemindDays + data.result.closingRemindDaysDefault = data.result.licenseType.closingRemindDays + } resolve(data.result) }) }) 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 c0ae045..70597bf 100644 --- a/src/app/pages/audit/audit-record/audit-record.component.html +++ b/src/app/pages/audit/audit-record/audit-record.component.html @@ -112,8 +112,15 @@ - - {{item.committedTime | date:"yyyy/MM/dd"}} + + + + + + + + + {{item.committedTime | date:"yyyy/MM/dd HH:mm:ss"}} {{item.auditStatusDesc}} 详情 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 74a9f46..d74fe81 100644 --- a/src/app/pages/audit/audit-record/audit-record.component.ts +++ b/src/app/pages/audit/audit-record/audit-record.component.ts @@ -161,13 +161,16 @@ export class AuditRecordComponent implements OnInit { MaxResultCount: string = '100' getRecordList() { this.tableSpin = true + let endTime = this.validateForm.value.datePicker[1] + ' 23:59:59' + console.log('结束时间', endTime) + let params = { IsContainsChildren: 'true', OrganizationUnitId: this.validateForm.value.organization, AuditTitle: this.validateForm.value.type, AuditType: this.validateForm.value.info, StartTime: this.validateForm.value.datePicker[0], - EndTime: this.validateForm.value.datePicker[1], + EndTime: endTime, AuditStatuses: this.validateForm.value.state, AuditLevel: this.validateForm.value.level, Sorting: null, @@ -188,6 +191,7 @@ export class AuditRecordComponent implements OnInit { } details(item) { + let or = item let component if (item.auditType == 0) { component = GasBaseInfoComponent @@ -200,6 +204,9 @@ export class AuditRecordComponent implements OnInit { } this.getData(item).then(res => { item.getData = res + if (item.auditType == 1) { + item.getData.organization = item.organization + } const modal = this.modal.create({ nzContent: component, nzViewContainerRef: this.viewContainerRef, @@ -241,6 +248,14 @@ export class AuditRecordComponent implements OnInit { return new Promise((resolve, reject) => { let params = { id: item.itemId } this.http.get(url, { params }).subscribe((data: any) => { + let auditLog = { rejectReason: item.rejectReason } + let organization = { displayName: item.organization? item.organization.displayName : "" } + if (item.auditType == 1) { + data.result.auditLog = auditLog + data.result.organization = organization + data.result.handleRemindDaysDefault = data.result.licenseType.handleRemindDays + data.result.closingRemindDaysDefault = data.result.licenseType.closingRemindDays + } resolve(data.result) }) }) diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html index d81ea7b..ed01b39 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html @@ -16,15 +16,57 @@

-
+
+
+
+ + + 预警类别统计 + +
+
预警事件总数
+
{{num}}
+
+
+ +
+ +
+
+ + + 近一个月预警统计 + +
+
统计
+
+
排名
+
油站
+
事件
+
+
+
+
+ +
+
+
+ +
+ +
+
- -
-
-
- - - 预警类别统计 - -
-
预警事件总数
-
{{num}}
-
-
- -
- -
-
- - - 近一个月预警统计 - -
-
统计
-
-
排名
-
油站
-
事件
-
-
-
-
- -
-
-
- -
- -
-
序号
-
+
预警级别 diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss b/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss index 33965e7..f974949 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss @@ -28,6 +28,16 @@ width: 150px; } + .searchParamsZ { + min-width: 200px; + max-width: 250px; + margin-right: 3px; + } + .searchParamsS{ + min-width: 180px; + max-width: 250px; + } + .searchParamsLong { width: 250px; } @@ -140,7 +150,7 @@ } .chart { - width: 98%; + width: 97%; height: 350px; box-sizing: border-box; padding: 0 10px; diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts index 35205b6..4a12604 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts @@ -3,10 +3,8 @@ import { Component, ElementRef, OnInit, ViewContainerRef } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router' import * as echarts from 'echarts'; - import { fromEvent } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; - import * as moment from 'moment'; import { NzModalService } from 'ng-zorro-antd/modal'; import { GetOutOfLineDetailsComponent } from '../today-warning/get-out-of-line-details/get-out-of-line-details.component'; @@ -426,7 +424,6 @@ export class CriminalRecordsAdminComponent implements OnInit { } this.mybarChart.setOption(option); } - //获取统计信息 chartsSpin: boolean = false getAggregations() { @@ -460,8 +457,9 @@ export class CriminalRecordsAdminComponent implements OnInit { tableSpin: boolean = false getViolateRecordList() { let ViolationIds = [] + // console.log(this.validateForm.value.event) if (this.validateForm.value.event) { - ViolationIds.push(this.validateForm.value.event) + ViolationIds = this.validateForm.value.event } if (this.validateForm.value.type && !this.validateForm.value.event) { this.warningTypesDetails.forEach(item => { @@ -479,7 +477,7 @@ export class CriminalRecordsAdminComponent implements OnInit { let params = { Level: this.validateForm.value.level, ViolationIds: ViolationIds, - ViolateArea: this.validateForm.value.site, + ViolateAreas: this.validateForm.value.site, OrganizationUnitId: this.validateForm.value.organization, IsContainsChildren: 'true', IsHandled: disposalState, @@ -500,6 +498,7 @@ export class CriminalRecordsAdminComponent implements OnInit { }) } + isMouseEnter = false mouseEnter() { this.isMouseEnter = true @@ -577,30 +576,84 @@ export class CriminalRecordsAdminComponent implements OnInit { }); this.list = [] this.SkipCount = '0' - console.log('xxxx',this.validateForm.value) + console.log('xxxx', this.validateForm.value) this.getViolateRecordList() } //预警类型接口 - warningTypes: any //预警接口数据 warningTypesDetails: any + warningTypesDetailsCopy: any + + warningTypes: any //预警接口数据 + warningTypesCopy: any + warningLevels: any + warningLevelsCopy: any warningType() { this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => { - this.warningTypesDetails = data.result + this.warningTypesDetails = JSON.parse(JSON.stringify(data.result)) + this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份 this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType }); + this.warningTypesCopy = (data.result as any).groupBy((t) => { return t.violationType }) + this.warningLevels = (data.result as any).groupBy((t) => { return t.level }); + this.warningLevelsCopy = (data.result as any).groupBy((t) => { return t.level }) + this.warningLevels.sort(function (a, b) { + if (a.key < b.key) { + return -1; + } else if (a.key == b.key) { + return 0; + } else { + return 1; + } + }); + this.warningLevelsCopy.sort(function (a, b) { + if (a.key < b.key) { + return -1; + } else if (a.key == b.key) { + return 0; + } else { + return 1; + } + }); + // console.log(111, this.warningTypesDetails) + // console.log(222, this.warningTypesCopy) + // console.log(333, this.warningLevels) }) } typeChange(e) { + if (!e) { + this.warningTypesDetails = this.warningTypesDetailsCopy + this.warningLevels = this.warningLevelsCopy + return + } this.warningTypes.forEach(element => { if (element.key == e) { this.warningTypesDetails = element + this.warningLevels = (element as any).groupBy((t) => { return t.level }); + } + }); + this.validateForm.patchValue({ + event: null, + }); + } + levelChange(e) { + if (!e) { + this.warningTypesDetails = this.warningTypesDetailsCopy + this.warningTypes = this.warningTypesCopy + this.validateForm.patchValue({ + type: null, + }); + return + } + this.warningLevels.forEach(element => { + if (element.key == e) { + this.warningTypesDetails = element + this.warningTypes = (element as any).groupBy((t) => { return t.violationType }); } }); this.validateForm.patchValue({ event: null, }); } - look(item) { diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html index 504340e..3f8eeea 100644 --- a/src/app/pages/criminal-records/criminal-records.component.html +++ b/src/app/pages/criminal-records/criminal-records.component.html @@ -15,15 +15,54 @@
-
+
+
+
+ + + 预警类别统计 + +
+
预警事件总数
+
{{num}}
+
+
+ +
+ +
+
+ + + 近一个月预警统计 + +
+ + + +
+
+ +
+ +
+
+
+
+ +
+
-
-
-
- - - 预警类别统计 - -
-
预警事件总数
-
{{num}}
-
-
- -
- -
-
- - - 近一个月预警统计 - -
- - - -
-
- -
- -
-
-
- -
- -
diff --git a/src/app/pages/criminal-records/criminal-records.component.scss b/src/app/pages/criminal-records/criminal-records.component.scss index f861cc2..af241a7 100644 --- a/src/app/pages/criminal-records/criminal-records.component.scss +++ b/src/app/pages/criminal-records/criminal-records.component.scss @@ -32,6 +32,17 @@ width: 220px; } + .searchParamsZ { + min-width: 200px; + max-width: 250px; + margin-right: 3px; + } + + .searchParamsS { + min-width: 180px; + max-width: 250px; + } + .btn { // flex: 1; } diff --git a/src/app/pages/criminal-records/criminal-records.component.ts b/src/app/pages/criminal-records/criminal-records.component.ts index 0d3262f..952789c 100644 --- a/src/app/pages/criminal-records/criminal-records.component.ts +++ b/src/app/pages/criminal-records/criminal-records.component.ts @@ -439,7 +439,7 @@ export class CriminalRecordsComponent implements OnInit { getViolateRecordList() { let ViolationIds = [] if (this.validateForm.value.event) { - ViolationIds.push(this.validateForm.value.event) + ViolationIds = this.validateForm.value.event } if (this.validateForm.value.type && !this.validateForm.value.event) { this.warningTypesDetails.forEach(item => { @@ -457,7 +457,7 @@ export class CriminalRecordsComponent implements OnInit { let params = { Level: this.validateForm.value.level, ViolationIds: ViolationIds, - ViolateArea: this.validateForm.value.site, + ViolateAreas: this.validateForm.value.site, OrganizationUnitId: JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id, IsContainsChildren: 'true', ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null, @@ -518,24 +518,82 @@ export class CriminalRecordsComponent implements OnInit { //预警类型接口 - warningTypes: any //预警接口数据 warningTypesDetails: any + warningTypesDetailsCopy: any + + warningTypes: any //预警接口数据 + warningTypesCopy: any + warningLevels: any + warningLevelsCopy: any warningType() { this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => { - this.warningTypesDetails = data.result + this.warningTypesDetails = JSON.parse(JSON.stringify(data.result)) + this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份 this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType }); + this.warningTypesCopy = (data.result as any).groupBy((t) => { return t.violationType }) + this.warningLevels = (data.result as any).groupBy((t) => { return t.level }); + this.warningLevelsCopy = (data.result as any).groupBy((t) => { return t.level }) + this.warningLevels.sort(function (a, b) { + if (a.key < b.key) { + return -1; + } else if (a.key == b.key) { + return 0; + } else { + return 1; + } + }); + this.warningLevelsCopy.sort(function (a, b) { + if (a.key < b.key) { + return -1; + } else if (a.key == b.key) { + return 0; + } else { + return 1; + } + }); + // console.log(111, this.warningTypesDetails) + // console.log(222, this.warningTypesCopy) + // console.log(333, this.warningLevels) }) } typeChange(e) { + if (!e) { + this.warningTypesDetails = this.warningTypesDetailsCopy + this.warningLevels = this.warningLevelsCopy + return + } this.warningTypes.forEach(element => { if (element.key == e) { this.warningTypesDetails = element + this.warningLevels = (element as any).groupBy((t) => { return t.level }); } }); this.validateForm.patchValue({ event: null, }); } + levelChange(e) { + if (!e) { + this.warningTypesDetails = this.warningTypesDetailsCopy + this.warningTypes = this.warningTypesCopy + this.validateForm.patchValue({ + type: null, + }); + return + } + this.warningLevels.forEach(element => { + if (element.key == e) { + this.warningTypesDetails = element + this.warningTypes = (element as any).groupBy((t) => { return t.violationType }); + } + }); + this.validateForm.patchValue({ + event: null, + }); + } + + + selectedType = '分布' selectedRankingType = '站点排名' echartClick(type) { diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index a99a790..27657a1 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -34,7 +34,7 @@ 预警记录
  • - 证件 + 证照管理
    • @@ -87,14 +87,32 @@ {{item.notification.data.properties.ViolationName}}
    -
    -
    - 查看 + +
    +
    + 处置 +
    +
    + 申请延期 +
    +
    + 忽略 +
    -
    - 忽略 + + +
    +
    + 查看 +
    +
    + 忽略 +
    -
    + + + @@ -109,8 +127,8 @@ - + @@ -136,4 +154,4 @@ - + \ No newline at end of file diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index ee6b0e1..0551d29 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -310,7 +310,23 @@ export class HomeComponent implements OnInit { } }) } - + //处置 + updateState(item, type) { + let body = { + id: item.notification.entityId, + operation: type + } + this.http.put('/api/services/app/StationValidityLicenseNotificationRecord/UpdateState', body).subscribe(data => { + this.messageId.forEach((element) => { + if (element.id == item.notification.entityId) { + this.notificationService.remove(element.messageId) + } + }) + this.message.create('success', '操作成功'); + }, err => { + this.message.create('error', '操作失败'); + }) + } ngOnDestroy() { console.log('退出') diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html index c44bbdd..44f6cc7 100644 --- a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html +++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html @@ -9,7 +9,7 @@

    证件名称:   {{data.licenseTypeName}}

    -

    有效期类型:   不适用无有

    +

    有无证照:   不适用无有

    @@ -19,7 +19,9 @@

    -

    +

    说明:   {{data.remark}}

    +
    +

    审核记录 @@ -32,8 +34,9 @@

    - {{item.creationTime | date:"yyyy/MM/dd"}} - {{item.auditStatus | auditStatus}} + {{item.creationTime | date:"yyyy/MM/dd"}} + {{item.auditStatus | auditStatus}} + 驳回说明：{{item.auditLog? item.auditLog.rejectReason : ''}} diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html index 7efab10..85f86ac 100644 --- a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html @@ -10,7 +10,7 @@
    -

    有效期类型*

    +

    适用类型*

    @@ -40,8 +40,12 @@
    +

    说明

    + +
    - + +
    diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss index 75ccce6..ae52af3 100644 --- a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss @@ -70,7 +70,7 @@ } button:nth-child(2) { - margin-left: 16px; + margin: 0 15px; } .ok { diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts index 8d590bb..9dd6a98 100644 --- a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts @@ -21,7 +21,8 @@ export class EditFileCategoryComponent implements OnInit { data2 ngOnInit(): void { this.validateForm = this.fb.group({ - type: [null, [Validators.required]] + type: [null, [Validators.required]], + remark: [null] }); this.data2 = JSON.parse(JSON.stringify(this.data)) this.validatyType = (this.data2.validatyType).toString() @@ -38,8 +39,17 @@ export class EditFileCategoryComponent implements OnInit { destroyModal() { this.modal.destroy({ data: 'this the result data' }); } + + isSubmit: boolean = false; ok() { - this.modal.triggerOk() + this.isSubmit = false; + this.modal.triggerOk(); + } + + //提交审核 + submitReview(){ + this.isSubmit = true; + this.modal.triggerOk(); } diff --git a/src/app/pages/license/file-category/file-category.component.html b/src/app/pages/license/file-category/file-category.component.html index a279810..42fcd2c 100644 --- a/src/app/pages/license/file-category/file-category.component.html +++ b/src/app/pages/license/file-category/file-category.component.html @@ -5,12 +5,12 @@ - 证件名称 + 证照名称 - 有效期类型 + 有无证照 + 附件 - 提交时间 - 审核状态 操作 @@ -24,20 +24,20 @@ 无 有 + - {{item.committedTime | date:"yyyy/MM/dd"}}未提交审核 - - {{item.auditStatus | auditStatus}} - 编辑 详情 撤销审核 - 提交审核 + diff --git a/src/app/pages/license/file-category/file-category.component.ts b/src/app/pages/license/file-category/file-category.component.ts index e8a7828..5f557ca 100644 --- a/src/app/pages/license/file-category/file-category.component.ts +++ b/src/app/pages/license/file-category/file-category.component.ts @@ -95,6 +95,10 @@ export class FileCategoryComponent implements OnInit { } edit(item) { + if (item.auditStatus === 1) { + this.message.create('warning', '审核中不允许编辑！'); + return + } const modal = this.modal.create({ nzContent: EditFileCategoryComponent, nzViewContainerRef: this.viewContainerRef, @@ -112,13 +116,24 @@ export class FileCategoryComponent implements OnInit { nzFooter: null, nzClosable: false, nzOnOk: async () => { + if (instance.validatyType == '2' && !instance.data2.imageUrl) { + this.message.create('warning', '请上传附件！'); + return false; + } await new Promise(resolve => { instance.data2.validatyType = Number(instance.validatyType) - this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe(data => { - resolve(data); - this.getStationList(); - this.message.create('success', '修改成功！'); - return true + this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe((data: any) => { + if (!instance.isSubmit) { + resolve(data); + this.getStationList(); + this.message.create('success', '修改成功！'); + return true; + } else { //提交审核 + this.submitReview(data.result).then(res=>{ + resolve(data); + return true; + }); + } }) }) } @@ -154,12 +169,16 @@ export class FileCategoryComponent implements OnInit { //提交审核 submitReview(item) { if (!item.id) { + this.message.create('warning', '该证照请编辑保存后再提交审核！'); return } - let params = { id: item.id } - this.http.post('/api/services/app/StationFileLicense/Commit', {}, { params }).subscribe(data => { - this.message.create('success', '提交审核成功！'); - this.getStationList(); + return new Promise((resolve, reject)=>{ + let params = { id: item.id } + this.http.post('/api/services/app/StationFileLicense/Commit', {}, { params }).subscribe(data => { + this.message.create('success', '提交审核成功！'); + this.getStationList(); + resolve('success'); + }) }) } diff --git a/src/app/pages/license/histories/histories.component.ts b/src/app/pages/license/histories/histories.component.ts index 8600679..9cbd2dd 100644 --- a/src/app/pages/license/histories/histories.component.ts +++ b/src/app/pages/license/histories/histories.component.ts @@ -75,6 +75,8 @@ export class HistoriesComponent implements OnInit { //处置 details(item) { + console.log(item) + item.licenseSnapshot.licenseTypeName = item.licenseSnapshot.validityLicenseType.licenseName const modal = this.modal.create({ nzContent: DetailsUpdateCategoryComponent, nzViewContainerRef: this.viewContainerRef, diff --git a/src/app/pages/license/nav-bar/nav-bar.component.ts b/src/app/pages/license/nav-bar/nav-bar.component.ts index 5f0f058..502afc5 100644 --- a/src/app/pages/license/nav-bar/nav-bar.component.ts +++ b/src/app/pages/license/nav-bar/nav-bar.component.ts @@ -9,7 +9,7 @@ export class NavBarComponent implements OnInit { constructor() { } - navList = ['通知','更新类证件','档案类证件','历史纪录'] + navList = ['通知','经营类证照','资产类证照','历史纪录'] selectedItem = '通知' selectNav(item){ this.selectedItem = item 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 7ac2a22..9dfca80 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 @@ -25,7 +25,7 @@

    -

    +

    审核记录 @@ -38,8 +38,9 @@

    - {{item.creationTime | date:"yyyy/MM/dd"}} - {{item.auditStatus | auditStatus}} + {{item.creationTime | date:"yyyy/MM/dd"}} + {{item.auditStatus | auditStatus}} + 驳回说明：{{item.auditLog? item.auditLog.rejectReason : ''}} 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 5020e33..4bbc24a 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 @@ -63,7 +63,8 @@
    - + +
    diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss index 75ccce6..ae52af3 100644 --- a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss +++ b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss @@ -70,7 +70,7 @@ } button:nth-child(2) { - margin-left: 16px; + margin: 0 15px; } .ok { diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts index fe390b5..2dcaf4a 100644 --- a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts +++ b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts @@ -57,8 +57,16 @@ export class EditUpdateCategoryComponent implements OnInit { this.modal.destroy({ data: 'this the result data' }); } + isSubmit: boolean = false; ok() { - this.modal.triggerOk() + this.isSubmit = false; + this.modal.triggerOk(); + } + + //提交审核 + submitReview(){ + this.isSubmit = true; + this.modal.triggerOk(); } //check change @@ -72,7 +80,7 @@ export class EditUpdateCategoryComponent implements OnInit { if (time <= 0) { this.data2.validityDays = 0 } else { - this.data2.validityDays = time / (1000*3600*24); + this.data2.validityDays = Math.floor(time / (1000*3600*24)); } } } @@ -89,7 +97,7 @@ export class EditUpdateCategoryComponent implements OnInit { if (time <= 0) { this.data2.validityDays = 0 } else { - this.data2.validityDays = time / (1000*3600*24); + this.data2.validityDays = Math.floor(time / (1000*3600*24)); } } else { this.data2.validityDays = 999 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 b205c16..4ced581 100644 --- a/src/app/pages/license/update-category/update-category.component.html +++ b/src/app/pages/license/update-category/update-category.component.html @@ -5,17 +5,17 @@ - 证件名称 + 证照名称 - 证件编号 - 证件有效期 - 附件 - 有效期类型 + 证照编号 + 证照效期 + 有效天数 办理类型 - + 预警状态 + 附件 操作 @@ -26,11 +26,6 @@ {{item.licenseCode || ''}} {{item.isLongTerm ? '长期证照' : (item.validityEndTime | date:"yyyy/MM/dd")}} - - - - - 长期 @@ -41,22 +36,27 @@ {{getHandleTypes(item.handleTypes)}} - + 无 办理提醒 临期提醒 逾期报警 + + + + + 编辑 详情 撤销审核 - 提交审核 + 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 4e36b4f..3f9ac38 100644 --- a/src/app/pages/license/update-category/update-category.component.ts +++ b/src/app/pages/license/update-category/update-category.component.ts @@ -112,6 +112,10 @@ export class UpdateCategoryComponent implements OnInit { } edit(item) { + if (item.auditStatus === 1) { + this.message.create('warning', '审核中不允许编辑！'); + return + } const modal = this.modal.create({ nzContent: EditUpdateCategoryComponent, nzViewContainerRef: this.viewContainerRef, @@ -134,16 +138,23 @@ export class UpdateCategoryComponent implements OnInit { let body = instance.data2 // 日期 if (body.isLongTerm) { - body.validityStartTime = instance.isLongTermTime + body.validityStartTime = instance.isLongTermTime || new Date() } else { body.validityStartTime = instance.isNoLongTermTime[0] || new Date() body.validityEndTime = instance.isNoLongTermTime[1] || new Date() } - this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe(data => { - resolve(data); - this.getStationList(); - this.message.create('success', '修改成功！'); - return true + this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe((data:any) => { + if (!instance.isSubmit) { + resolve(data); + this.getStationList(); + this.message.create('success', '修改成功！'); + return true; + } else { //提交审核 + this.submitReview(data.result).then(res=>{ + resolve(data); + return true; + }); + } }) }) } else { @@ -184,12 +195,16 @@ export class UpdateCategoryComponent implements OnInit { //提交审核 submitReview(item){ if (!item.id) { + this.message.create('warning', '该证照请编辑保存后再提交审核！'); return } - let params = { id: item.id } - this.http.post('/api/services/app/StationValidityLicense/Commit', {},{params}).subscribe(data => { - this.message.create('success', '提交审核成功！'); - this.getStationList(); + return new Promise((resolve, reject)=>{ + let params = { id: item.id } + this.http.post('/api/services/app/StationValidityLicense/Commit', {},{params}).subscribe(data => { + this.message.create('success', '提交审核成功！'); + this.getStationList(); + resolve('success'); + }) }) } diff --git a/src/app/pages/misinformation-list/misinformation-list.component.ts b/src/app/pages/misinformation-list/misinformation-list.component.ts index 00899e8..8c7c32a 100644 --- a/src/app/pages/misinformation-list/misinformation-list.component.ts +++ b/src/app/pages/misinformation-list/misinformation-list.component.ts @@ -757,7 +757,7 @@ export class MisinformationListComponent implements OnInit { //跳转卸油统计页面 goOilList() { - + if (this.router.url.indexOf('petrolStation') != -1) { this.router.navigate(['/records/petrolStation/oliunloadinglist']) } else { diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html index 353003e..6461337 100644 --- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html +++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html @@ -49,11 +49,11 @@
    -
    +
    - 操作前准备预警节点数量 + 卸油准备
    - 操作中准备预警节点数量 + 卸油操作