diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html index a6d5ad0..4d4386e 100644 --- a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html @@ -26,12 +26,12 @@
- - -
-
+
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..660c018 100644 --- a/src/app/pages/license/file-category/file-category.component.html +++ b/src/app/pages/license/file-category/file-category.component.html @@ -40,7 +40,8 @@ 编辑 详情 撤销审核 - 提交审核 + 提交审核 + 审核完成 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..f79a73b 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,44 @@
-

证件名称:   营业执照

+

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

-

证件编号:   Z201800041501

+

证件编号:   {{data.licenseCode || ''}}

-

证件有效期:   2018.12.02—2025.01.12

+

证件有效期:   {{data.validityStartTime | date:"yyyy/MM/dd"}} - {{data.validityEndTime | date:"yyyy/MM/dd"}}

-

办理类型:   年度公示

+

办理类型:   {{data.handleType || ''}}

-

有效期类型:   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"}} + 无 + 审核中 + 审核通过 + 审核驳回 + 已撤销审核 + 审核完成 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..f908388 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,7 @@ 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'; @Component({ selector: 'app-details-update-category', @@ -12,19 +13,72 @@ 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 == 0) { + 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' }); } + + //获取文件格式 + 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 +96,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..1077ce0 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 @@
-

证件名称: 营业执照

+

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

@@ -14,7 +14,7 @@ - + @@ -22,24 +22,32 @@

证件有效期*

-

- 有效期类型: 1456天 - 是否年检: 是 + 有效期类型: {{data2.validityDays || 0}}天 + 是否年检: 是否

办理类型

