-
{{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.ts b/src/app/pages/audit/gas-base-info/gas-base-info.component.ts
index 2257ac1..187e5e6 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) { //详情
- // this.isDetails = true
- // this.getAuditLogging()
- // }
+ if (this.data.id === undefined) { //详情
+ this.isDetails = true
+ //this.getAuditLogging()
+ }
this.getBaseInfo()
}
From dd51d502ccc2eca56e12dbb60ce6e5932f646ee2 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Sat, 14 May 2022 10:42:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2?=
=?UTF-8?q?=E7=BA=AA=E5=BD=95=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../audit/audit-ing/audit-ing.component.ts | 24 +++-
.../audit-record/audit-record.component.html | 24 ++--
.../audit-record/audit-record.component.ts | 134 ++++++++++++------
.../gas-base-info.component.html | 7 +-
.../details-file-category.component.html | 7 +-
.../file-category.component.html | 9 +-
.../details-update-category.component.html | 7 +-
.../update-category.component.html | 9 +-
8 files changed, 135 insertions(+), 86 deletions(-)
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 aeb9def..03f20df 100644
--- a/src/app/pages/audit/audit-ing/audit-ing.component.ts
+++ b/src/app/pages/audit/audit-ing/audit-ing.component.ts
@@ -1,5 +1,5 @@
import { HttpClient } from '@angular/common/http';
-import { Component, OnInit, ViewContainerRef } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewContainerRef } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { Observable, fromEvent } from 'rxjs';
@@ -17,7 +17,7 @@ import { AuditDisposeComponent } from './audit-dispose/audit-dispose.component';
})
export class AuditIngComponent implements OnInit {
- constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef,private http: HttpClient,private message: NzMessageService) { }
+ constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef,private http: HttpClient,private message: NzMessageService,private element: ElementRef) { }
tableSpin = false
tableScrollHeight
@@ -30,9 +30,21 @@ export class AuditIngComponent implements OnInit {
this.getStationList()
}
+ ngAfterViewInit(): void {
+ fromEvent(this.element.nativeElement.querySelector(`.ant-table-body`) as HTMLCanvasElement, 'scroll').pipe(debounceTime(100)).subscribe((event: any) => { //监听 DOM 滚动事件
+ if (event.target.scrollHeight - (event.target.scrollTop + event.target.clientHeight) <= 10) {
+ if (this.totalCount > this.list.length) {
+ this.SkipCount = String(Number(this.SkipCount) + 50)
+ this.getStationList()
+ }
+ }
+ });
+ }
+
list = []
- SkipCount: string = '0'
- MaxResultCount: string = '100'
+ totalCount;//列表总数
+ SkipCount: string = '0';
+ MaxResultCount: string = '100';
//获取当前油站档案类证照
getStationList() {
this.tableSpin = true
@@ -48,7 +60,9 @@ export class AuditIngComponent implements OnInit {
info.result.items.forEach(element => {
element.itemData = JSON.parse(element.itemData)
});
- this.list = info.result.items || []
+ this.list = this.list.concat(info.result.items);
+ this.list = [...this.list]
+ this.totalCount = info.result.totalCount
this.tableSpin = false
console.log(this.list)
})
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 fed8094..86d42a5 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.html
+++ b/src/app/pages/audit/audit-record/audit-record.component.html
@@ -53,6 +53,7 @@
+
@@ -92,7 +93,7 @@
| 审批信息 |
加油站名称 |
-
区域 |
+
区域 |
省公司 |
提交时间 |
审批状态 |
@@ -102,16 +103,21 @@
|
- 审批类型
+ {{item.auditTitle || ''}}
+ |
+
+ 油站信息
+ 更新类证照提醒时间
+ 更新类证照
+ 档案类证照
|
- 审批信息 |
- 加油站名称 |
- 区域 |
- 省公司 |
- 提交时间 |
- 审批状态 |
+ |
+ |
+ |
+ {{item.committedTime | date:"yyyy/MM/dd"}} |
+ {{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 bc1dd22..3627804 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.ts
+++ b/src/app/pages/audit/audit-record/audit-record.component.ts
@@ -5,6 +5,11 @@ import { NzModalService } from 'ng-zorro-antd/modal';
import { Observable, fromEvent } from 'rxjs';
import { debounceTime } from 'rxjs/operators';
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 { GasBaseInfoComponent } from '../gas-base-info/gas-base-info.component';
+
@Component({
selector: 'app-audit-record',
templateUrl: './audit-record.component.html',
@@ -14,7 +19,7 @@ export class AuditRecordComponent implements OnInit {
validateForm!: FormGroup;
constructor(private element: ElementRef, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private toTree: TreeService, private http: HttpClient, private fb: FormBuilder) { }
- 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
startdate
@@ -41,7 +46,6 @@ export class AuditRecordComponent implements OnInit {
let lastD = lw.getDate();
this.startdate = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期
-
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px'
// 页面监听
fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
@@ -49,38 +53,34 @@ export class AuditRecordComponent implements OnInit {
});
this.getTypeList()
-
await this.getAllOrganization()
this.getRecordList()
}
- SkipCount
+
submitForm(): void {
- for (const i in this.validateForm.controls) {
- this.validateForm.controls[i].markAsDirty();
- this.validateForm.controls[i].updateValueAndValidity();
+ if (this.validateForm.value.datePicker[0].toLocaleDateString) {
+ this.validateForm.value.datePicker[0] = this.validateForm.value.datePicker[0].toLocaleDateString()
+ }
+ if (this.validateForm.value.datePicker[1].toLocaleDateString) {
+ this.validateForm.value.datePicker[1] = this.validateForm.value.datePicker[1].toLocaleDateString()
}
this.list = []
this.SkipCount = '0'
- // this.getRecordList()
+ this.getRecordList()
}
resetForm(e: MouseEvent): void {
e.preventDefault();
this.validateForm.reset();
- for (const key in this.validateForm.controls) {
- this.validateForm.controls[key].markAsPristine();
- this.validateForm.controls[key].updateValueAndValidity();
- }
this.validateForm.patchValue({
organization: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
datePicker: [this.startdate, this.enddate],
});
this.list = []
this.SkipCount = '0'
- // this.getViolateRecgordList()
+ this.getRecordList()
}
-
//获取所有组织机构
nodes: any = []
async getAllOrganization() {
@@ -101,7 +101,6 @@ export class AuditRecordComponent implements OnInit {
element.title = element.displayName
});
this.nodes = [...this.toTree.toTree(data.result.items)]
- console.log('组织机构列表', this.nodes)
this.validateForm.patchValue({
organization: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
datePicker: [this.startdate, this.enddate],
@@ -148,48 +147,103 @@ export class AuditRecordComponent implements OnInit {
});
this.typeLoading = false
this.typeList = arr
- // console.log('证照类型', arr)
}).catch((error) => {
- console.log('证照类型', error)
+
})
}
-
//历史记录列表
totalCount//列表总数
tableSpin = false
+ SkipCount: string = '0'
+ MaxResultCount: string = '100'
getRecordList() {
- console.log('获得历史记录列表')
+ this.tableSpin = true
let params = {
- // Level: this.validateForm.value.level,
- // ViolationIds: ViolationIds,
- // ViolateArea: this.validateForm.value.site,
- // OrganizationUnitId: this.validateForm.value.organization,
- // IsContainsChildren: 'true',
- // IsHandled: disposalState,
- // 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,
- // SkipCount: this.SkipCount,
- // MaxResultCount: this.MaxResultCount,
- // Positive: this.validateForm.value.misinformation
+ 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],
+ AuditStatuses: this.validateForm.value.state,
+ AuditLevel: this.validateForm.value.level,
+ Sorting: null,
+ SkipCount: this.SkipCount,
+ MaxResultCount: this.MaxResultCount,
}
- // this.tableSpin = true
- // this.http.get('/api/services/app/ViolateRecord/GetAll', {
- // params: params
- // }).subscribe((data: any) => {
- // this.list = this.list.concat(data.result.items);
- // this.list = [...this.list]
- // this.totalCount = data.result.totalCount
- // console.log('违规记录列表', data)
- // this.tableSpin = false
- // })
+ this.http.get('/api/services/app/ContentAuditLog/GetHistory', {params}).subscribe((data: any) => {
+ this.list = this.list.concat(data.result.items);
+ this.list = [...this.list]
+ this.totalCount = data.result.totalCount
+ this.tableSpin = false
+ console.log('审核历史纪录', this.list)
+ })
+ }
+
+ details(item) {
+ let component
+ if (item.auditType == 0) {
+ component = GasBaseInfoComponent
+ } else if (item.auditType == 1) {
+ component = AuditDetailsInformTimeComponent
+ } else if (item.auditType == 2) {
+ component = DetailsUpdateCategoryComponent
+ } else if (item.auditType) {
+ component = DetailsFileCategoryComponent
+ }
+ this.getData(item).then(res=>{
+ item.getData = res
+ const modal = this.modal.create({
+ nzContent: component,
+ nzViewContainerRef: this.viewContainerRef,
+ nzWidth: item.auditType == 0? 700 : 450,
+ nzBodyStyle: {
+ 'border': '1px solid #91CCFF',
+ 'border-radius': '0px',
+ 'padding': '7px',
+ 'box-shadow': '0 0 8px 0 #fff',
+ 'background-image': 'linear-gradient(#003665, #000f25)'
+ },
+ nzStyle: {
+ 'top': '50px',
+ },
+ nzComponentParams: {
+ data: item.getData
+ },
+ nzFooter: null,
+ nzClosable: false,
+ });
+ })
}
+ //获取证照类data
+ getData(item) {
+ let url
+ if (item.auditType == 0) { //油站基本信息
+ return new Promise((resolve, reject)=>{
+ let organization = { organizationId: item.organizationId }
+ resolve(organization)
+ })
+ } else if (item.auditType == 1) {
+ url = '/api/services/app/OrganizationValidityLicenseRule/Get'
+ } else if (item.auditType == 2) {
+ url = '/api/services/app/StationValidityLicense/Get'
+ } else if (item.auditType) {
+ url = '/api/services/app/StationFileLicense/Get'
+ }
+ return new Promise((resolve, reject)=>{
+ let params = { id: item.itemId }
+ this.http.get(url,{params}).subscribe((data: any)=>{
+ resolve(data.result)
+ })
+ })
+ }
ngAfterViewInit(): void {
fromEvent(this.element.nativeElement.querySelector(`.ant-table-body`) as HTMLCanvasElement, 'scroll').pipe(debounceTime(100)).subscribe((event: any) => { //监听 DOM 滚动事件
if (event.target.scrollHeight - (event.target.scrollTop + event.target.clientHeight) <= 10) {
if (this.totalCount > this.list.length) {
- console.log('需要加载数据了', event)
this.SkipCount = String(Number(this.SkipCount) + 50)
this.getRecordList()
}
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 27b9f18..462e684 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
@@ -89,12 +89,7 @@
{{item.creationTime | date:"yyyy/MM/dd"}}
- 无
- 审核中
- 审核通过
- 审核驳回
- 已撤销审核
- 审核完成
+ {{item.auditStatus | auditStatus}}
-->