+
diff --git a/src/app/pages/license/file-category/file-category.component.html b/src/app/pages/license/file-category/file-category.component.html
index 2d5eec8..5ad7f2b 100644
--- a/src/app/pages/license/file-category/file-category.component.html
+++ b/src/app/pages/license/file-category/file-category.component.html
@@ -20,27 +20,23 @@
{{item.licenseTypeName || ''}}
- 有
+ 不适用
无
- 不适用
+ 有
|
![]()
|
{{item.committedTime | date:"yyyy/MM/dd"}}未提交审核 |
- 无
- 审核中
- 审核通过
- 审核驳回
- 未提交审核
- 审核完成
+ {{item.auditStatus | auditStatus}}
|
编辑
详情
撤销审核
- 提交审核
+ 提交审核
+ 审核完成
|
diff --git a/src/app/pages/license/file-category/file-category.component.ts b/src/app/pages/license/file-category/file-category.component.ts
index 4af5b3e..e841d20 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.http.get(`/api/services/app/StationFileLicense/GetStationList`, { params }).subscribe((info: any) => {
this.list = info.result
+ this.tableSpin = false
console.log(info.result)
})
}
@@ -121,18 +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/nav-bar/nav-bar.component.scss b/src/app/pages/license/nav-bar/nav-bar.component.scss
index dc9bf17..71c53c0 100644
--- a/src/app/pages/license/nav-bar/nav-bar.component.scss
+++ b/src/app/pages/license/nav-bar/nav-bar.component.scss
@@ -42,7 +42,7 @@
background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.8) 50%, rgba(35, 153, 255, 0) 100%);
span {
- margin-left: 10px;
+ margin-left: 25px;
color: #bce0ff;
font-size: 20px;
font-family: titlefont;
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 c9ab387..4b970b7 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
@@ -7,48 +7,39 @@
-
证件名称: 营业执照
+
证件名称: {{data.licenseTypeName || ''}}
-
证件编号: Z201800041501
+
证件编号: {{data.licenseCode || ''}}
-
证件有效期: 2018.12.02—2025.01.12
+
证件有效期: {{data.validityStartTime | date:"yyyy/MM/dd"}} - {{data.validityEndTime | date:"yyyy/MM/dd"}}
-
办理类型: 年度公示
+
办理类型: {{getHandleTypes(data.handleTypes)}}
-
有效期类型: 1523天
+
有效期类型: {{data.validityDays || 0}}天
-
是否年检: 是
-
-
证件图片: 
+
+
证件图片:
+ ![]()
+ 
+ 
+
审核记录
- 审核次数：6
+ 审核次数：{{auditList.length}}
- 驳回次数：2
+ 驳回次数：{{getRejectNum()}}
-
- 2022.04.02
- 审核完成
-
-
- 2022.04.02
- 审核完成
-
-
- 2022.04.02
- 审核完成
-
-
- 2022.04.02
- 审核完成
+
+ {{item.creationTime | date:"yyyy/MM/dd"}}
+ {{item.auditStatus | auditStatus}}
diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts b/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts
index 7bbcf2b..399308e 100644
--- a/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts
+++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts
@@ -4,6 +4,8 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { HttpClient } from '@angular/common/http';
import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service';
import Viewer from 'viewerjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { handleType, handleTypeList } from '../edit-update-category/edit-update-category.component';
@Component({
selector: 'app-details-update-category',
@@ -12,19 +14,88 @@ import Viewer from 'viewerjs';
})
export class DetailsUpdateCategoryComponent implements OnInit {
@Input() data?: any;
- constructor(private modal: NzModalRef) { }
+ constructor(private modal: NzModalRef,private message: NzMessageService,private http: HttpClient) { }
ngOnInit(): void {
+ this.getAuditLogging()
}
+ auditList: any[] = [];
+ //获取审核记录
+ getAuditLogging() {
+ if (!this.data.auditLogId) {
+ return
+ }
+ let params = { id: this.data.auditLogId }
+ this.http.get(`/api/services/app/ContentAuditLog/Get`,{params}).subscribe((data: any)=>{
+ this.auditList = data.result.actionList || []
+ console.log(this.auditList)
+ })
+ }
+
+ //获取驳回次数
+ getRejectNum(): number {
+ let num = 0
+ this.auditList.forEach(item=>{
+ if (item.auditStatus == 3) {
+ num = num + 1
+ }
+ })
+ return num
+ }
destroyModal() {
this.modal.destroy({ data: 'this the result data' });
}
+
+ //获取办理类型
+ 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(',')
+ }
+
+ //获取文件格式
+ getFileType(name: string):string {
+ let suffix
+ if (name.substring(name.length-4).includes('png') || name.substring(name.length-4).includes('jpg') || name.substring(name.length-4).includes('jpeg') || name.substring(name.length-4).includes('webp')) {
+ suffix = 'img'
+ } else if (name.substring(name.length-4).includes('doc') || name.substring(name.length-4).includes('docx')) {
+ suffix = 'word'
+ } else if (name.substring(name.length-4).includes('pdf')) {
+ suffix = 'pdf'
+ }
+ return suffix
+ }
+
+ //查看文件
+ lookFile(item) {
+ if (!item.imageUrl) {
+ return
+ }
+ if (this.getFileType(item.imageUrl) == 'word') {
+ let arr = item.imageUrl.split('.')
+ arr[arr.length - 1] = 'pdf'
+ window.open(arr.join('.'))
+ } else if (this.getFileType(item.imageUrl) == 'pdf') {
+ window.open(item.imageUrl)
+ } else {
+ this.message.create('warning', '暂不支持查看！');
+ }
+ }
+
//查看图片
viewImg(url) {
- // url.split('?')[0]
let dom = document.getElementById(`viewerjs`)
let pObjs = dom.childNodes;
let node = document.createElement("img")
@@ -42,4 +113,5 @@ export class DetailsUpdateCategoryComponent implements OnInit {
node.click();
}, 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 c34cd30..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
@@ -6,7 +6,7 @@
+
+