|
- 营业执照
+ {{item.licenseName}}
|
- 90天 |
- 90天 |
- 90天 |
- 90天 |
- 时间 |
- 审批状态 |
+ {{item.handleRemindDaysDefault}}天 |
+ {{item.handleRemindDays}}天 |
+ {{item.closingRemindDaysDefault}}天 |
+ {{item.closingRemindDays}}天 |
+ {{item.commitTime ? (item.commitTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}} |
+ {{item.auditStatus | auditStatus}} |
编辑
审核详情
diff --git a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts
index 310cda6..15b00ca 100644
--- a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts
+++ b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit, ViewContainerRef } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Component, ElementRef, OnInit, ViewContainerRef } from '@angular/core';
import { NzModalService } from 'ng-zorro-antd/modal';
import { Observable, fromEvent } from 'rxjs';
import { debounceTime } from 'rxjs/operators';
@@ -13,19 +14,49 @@ import { EditInformTimeComponent } from './edit-inform-time/edit-inform-time.com
})
export class AuditInformTimeComponent implements OnInit {
- constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
+ constructor(private http: HttpClient, private element: ElementRef, private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
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 {
- this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 85) + 'px'
// 页面监听
+ this.tableScrollHeight = '0px'
fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
- this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 85) + 'px'
+ let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
+ this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader) + 'px'
});
+
+ this.getTimeList()
}
+ SkipCount: string = '0'
+ MaxResultCount: string = '100'
+ async getTimeList() {
+ let params = {
+ OrganizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+ IsContainsChildren: 'true',
+ SkipCount: this.SkipCount,
+ MaxResultCount: this.MaxResultCount,
+ }
+ this.tableSpin = true
+ await new Promise((resolve, reject) => {
+ this.http.get('/api/services/app/OrganizationValidityLicenseRule/GetCurOrgRules', {
+ params: params
+ }).subscribe((data: any) => {
+ this.list = this.list.concat(data.result);
+ this.list = [...this.list]
+ console.log('时间表格', data)
+ this.tableSpin = false
+
+ setTimeout(() => {
+ let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
+ this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader) + 'px'
+ }, 0);
+ resolve(data)
+ })
+ })
+ }
edit(item) {
diff --git a/src/app/pages/audit/audit-nav/audit-nav.component.html b/src/app/pages/audit/audit-nav/audit-nav.component.html
index 509ec51..e9c2dbc 100644
--- a/src/app/pages/audit/audit-nav/audit-nav.component.html
+++ b/src/app/pages/audit/audit-nav/audit-nav.component.html
@@ -6,6 +6,8 @@
{{item}}
+ 通知时间
@@ -13,6 +15,6 @@
\ No newline at end of file
diff --git a/src/app/pages/audit/audit-nav/audit-nav.component.ts b/src/app/pages/audit/audit-nav/audit-nav.component.ts
index e787789..08f23b6 100644
--- a/src/app/pages/audit/audit-nav/audit-nav.component.ts
+++ b/src/app/pages/audit/audit-nav/audit-nav.component.ts
@@ -10,12 +10,16 @@ export class AuditNavComponent implements OnInit {
constructor() { }
- navList = ['审批', '历史纪录', '通知时间']
+ navList = ['审批', '历史纪录']
selectedItem = '审批'
selectNav(item) {
this.selectedItem = item
}
+
+
+ isLevel
ngOnInit(): void {
+ this.isLevel = JSON.parse(sessionStorage.getItem('userdata')).organization.level
}
}
diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.html b/src/app/pages/plan-admin/file-license-list/file-license-list.component.html
index 7f0f14f..03619c9 100644
--- a/src/app/pages/plan-admin/file-license-list/file-license-list.component.html
+++ b/src/app/pages/plan-admin/file-license-list/file-license-list.component.html
@@ -1 +1,63 @@
-file-license-list works!
+
+
+
+
+
+
+ | 序号 |
+
+ {{item.name}}
+ |
+
+
+
+
+
+ | {{key + 1}} |
+
+
+
+
+
+ {{i.value.validityType}}
+
+
+
+ {{i.value}}
+
+
+
+ /
+
+
+ |
+
+
+
+
+
+
- 山东省某中化公司
+ {{organizationName}}
- 办理提醒时间：修改时间 80天
- 默认时间 90天
+ 办理提醒时间：修改时间 {{data.handleRemindDays}}天
+ 默认时间 {{data.handleRemindDaysDefault}}天
- 临期提醒时间：修改时间 15天
- 默认时间 30天
+ 临期提醒时间：修改时间 {{data.closingRemindDays}}天
+ 默认时间 {{data.closingRemindDaysDefault}}天
- 修改说明：修改原因陈述修改原因陈述，修改原因陈述。
+ 修改说明：{{data.remark}}
- 审核状态：审核驳回
+ 审核状态：{{data.auditStatus | auditStatus}}
- 驳回说明：不同意
+ 驳回说明：
diff --git a/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.ts b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.ts
index 52f0e6b..d2d65a2 100644
--- a/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.ts
+++ b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.ts
@@ -10,7 +10,11 @@ export class AuditDetailsInformTimeComponent implements OnInit {
@Input() data?: any;
constructor(private modal: NzModalRef) { }
+
+ organizationName
ngOnInit(): void {
+
+ this.organizationName = JSON.parse(sessionStorage.getItem('userdata')).organization.displayName
}
destroyModal() {
this.modal.destroy({ data: 'this the result data' });
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 b36aa5e..cd3a5a5 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
@@ -32,7 +32,10 @@
{{item.commitTime ? (item.commitTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}} |
{{item.auditStatus | auditStatus}} |
- 编辑
+ 编辑
+ 撤销审核
审核详情
|
|
diff --git a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts
index 15b00ca..fe83c75 100644
--- a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts
+++ b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts
@@ -1,5 +1,6 @@
import { HttpClient } from '@angular/common/http';
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';
import { debounceTime } from 'rxjs/operators';
@@ -14,7 +15,7 @@ import { EditInformTimeComponent } from './edit-inform-time/edit-inform-time.com
})
export class AuditInformTimeComponent implements OnInit {
- constructor(private http: HttpClient, private element: ElementRef, private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
+ constructor(private message: NzMessageService, private http: HttpClient, private element: ElementRef, private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
tableSpin = false
list = []
@@ -44,7 +45,7 @@ export class AuditInformTimeComponent implements OnInit {
this.http.get('/api/services/app/OrganizationValidityLicenseRule/GetCurOrgRules', {
params: params
}).subscribe((data: any) => {
- this.list = this.list.concat(data.result);
+ this.list = data.result
this.list = [...this.list]
console.log('时间表格', data)
this.tableSpin = false
@@ -61,6 +62,11 @@ export class AuditInformTimeComponent implements OnInit {
edit(item) {
console.log('item', item)
+ if (item.auditStatus == 1) {
+ this.message.create('warning', '审核中不允许编辑');
+ return
+ }
+
const modal = this.modal.create({
nzContent: EditInformTimeComponent,
nzViewContainerRef: this.viewContainerRef,
@@ -78,7 +84,7 @@ export class AuditInformTimeComponent implements OnInit {
nzFooter: null,
nzClosable: false,
nzOnOk: async () => {
-
+ this.getTimeList()
}
});
const instance = modal.getContentComponent();
@@ -109,4 +115,16 @@ export class AuditInformTimeComponent implements OnInit {
const instance = modal.getContentComponent();
modal.afterClose.subscribe(result => { });
}
+
+ unCommit(item) {
+ let params = {
+ id: item.id
+ }
+ this.http.post('/api/services/app/OrganizationValidityLicenseRule/Uncommit', '', { params: params }).subscribe((data) => {
+ this.message.create('success', '撤销审核成功');
+ this.getTimeList()
+ }, err => {
+ this.message.create('error', '撤销审核失败');
+ })
+ }
}
diff --git a/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html
index 8025296..176eade 100644
--- a/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html
+++ b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html
@@ -47,7 +47,7 @@
-
{{data.gasStation.companyName}} - {{data.gasStation.stationName}}
-
-
证件名称: {{data.getData.licenseTypeName}}
-
-
+
{{data.gasStation.companyName}} - {{data.gasStation.locationName}} - {{data.gasStation.stationName}}
+
+
+
证件名称: {{data.getData.licenseTypeName}}
+
证件编号: {{data.getData.licenseCode || ''}}
证件有效期: {{data.getData.validityStartTime | date:"yyyy/MM/dd"}} - {{data.getData.validityEndTime | date:"yyyy/MM/dd"}}
@@ -25,15 +25,17 @@
是否年检: 是否
+
证件名称: {{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 bb34896..3b34ef6 100644
--- a/src/app/pages/audit/audit-ing/audit-ing.component.html
+++ b/src/app/pages/audit/audit-ing/audit-ing.component.html
@@ -27,9 +27,9 @@
更新类证照
档案类证照
-
{{item.gasStation.stationName}} |
-
{{item.gasStation.locationName}} |
-
{{item.gasStation.companyName}} |
+
|
+
|
+
|
{{item.committedTime | date:"yyyy/MM/dd"}} |
无
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 2d7e9e8..ebb259c 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 { GasBaseInfoComponent } from '../gas-base-info/gas-base-info.component';
import { AuditDisposeComponent } from './audit-dispose/audit-dispose.component';
@Component({
@@ -17,7 +18,6 @@ export class AuditIngComponent implements OnInit {
constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef,private http: HttpClient,private message: NzMessageService) { }
tableSpin = false
- list = []
tableScrollHeight
ngOnInit(): void {
@@ -29,13 +29,18 @@ export class AuditIngComponent implements OnInit {
this.getStationList()
}
- //获取当前油站档案类证照
- getStationList() {
+ list = []
+ SkipCount: string = '0'
+ MaxResultCount: string = '100'
+ //获取当前油站档案类证照
+ getStationList() {
let data = JSON.parse(sessionStorage.getItem('userdata'));
let params = {
OrganizationUnitId: data.organization.id || "" ,
IsContainsChildren: "true",
AuditStatuses: "1",
+ SkipCount: this.SkipCount,
+ MaxResultCount: this.MaxResultCount,
}
this.http.get(`/api/services/app/ContentAuditLog/GetAuditting`,{params}).subscribe((info: any)=>{
info.result.items.forEach(element => {
@@ -57,7 +62,7 @@ export class AuditIngComponent implements OnInit {
const modal = this.modal.create({
nzContent: AuditDisposeComponent,
nzViewContainerRef: this.viewContainerRef,
- nzWidth: 600,
+ nzWidth: item.auditType == 0? 700 : 600,
nzBodyStyle: {
'border': '1px solid #91CCFF',
'border-radius': '0px',
@@ -65,6 +70,9 @@ export class AuditIngComponent implements OnInit {
'box-shadow': '0 0 8px 0 #fff',
'background-image': 'linear-gradient(#003665, #000f25)'
},
+ nzStyle: {
+ 'top': '50px',
+ },
nzComponentParams: {
data: item
},
@@ -74,9 +82,9 @@ export class AuditIngComponent implements OnInit {
await new Promise(resolve => {
let url
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) {
@@ -104,7 +112,7 @@ export class AuditIngComponent implements OnInit {
details(item) {
let component
if (item.auditType == 0) {
-
+ component = GasBaseInfoComponent
} else if (item.auditType == 1) {
} else if (item.auditType == 2) {
@@ -116,7 +124,7 @@ export class AuditIngComponent implements OnInit {
const modal = this.modal.create({
nzContent: component,
nzViewContainerRef: this.viewContainerRef,
- nzWidth: 450,
+ nzWidth: item.auditType == 0? 700 : 450,
nzBodyStyle: {
'border': '1px solid #91CCFF',
'border-radius': '0px',
@@ -124,6 +132,9 @@ export class AuditIngComponent implements OnInit {
'box-shadow': '0 0 8px 0 #fff',
'background-image': 'linear-gradient(#003665, #000f25)'
},
+ nzStyle: {
+ 'top': '50px',
+ },
nzComponentParams: {
data: item.getData
},
@@ -157,10 +168,13 @@ export class AuditIngComponent implements OnInit {
//获取证照类data
getData(item) {
let url
- if (item.auditType == 0) {
-
+ 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) {
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
new file mode 100644
index 0000000..ead2175
--- /dev/null
+++ b/src/app/pages/audit/gas-base-info/gas-base-info.component.html
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+ 地址: {{baseInfo.address}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{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 17/20] =?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}}
-->
|
{{item.committedTime | date:"yyyy/MM/dd"}}未提交审核 |
- 无
- 审核中
- 审核通过
- 审核驳回
- 未提交审核
- 审核完成
+ {{item.auditStatus | auditStatus}}
|
编辑
详情
撤销审核
- 提交审核
+ 提交审核
审核完成
|
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..415c4e9 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
@@ -39,12 +39,7 @@
{{item.creationTime | date:"yyyy/MM/dd"}}
- 无
- 审核中
- 审核通过
- 审核驳回
- 已撤销审核
- 审核完成
+ {{item.auditStatus | auditStatus}}
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..bf1421f 100644
--- a/src/app/pages/license/update-category/update-category.component.html
+++ b/src/app/pages/license/update-category/update-category.component.html
@@ -36,12 +36,7 @@
是否 |
{{item.committedTime | date:"yyyy/MM/dd"}}未提交审核 |
- 无
- 审核中
- 审核通过
- 审核驳回
- 未提交审核
- 审核完成
+ {{item.auditStatus | auditStatus}}
|
无
@@ -53,7 +48,7 @@
编辑
详情
撤销审核
- 提交审核
+ 提交审核
审核完成
|
From 0942eeac4e0d412c2306e7f99e93ade494be7433 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Sat, 14 May 2022 11:08:15 +0800
Subject: [PATCH 18/20] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E8=AF=81=E4=BB=B6=E4=B8=A4=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../audit-details-inform-time.component.html | 2 +-
.../audit-inform-time.component.html | 2 +-
.../file-category/file-category.component.ts | 12 ++-
.../histories/histories.component.html | 29 +++--
.../license/histories/histories.component.ts | 101 +++++++++++++++++-
.../license/inform/inform.component.html | 33 +++---
.../pages/license/inform/inform.component.ts | 79 +++++++++++++-
.../details-update-category.component.html | 4 +-
.../edit-update-category.component.html | 2 +-
.../update-category.component.html | 32 ++++--
.../update-category.component.ts | 2 +
src/app/pages/pages.module.ts | 4 +-
src/app/pipes/type.pipe.ts | 27 +++++
.../add-update-of-license.component.html | 6 ++
.../add-update-of-license.component.ts | 3 +-
.../edit-update-of-license.component.html | 6 ++
.../edit-update-of-license.component.ts | 3 +-
.../update-of-license.component.html | 5 +-
.../update-of-license.component.ts | 6 +-
src/theme.less | 11 ++
20 files changed, 311 insertions(+), 58 deletions(-)
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;
+ }
+
}
From 64220adfed6b17d5bbaf53bff28c9dbc2b69ab4e Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Sat, 14 May 2022 16:38:14 +0800
Subject: [PATCH 19/20] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=B9=B4=E5=AE=A1=E6=97=B6=E9=97=B4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../annual-inspection.component.html | 28 +++++
.../annual-inspection.component.scss | 15 +++
.../annual-inspection.component.ts | 84 ++++++++++++++
.../edit-annual-inspection.component.html | 33 ++++++
.../edit-annual-inspection.component.scss | 105 ++++++++++++++++++
.../edit-annual-inspection.component.ts | 63 +++++++++++
.../audit/audit-ing/audit-ing.component.html | 4 +-
.../audit/audit-nav/audit-nav.component.html | 3 +
.../audit-record/audit-record.component.html | 4 +-
.../audit-record/audit-record.component.ts | 2 +-
src/app/pages/home/home.component.ts | 5 +-
src/app/pages/pages.module.ts | 6 +-
src/theme.less | 1 -
13 files changed, 343 insertions(+), 10 deletions(-)
create mode 100644 src/app/pages/audit/annual-inspection/annual-inspection.component.html
create mode 100644 src/app/pages/audit/annual-inspection/annual-inspection.component.scss
create mode 100644 src/app/pages/audit/annual-inspection/annual-inspection.component.ts
create mode 100644 src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.html
create mode 100644 src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.scss
create mode 100644 src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts
diff --git a/src/app/pages/audit/annual-inspection/annual-inspection.component.html b/src/app/pages/audit/annual-inspection/annual-inspection.component.html
new file mode 100644
index 0000000..b43c909
--- /dev/null
+++ b/src/app/pages/audit/annual-inspection/annual-inspection.component.html
@@ -0,0 +1,28 @@
+
\ No newline at end of file
diff --git a/src/app/pages/audit/annual-inspection/annual-inspection.component.scss b/src/app/pages/audit/annual-inspection/annual-inspection.component.scss
new file mode 100644
index 0000000..aaca580
--- /dev/null
+++ b/src/app/pages/audit/annual-inspection/annual-inspection.component.scss
@@ -0,0 +1,15 @@
+.box {
+ width: 100%;
+ height: 100%;
+}
+
+.tablebox {
+ width: 100%;
+ height: 100%;
+
+ .operation {
+ span {
+ margin-right: 6px;
+ }
+ }
+}
diff --git a/src/app/pages/audit/annual-inspection/annual-inspection.component.ts b/src/app/pages/audit/annual-inspection/annual-inspection.component.ts
new file mode 100644
index 0000000..9cd5035
--- /dev/null
+++ b/src/app/pages/audit/annual-inspection/annual-inspection.component.ts
@@ -0,0 +1,84 @@
+import { HttpClient } from '@angular/common/http';
+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';
+import { debounceTime } from 'rxjs/operators';
+import { EditAnnualInspectionComponent } from './edit-annual-inspection/edit-annual-inspection.component';
+@Component({
+ selector: 'app-annual-inspection',
+ templateUrl: './annual-inspection.component.html',
+ styleUrls: ['./annual-inspection.component.scss']
+})
+export class AnnualInspectionComponent implements OnInit {
+
+ constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private http: HttpClient, private message: NzMessageService, private element: ElementRef) { }
+ tableSpin = false
+
+ tableScrollHeight
+ ngOnInit(): void {
+ this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px'
+ // 页面监听
+ fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
+ this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px'
+ });
+ this.getAnnualInspectionList()
+ }
+
+
+
+ list = []
+ totalCount;//列表总数
+ SkipCount: string = '0';
+ MaxResultCount: string = '100';
+ //获取当前油站档案类证照
+ getAnnualInspectionList() {
+ this.tableSpin = true
+ let data = JSON.parse(sessionStorage.getItem('userdata'));
+ let params = {
+ OrganizationUnitId: data.organization.id || "",
+ IsContainsChildren: "true",
+ SkipCount: this.SkipCount,
+ MaxResultCount: this.MaxResultCount,
+ }
+ this.http.get(`/api/services/app/OrganizationValidityLicenseRule/GetCurOrgYearlyCheckRules`, { params }).subscribe((data: any) => {
+
+ this.list = data.result
+ this.list = [...this.list]
+ this.tableSpin = false
+ console.log(data)
+ })
+ }
+
+
+ edit(item) {
+ console.log('item', item)
+ if (!item.isYearlyCheck) {
+ this.message.create('warning', '不需要年检');
+ return
+ }
+
+ const modal = this.modal.create({
+ nzContent: EditAnnualInspectionComponent,
+ 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
+ },
+ nzFooter: null,
+ nzClosable: false,
+ nzOnOk: async () => {
+ this.getAnnualInspectionList()
+ }
+ });
+ const instance = modal.getContentComponent();
+ modal.afterClose.subscribe(result => { });
+ }
+}
diff --git a/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.html b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.html
new file mode 100644
index 0000000..e0eb4d0
--- /dev/null
+++ b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.html
@@ -0,0 +1,33 @@
+
\ No newline at end of file
diff --git a/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.scss b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.scss
new file mode 100644
index 0000000..4be1a5b
--- /dev/null
+++ b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.scss
@@ -0,0 +1,105 @@
+.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;
+ }
+ }
+
+
+
+
+ p {
+ margin-bottom: 0;
+ color: #C4E2FC;
+ margin: 12px 0;
+ }
+
+ .p2 {
+ margin: 6px 0;
+ font-size: 12px;
+ color: #C4E2FC;
+ }
+
+ .form {
+ box-sizing: border-box;
+ padding: 0 17px;
+
+ .timebox {
+ display: flex;
+
+ div {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ box-sizing: border-box;
+ padding: 0 6px;
+ }
+ }
+
+ .explain {
+ box-sizing: border-box;
+ padding: 0 6px;
+
+ textarea {
+ width: 100%;
+ height: 100px;
+
+ background: rgba(145, 204, 255, 0.16);
+ color: #fff;
+ }
+ }
+
+ .btnbox {
+ width: 100%;
+ margin-top: 24px;
+ margin-bottom: 17px;
+ display: flex;
+ justify-content: flex-end;
+ box-sizing: border-box;
+ padding: 0 7px;
+
+ button {
+ border-radius: 0px;
+ color: #91CCFF;
+ }
+
+ button:nth-child(2) {
+ margin-left: 16px;
+ }
+
+ .ok {
+ background: rgba(0, 129, 255, 0.4);
+ }
+
+ .cancel {
+ border: 1px solid #C4E2FC;
+ background: #0c1e38;
+ color: rgba(99, 102, 105, 0.6);
+ box-shadow: 0 0 3px 0 #fff inset;
+ }
+ }
+ }
+
+}
diff --git a/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts
new file mode 100644
index 0000000..3667e5c
--- /dev/null
+++ b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts
@@ -0,0 +1,63 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
+import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import * as moment from 'moment';
+
+@Component({
+ selector: 'app-edit-annual-inspection',
+ templateUrl: './edit-annual-inspection.component.html',
+ styleUrls: ['./edit-annual-inspection.component.scss']
+})
+export class EditAnnualInspectionComponent implements OnInit {
+
+
+ @Input() data?: any;
+
+ validateForm!: FormGroup;
+ constructor(private message: NzMessageService, private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService) { }
+
+
+ dataCopy
+ ngOnInit(): void {
+ this.dataCopy = JSON.parse(JSON.stringify(this.data))
+ this.validateForm = this.fb.group({
+ time: [null, [Validators.required]],
+ });
+
+ }
+
+
+ destroyModal() {
+ this.modal.destroy({ data: 'this the result data' });
+
+ }
+
+
+ isLoading = false
+ ok() {
+ if (this.validateForm.valid) {
+ this.isLoading = true
+ let params = {
+ id: this.dataCopy.licenseTypeId,
+ date: moment(this.validateForm.value.time).format('YYYY-MM-MM')//开业时间格式化
+ }
+ this.http.put('/api/services/app/OrganizationValidityLicenseRule/UpdateYearlyCheckDate', null, { params: params }).subscribe((data) => {
+ this.message.create('success', '修改成功');
+ this.isLoading = false
+ this.modal.triggerOk()
+ }, err => {
+ this.message.create('error', '修改失败');
+ this.isLoading = false
+ })
+ } else {
+ this.message.create('warning', '请填写完整！');
+ }
+
+
+ }
+
+ dateFormat = 'MM/dd';
+}
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 6f32b7c..558691e 100644
--- a/src/app/pages/audit/audit-ing/audit-ing.component.html
+++ b/src/app/pages/audit/audit-ing/audit-ing.component.html
@@ -5,7 +5,7 @@
|
- 审批类型
+ 审批类型
|
审批信息 |
加油站名称 |
@@ -19,7 +19,7 @@
|
|
- {{item.auditTitle || ''}}
+ {{item.auditTitle || ''}}
|
油站信息
diff --git a/src/app/pages/audit/audit-nav/audit-nav.component.html b/src/app/pages/audit/audit-nav/audit-nav.component.html
index e9c2dbc..49f53ab 100644
--- a/src/app/pages/audit/audit-nav/audit-nav.component.html
+++ b/src/app/pages/audit/audit-nav/audit-nav.component.html
@@ -8,6 +8,8 @@
(click)="selectNav(item)">{{item}}
通知时间
+ 年检设置
@@ -16,5 +18,6 @@
+
\ No newline at end of file
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 86d42a5..a2c5cad 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.html
+++ b/src/app/pages/audit/audit-record/audit-record.component.html
@@ -89,7 +89,7 @@
|
- 审批类型
+ 审批类型
|
审批信息 |
加油站名称 |
@@ -103,7 +103,7 @@
|
|
- {{item.auditTitle || ''}}
+ {{item.auditTitle || ''}}
|
油站信息
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 3627804..584be47 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.ts
+++ b/src/app/pages/audit/audit-record/audit-record.component.ts
@@ -154,7 +154,7 @@ export class AuditRecordComponent implements OnInit {
//历史记录列表
totalCount//列表总数
- tableSpin = false
+ tableSpin = true
SkipCount: string = '0'
MaxResultCount: string = '100'
getRecordList() {
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
index 432761a..ee6b0e1 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home.component.ts
@@ -61,7 +61,7 @@ export class HomeComponent implements OnInit {
if (sessionStorage.getItem('isGasStation') == 'true') {
this.isGasStation = true
this.isGasStationNav = true
- }
+ }
this.router.events.pipe(
filter(event => event instanceof NavigationEnd)
@@ -147,6 +147,8 @@ export class HomeComponent implements OnInit {
SignalRAspNetCoreHelper.initSignalR();
abp.event.on('abp.notifications.received', this.reloadPage);
}
+
+ //右下角消息弹窗
messageId = []
receiptOfNotification(userNotification) {
let obj = {
@@ -302,7 +304,6 @@ export class HomeComponent implements OnInit {
})
}
close(item) {
- // console.log(item)
this.messageId.forEach((element) => {
if (element.id == item.notification.entityId) {
this.notificationService.remove(element.messageId)
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index 86730fd..0a0279e 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -83,11 +83,13 @@ import { EditInformTimeComponent } from './audit/audit-inform-time/edit-inform-t
import { AuditDetailsInformTimeComponent } from './audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component';
import { auditStatusPipe, handleState, licenseViolationType, notificationContent } from '../pipes/type.pipe';
import { GasBaseInfoComponent } from './audit/gas-base-info/gas-base-info.component';
+import { AnnualInspectionComponent } from './audit/annual-inspection/annual-inspection.component';
+import { EditAnnualInspectionComponent } from './audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.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,notificationContent,licenseViolationType,handleState],
+ 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, AnnualInspectionComponent, EditAnnualInspectionComponent],
imports: [
@@ -131,7 +133,7 @@ import { GasBaseInfoComponent } from './audit/gas-base-info/gas-base-info.compon
NzToolTipModule,
NzTimelineModule
],
- entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, GasBaseInfoComponent],
+ entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, GasBaseInfoComponent, EditAnnualInspectionComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
diff --git a/src/theme.less b/src/theme.less
index 3c9c6d8..286d270 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -8,7 +8,6 @@
.greyColor {
color: #5D687A;
cursor: not-allowed;
- // pointer-events: none;
}
.yellowColor {
From 4a39fa41c86bfe0ffd6c5ded0af4cf4f72fea504 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Sat, 14 May 2022 16:51:56 +0800
Subject: [PATCH 20/20] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../edit-annual-inspection.component.ts | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts
index 3667e5c..c2b330d 100644
--- a/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts
+++ b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts
@@ -40,11 +40,12 @@ export class EditAnnualInspectionComponent implements OnInit {
ok() {
if (this.validateForm.valid) {
this.isLoading = true
- let params = {
- id: this.dataCopy.licenseTypeId,
- date: moment(this.validateForm.value.time).format('YYYY-MM-MM')//开业时间格式化
+ let body = {
+ licenseTypeId: this.dataCopy.licenseTypeId,
+ organizationId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+ yearlyCheckDate: moment(this.validateForm.value.time).format('YYYY-MM-MM')//开业时间格式化
}
- this.http.put('/api/services/app/OrganizationValidityLicenseRule/UpdateYearlyCheckDate', null, { params: params }).subscribe((data) => {
+ this.http.put('/api/services/app/OrganizationValidityLicenseRule/UpdateYearlyCheckDate', body).subscribe((data) => {
this.message.create('success', '修改成功');
this.isLoading = false
this.modal.triggerOk()
| | 
角色管理
分析主机管理
推送管理
更新类证照管理
+
+ 
+