From 8b5fbbb9ef0824645305757b8cf5348b145e7b5f Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 23 May 2022 10:31:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=8F=E8=90=A5=E7=B1=BB=E8=AF=81?= =?UTF-8?q?=E7=85=A7=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/home/home.component.html | 2 +- .../license/nav-bar/nav-bar.component.ts | 2 +- .../edit-update-category.component.html | 1 + .../edit-update-category.component.scss | 2 +- .../edit-update-category.component.ts | 10 ++++++- .../update-category.component.html | 30 +++++++++---------- .../update-category.component.ts | 28 +++++++++++------ 7 files changed, 47 insertions(+), 28 deletions(-) diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 596490f..27657a1 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -34,7 +34,7 @@ 预警记录
  • - 证件 + 证照管理
    • diff --git a/src/app/pages/license/nav-bar/nav-bar.component.ts b/src/app/pages/license/nav-bar/nav-bar.component.ts index 5f0f058..502afc5 100644 --- a/src/app/pages/license/nav-bar/nav-bar.component.ts +++ b/src/app/pages/license/nav-bar/nav-bar.component.ts @@ -9,7 +9,7 @@ export class NavBarComponent implements OnInit { constructor() { } - navList = ['通知','更新类证件','档案类证件','历史纪录'] + navList = ['通知','经营类证照','资产类证照','历史纪录'] selectedItem = '通知' selectNav(item){ this.selectedItem = item 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 5020e33..e17caa7 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 @@ -63,6 +63,7 @@
    +
    diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss index 75ccce6..ae52af3 100644 --- a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss +++ b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss @@ -70,7 +70,7 @@ } button:nth-child(2) { - margin-left: 16px; + margin: 0 15px; } .ok { 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 2fe07e8..2dcaf4a 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 @@ -57,8 +57,16 @@ export class EditUpdateCategoryComponent implements OnInit { this.modal.destroy({ data: 'this the result data' }); } + isSubmit: boolean = false; ok() { - this.modal.triggerOk() + this.isSubmit = false; + this.modal.triggerOk(); + } + + //提交审核 + submitReview(){ + this.isSubmit = true; + this.modal.triggerOk(); } //check change 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 e3c3c23..4ced581 100644 --- a/src/app/pages/license/update-category/update-category.component.html +++ b/src/app/pages/license/update-category/update-category.component.html @@ -5,17 +5,17 @@ - 证件名称 + 证照名称 - 证件编号 - 证件有效期 - 附件 - 有效期类型 + 证照编号 + 证照效期 + 有效天数 办理类型 - + 预警状态 + 附件 操作 @@ -26,11 +26,6 @@ {{item.licenseCode || ''}} {{item.isLongTerm ? '长期证照' : (item.validityEndTime | date:"yyyy/MM/dd")}} - - - - - 长期 @@ -41,22 +36,27 @@ {{getHandleTypes(item.handleTypes)}} - + 无 办理提醒 临期提醒 逾期报警 + + + + + 编辑 详情 撤销审核 - 提交审核 + 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 609c0bd..b58076e 100644 --- a/src/app/pages/license/update-category/update-category.component.ts +++ b/src/app/pages/license/update-category/update-category.component.ts @@ -143,11 +143,18 @@ export class UpdateCategoryComponent implements OnInit { body.validityStartTime = instance.isNoLongTermTime[0] || new Date() body.validityEndTime = instance.isNoLongTermTime[1] || new Date() } - this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe(data => { - resolve(data); - this.getStationList(); - this.message.create('success', '修改成功！'); - return true + this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe((data:any) => { + if (!instance.isSubmit) { + resolve(data); + this.getStationList(); + this.message.create('success', '修改成功！'); + return true; + } else { //提交审核 + this.submitReview(data.result).then(res=>{ + resolve(data); + return true; + }); + } }) }) } else { @@ -191,10 +198,13 @@ export class UpdateCategoryComponent implements OnInit { this.message.create('warning', '该证照请编辑保存后再提交审核！'); return } - let params = { id: item.id } - this.http.post('/api/services/app/StationValidityLicense/Commit', {},{params}).subscribe(data => { - this.message.create('success', '提交审核成功！'); - this.getStationList(); + return new Promise((resolve, reject)=>{ + let params = { id: item.id } + this.http.post('/api/services/app/StationValidityLicense/Commit', {},{params}).subscribe(data => { + this.message.create('success', '提交审核成功！'); + this.getStationList(); + resolve('success'); + }) }) } From b99d653da78271791f908a59dd5364761537a409 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 23 May 2022 15:01:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=B1=BB=E8=AF=81?= =?UTF-8?q?=E7=85=A7=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../audit-dispose.component.html | 2 +- .../details-file-category.component.html | 4 ++- .../edit-file-category.component.html | 8 +++-- .../edit-file-category.component.scss | 2 +- .../edit-file-category.component.ts | 14 ++++++-- .../file-category.component.html | 18 +++++------ .../file-category/file-category.component.ts | 32 +++++++++++++------ .../edit-update-category.component.html | 2 +- .../update-category.component.ts | 2 +- 9 files changed, 57 insertions(+), 27 deletions(-) diff --git a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html index 1fbeba5..0ed445b 100644 --- a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html +++ b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html @@ -43,7 +43,7 @@

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

    -

    有效期类型:   不适用无有

    +

    有无证照:   不适用无有

    证件图片:    diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html index 443717f..44f6cc7 100644 --- a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html +++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html @@ -9,7 +9,7 @@

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

    -

    有效期类型:   不适用无有

    +

    有无证照:   不适用无有

    @@ -19,6 +19,8 @@

    +

    说明:   {{data.remark}}

    +

    审核记录 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 7efab10..85f86ac 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 @@ -10,7 +10,7 @@

    -

    有效期类型*

    +

    适用类型*

    @@ -40,8 +40,12 @@
    +

    说明

    + +
    - + +
    diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss index 75ccce6..ae52af3 100644 --- a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss @@ -70,7 +70,7 @@ } button:nth-child(2) { - margin-left: 16px; + margin: 0 15px; } .ok { diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts index 8d590bb..9dd6a98 100644 --- a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts @@ -21,7 +21,8 @@ export class EditFileCategoryComponent implements OnInit { data2 ngOnInit(): void { this.validateForm = this.fb.group({ - type: [null, [Validators.required]] + type: [null, [Validators.required]], + remark: [null] }); this.data2 = JSON.parse(JSON.stringify(this.data)) this.validatyType = (this.data2.validatyType).toString() @@ -38,8 +39,17 @@ export class EditFileCategoryComponent implements OnInit { destroyModal() { this.modal.destroy({ data: 'this the result data' }); } + + isSubmit: boolean = false; ok() { - this.modal.triggerOk() + this.isSubmit = false; + this.modal.triggerOk(); + } + + //提交审核 + submitReview(){ + this.isSubmit = true; + this.modal.triggerOk(); } 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 376fd49..42fcd2c 100644 --- a/src/app/pages/license/file-category/file-category.component.html +++ b/src/app/pages/license/file-category/file-category.component.html @@ -5,12 +5,12 @@ - 证件名称 + 证照名称 - 有效期类型 + 有无证照 + 附件 - 提交时间 - 审核状态 操作 @@ -24,20 +24,20 @@ 无 有 + - {{item.committedTime | date:"yyyy/MM/dd"}}未提交审核 - - {{item.auditLog.auditStatusDesc || ''}} - 编辑 详情 撤销审核 - 提交审核 + 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 b3bcc47..5f557ca 100644 --- a/src/app/pages/license/file-category/file-category.component.ts +++ b/src/app/pages/license/file-category/file-category.component.ts @@ -116,13 +116,24 @@ export class FileCategoryComponent implements OnInit { nzFooter: null, nzClosable: false, nzOnOk: async () => { + if (instance.validatyType == '2' && !instance.data2.imageUrl) { + this.message.create('warning', '请上传附件！'); + return false; + } await new Promise(resolve => { instance.data2.validatyType = Number(instance.validatyType) - this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe(data => { - resolve(data); - this.getStationList(); - this.message.create('success', '修改成功！'); - return true + this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe((data: any) => { + if (!instance.isSubmit) { + resolve(data); + this.getStationList(); + this.message.create('success', '修改成功！'); + return true; + } else { //提交审核 + this.submitReview(data.result).then(res=>{ + resolve(data); + return true; + }); + } }) }) } @@ -161,10 +172,13 @@ export class FileCategoryComponent implements OnInit { this.message.create('warning', '该证照请编辑保存后再提交审核！'); return } - let params = { id: item.id } - this.http.post('/api/services/app/StationFileLicense/Commit', {}, { params }).subscribe(data => { - this.message.create('success', '提交审核成功！'); - this.getStationList(); + return new Promise((resolve, reject)=>{ + let params = { id: item.id } + this.http.post('/api/services/app/StationFileLicense/Commit', {}, { params }).subscribe(data => { + this.message.create('success', '提交审核成功！'); + this.getStationList(); + resolve('success'); + }) }) } 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 e17caa7..4bbc24a 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 @@ -64,7 +64,7 @@
    - +
    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 b58076e..3f9ac38 100644 --- a/src/app/pages/license/update-category/update-category.component.ts +++ b/src/app/pages/license/update-category/update-category.component.ts @@ -138,7 +138,7 @@ export class UpdateCategoryComponent implements OnInit { let body = instance.data2 // 日期 if (body.isLongTerm) { - body.validityStartTime = instance.isLongTermTime + body.validityStartTime = instance.isLongTermTime || new Date() } else { body.validityStartTime = instance.isNoLongTermTime[0] || new Date() body.validityEndTime = instance.isNoLongTermTime[1] || new Date()