- - + + + + + + + + + + @@ -48,13 +56,15 @@
- - -
-
+
diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts index fab92ef..18c4222 100644 --- a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts +++ b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts @@ -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'; + @Component({ selector: 'app-edit-update-category', templateUrl: './edit-update-category.component.html', @@ -14,33 +16,113 @@ export class EditUpdateCategoryComponent implements OnInit { @Input() data?: any; validateForm!: FormGroup; - constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService) { } + constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService,private message: NzMessageService,) { } + + data2: any; //深拷贝data + isLongTermTime: Date = null; // 限期 日期 + isNoLongTermTime: Date[] = []; //长期 日期 + typeList: string[] = []; //办理类型 select多选 data - data2 ngOnInit(): void { this.validateForm = this.fb.group({ number: [null, [Validators.required]], isLongTerm: [null, [Validators.required]], - type: [null, [Validators.required]] + type: [null, [Validators.required]], + isLongTermTime: [null,], + isNoLongTermTime: [null,], }); + // 日期 this.data2 = JSON.parse(JSON.stringify(this.data)) + if (this.data2.isLongTerm) { + this.isLongTermTime = new Date(this.data2.validityStartTime) + } else { + this.isNoLongTermTime = [] + this.isNoLongTermTime.push(new Date(this.data2.validityStartTime)) + this.isNoLongTermTime.push(new Date(this.data2.validityEndTime)) + } + // 办理类型 + if (this.data2.handleType) { + this.typeList = (this.data2.handleType).split('/') + } + + console.log(this.data2) } - isLongTerm = false imageUrl = '/api/Objects/sinochemweb/stationPhotos/175/timg.jpg' - validityChange($event) { - console.log($event) - this.isLongTerm = $event - } destroyModal() { this.modal.destroy({ data: 'this the result data' }); } + ok() { this.modal.triggerOk() } + //check change + validityChange($event) { + if ($event) { //长期 + this.data2.validityDays = 999 + } else { //限期 + let start = (new Date(this.isNoLongTermTime[0])).getTime(); + let end = (new Date(this.isNoLongTermTime[1])).getTime(); + let time = end - start + if (time <= 0) { + this.data2.validityDays = 0 + } else { + this.data2.validityDays = time / (1000*3600*24); + } + } + } + + //date change + onChange(e) { + if (!e) { + return + } + if (e instanceof Array) { + let start = (new Date(e[0])).getTime(); + let end = (new Date(e[1])).getTime(); + let time = end - start + if (time <= 0) { + this.data2.validityDays = 0 + } else { + this.data2.validityDays = time / (1000*3600*24); + } + } else { + this.data2.validityDays = 999 + } + } + + //获取文件格式 + 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', '暂不支持查看！'); + } + } + isLoadingSave: boolean = false @@ -72,6 +154,7 @@ export class EditUpdateCategoryComponent implements OnInit { let dataObj = data as any; let filePath: string = ObjectsSimpleService.baseUrl + dataObj.objectName; this.imageUrl = filePath + this.data2.imageUrl = filePath console.log('上传成功', filePath) resolve('success') }); @@ -87,6 +170,7 @@ export class EditUpdateCategoryComponent implements OnInit { let dataObj = value as any; let filePath = dataObj.filePath this.imageUrl = filePath + this.data2.imageUrl = filePath console.log('上传成功', filePath) }); @@ -94,7 +178,6 @@ export class EditUpdateCategoryComponent implements OnInit { //查看图片 viewImg(url) { - // url.split('?')[0] let dom = document.getElementById(`viewerjs`) let pObjs = dom.childNodes; let node = document.createElement("img") 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 2a487c5..618cab2 100644 --- a/src/app/pages/license/update-category/update-category.component.html +++ b/src/app/pages/license/update-category/update-category.component.html @@ -22,28 +22,39 @@ - 证件名称 + {{item.licenseTypeName || ''}} + + {{item.licenseCode || ''}} + {{item.validityEndTime | date:"yyyy/MM/dd"}} + + + + + + {{item.validityDays || 0}}天 + {{item.handleType}} + 是否 + {{item.committedTime | date:"yyyy/MM/dd"}}未提交审核 + + 无 + 审核中 + 审核通过 + 审核驳回 + 未提交审核 + 审核完成 - 证件编号 - 证件有效期 - - - + 无 + 办理提醒 + 临期提醒 + 逾期报警 - 有效期类型 - 办理类型 - 是否年检 - 提交时间 - 审核状态 - 预警状态 编辑 详情 - 提交审核 + 撤销审核 + 提交审核 + 审核完成 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 4e97a8e..1380759 100644 --- a/src/app/pages/license/update-category/update-category.component.ts +++ b/src/app/pages/license/update-category/update-category.component.ts @@ -18,11 +18,7 @@ export class UpdateCategoryComponent implements OnInit { constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { } tableSpin = false - list = [ - { url: '/api/Objects/sinochemweb/stationPhotos/175/timg.jpg', type: 'img' }, - { url: '/api/Objects/sinochemweb/stationPhotos/853/完整度规划20200724.docx', type: 'word' }, - { url: '/api/Objects/sinochemweb/stationPhotos/853/10.6 MB.pdf', type: 'pdf' }, - ] + list = [] tableScrollHeight ngOnInit(): void { @@ -31,12 +27,34 @@ export class UpdateCategoryComponent implements OnInit { fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' }); - let xxx = '/api/Objects/sinochemweb/stationPhotos/853/10.6 MB.pdf' - // console.log(666,xxx.split('.')[xxx.split('.').length - 1]) + this.getStationList() } + + //获取当前油站档案类证照 + getStationList() { + let data = JSON.parse(sessionStorage.getItem('userdataOfgasstation')); + let params = { orgId: data.organization.id || "" } + this.http.get(`/api/services/app/StationValidityLicense/GetCurStationLicense`,{params}).subscribe((info: any)=>{ + this.list = info.result + console.log(info.result) + }) + } + + //获取文件格式 + 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 + } + //查看图片 viewImg(url) { - // url.split('?')[0] let dom = document.getElementById(`viewerjs`) let pObjs = dom.childNodes; let node = document.createElement("img") @@ -54,53 +72,28 @@ export class UpdateCategoryComponent implements OnInit { node.click(); }, 0); } + //查看文件 lookFile(item) { - console.log('item', item) - - let suffix = item.url.split('.')[item.url.split('.').length - 1].toLowerCase() - if (item.type == 'word') { - let arr = item.url.split('.') + 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 (item.type == 'pdf') { - window.open(item.url) + } else if (this.getFileType(item.imageUrl) == 'pdf') { + window.open(item.imageUrl) } else { - // let config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('该文件类型暂不支持在线查看', '确定', config); + this.message.create('warning', '暂不支持查看！'); } - - // const modal = this.modal.create({ - // nzContent: PdfWordLookComponent, - // nzViewContainerRef: this.viewContainerRef, - // nzWidth: 850, - // 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 () => { - - // } - // }); - // const instance = modal.getContentComponent(); - // modal.afterClose.subscribe(result => { }); } + dispose() { - console.log('处置') + } edit(item) { - console.log('item', item) const modal = this.modal.create({ nzContent: EditUpdateCategoryComponent, nzViewContainerRef: this.viewContainerRef, @@ -120,20 +113,24 @@ export class UpdateCategoryComponent implements OnInit { nzOnOk: async () => { if (instance.validateForm.valid) { await new Promise(resolve => { - let body = { - id: item.id, - name: instance.validateForm.value.name, - storageLocation: instance.validateForm.value.storageLocation, - productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'), - maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'), - validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'), - organizationUnitId: item.organizationUnitId + let body = instance.data2 + // 日期 + if (body.isLongTerm) { + body.validityStartTime = instance.isLongTermTime + } else { + body.validityStartTime = instance.isNoLongTermTime[0] || new Date() + body.validityEndTime = instance.isNoLongTermTime[1] || new Date() } - // this.http.put('/api/services/app/FireEquipment/Update', body).subscribe(data => { - // resolve(data) - // this.message.create('success', '修改成功！'); - // return true - // }) + // 办理类型 + if (instance.typeList.length) { + body.handleType = instance.typeList.join("/") + } + this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe(data => { + resolve(data); + this.getStationList(); + this.message.create('success', '修改成功！'); + return true + }) }) } else { this.message.create('warning', '请填写完整！'); @@ -144,8 +141,8 @@ export class UpdateCategoryComponent implements OnInit { const instance = modal.getContentComponent(); modal.afterClose.subscribe(result => { }); } + details(item) { - console.log('item', item) const modal = this.modal.create({ nzContent: DetailsUpdateCategoryComponent, nzViewContainerRef: this.viewContainerRef, @@ -169,4 +166,23 @@ export class UpdateCategoryComponent implements OnInit { const instance = modal.getContentComponent(); modal.afterClose.subscribe(result => { }); } + + //提交审核 + submitReview(item){ + let params = { id: item.id } + this.http.post('/api/services/app/StationValidityLicense/Commit', {},{params}).subscribe(data => { + this.message.create('success', '提交审核成功！'); + this.getStationList(); + }) + } + + //撤销审核 + cancelReview(item){ + let params = { id: item.id } + this.http.post('/api/services/app/StationValidityLicense/Uncommit', {},{params}).subscribe(data => { + this.message.create('success', '撤销审核成功！'); + this.getStationList(); + }) + } + }