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 efc3ab4..82c9c24 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 @@ -7,10 +7,22 @@
-

{{data.gasStation.companyName}} - {{data.gasStation.locationName}} - {{data.gasStation.stationName}}

-
+

{{data.gasStation.companyName}} - {{data.gasStation.locationName}} - {{data.gasStation.stationName}}

+
-
+
+

+ 办理提醒时间：修改时间   {{data.getData.handleRemindDays}}天 + 默认时间 {{data.getData.handleRemindDaysDefault}}天 +

+
+

+ 临期提醒时间：修改时间   {{data.getData.closingRemindDays}}天 + 默认时间 {{data.getData.closingRemindDaysDefault}}天 +

+
+

修改说明：   {{data.getData.remark}}

+

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

@@ -28,7 +40,6 @@

证件名称:   {{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 3b34ef6..6f32b7c 100644 --- a/src/app/pages/audit/audit-ing/audit-ing.component.html +++ b/src/app/pages/audit/audit-ing/audit-ing.component.html @@ -31,14 +31,7 @@ {{item.committedTime | date:"yyyy/MM/dd"}} - - 无 - 审核中 - 审核通过 - 审核驳回 - 未提交审核 - 审核完成 - + {{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 ebb259c..5c5d219 100644 --- a/src/app/pages/audit/audit-ing/audit-ing.component.ts +++ b/src/app/pages/audit/audit-ing/audit-ing.component.ts @@ -6,6 +6,7 @@ import { Observable, fromEvent } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; 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 { GasBaseInfoComponent } from '../gas-base-info/gas-base-info.component'; import { AuditDisposeComponent } from './audit-dispose/audit-dispose.component'; @@ -34,6 +35,7 @@ export class AuditIngComponent implements OnInit { MaxResultCount: string = '100' //获取当前油站档案类证照 getStationList() { + this.tableSpin = true let data = JSON.parse(sessionStorage.getItem('userdata')); let params = { OrganizationUnitId: data.organization.id || "" , @@ -47,6 +49,7 @@ export class AuditIngComponent implements OnInit { element.itemData = JSON.parse(element.itemData) }); this.list = info.result.items || [] + this.tableSpin = false console.log(this.list) }) } @@ -91,7 +94,7 @@ export class AuditIngComponent implements OnInit { url = '/api/services/app/StationFileLicense/Audit' } let params = { - id: item.getData.id, + id: item.auditType == 0? item.gasStation.id : item.getData.id, remark: instance.textarea } let body = instance.isPass? 2 : 3; @@ -114,7 +117,7 @@ export class AuditIngComponent implements OnInit { if (item.auditType == 0) { component = GasBaseInfoComponent } else if (item.auditType == 1) { - + component = AuditDetailsInformTimeComponent } else if (item.auditType == 2) { component = DetailsUpdateCategoryComponent } else if (item.auditType) { diff --git a/src/app/pages/audit/gas-base-info/gas-base-info.component.html b/src/app/pages/audit/gas-base-info/gas-base-info.component.html index ead2175..c9f123e 100644 --- a/src/app/pages/audit/gas-base-info/gas-base-info.component.html +++ b/src/app/pages/audit/gas-base-info/gas-base-info.component.html @@ -1,4 +1,11 @@ -

+
+
+
+ 详情 +
+ +
+

@@ -67,4 +74,27 @@

+ +

+ 审核记录 + + + 审核次数：{{auditList.length}} + + + 驳回次数：{{getRejectNum()}} + + +

+ + + {{item.creationTime | date:"yyyy/MM/dd"}} + 无 + 审核中 + 审核通过 + 审核驳回 + 已撤销审核 + 审核完成 + +
diff --git a/src/app/pages/audit/gas-base-info/gas-base-info.component.scss b/src/app/pages/audit/gas-base-info/gas-base-info.component.scss index e82af1e..8604584 100644 --- a/src/app/pages/audit/gas-base-info/gas-base-info.component.scss +++ b/src/app/pages/audit/gas-base-info/gas-base-info.component.scss @@ -12,4 +12,36 @@ label{ display: inline-block; vertical-align: middle; } .marginLeft { width: 55%; overflow: hidden; +} +.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; + } +} +.recordP{ + display: flex; + justify-content: space-between; + align-items: center; } \ No newline at end of file diff --git a/src/app/pages/audit/gas-base-info/gas-base-info.component.ts b/src/app/pages/audit/gas-base-info/gas-base-info.component.ts index 7422df2..2257ac1 100644 --- a/src/app/pages/audit/gas-base-info/gas-base-info.component.ts +++ b/src/app/pages/audit/gas-base-info/gas-base-info.component.ts @@ -15,10 +15,10 @@ export class GasBaseInfoComponent implements OnInit { isDetails: boolean = false; //是否是详情 ngOnInit(): void { - if (this.data.id === undefined) { //详情 - console.log(this.data,'gasInfo') - this.isDetails = true - } + // if (this.data.id === undefined) { //详情 + // this.isDetails = true + // this.getAuditLogging() + // } this.getBaseInfo() } @@ -33,4 +33,32 @@ export class GasBaseInfoComponent implements OnInit { }) } + destroyModal() { + this.modal.destroy({ data: 'this the result data' }); + } + + auditList: any[] = []; + //获取审核记录 + getAuditLogging() { + if (!this.data.organizationId) { + return + } + let params = { orgId: this.data.organizationId } + this.http.get(`/api/services/app/GasStation/GetAuditted`,{params}).subscribe((data: any)=>{ + //this.auditList = data.result.actionList || [] + console.log(data) + }) + } + + //获取驳回次数 + getRejectNum(): number { + let num = 0 + this.auditList.forEach(item=>{ + if (item.auditStatus == 3) { + num = num + 1 + } + }) + return num + } + } 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 0374804..fb2300c 100644 --- a/src/app/pages/license/file-category/file-category.component.ts +++ b/src/app/pages/license/file-category/file-category.component.ts @@ -31,10 +31,12 @@ export class FileCategoryComponent 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/StationFileLicense/GetStationList`,{params}).subscribe((info: any)=>{ this.list = info.result + this.tableSpin = false console.log(info.result) }) } 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..4e36b4f 100644 --- a/src/app/pages/license/update-category/update-category.component.ts +++ b/src/app/pages/license/update-category/update-category.component.ts @@ -32,10 +32,12 @@ 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.list = info.result + this.tableSpin = false console.log(info.result) }) }