From 194f251f531025f5fab96d4f6dc8c77eac03a473 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Tue, 24 May 2022 11:35:50 +0800 Subject: [PATCH 1/4] =?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 --- .../audit-inform-time.component.html | 16 +++++++--------- .../add-update-of-license.component.html | 16 +++++++++++++++- .../add-update-of-license.component.ts | 8 +++++++- .../edit-update-of-license.component.html | 16 +++++++++++++++- .../edit-update-of-license.component.ts | 7 ++++++- .../update-of-license.component.ts | 9 ++++++--- 6 files changed, 56 insertions(+), 16 deletions(-) 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 aadc2ca..45c4f47 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 @@ -9,8 +9,8 @@ 办理提醒时间 临期提醒时间 - 提交审核时间 - 审核状态 + 操作 @@ -29,14 +29,12 @@ {{item.handleRemindDays}}天 {{item.closingRemindDaysDefault}}天 {{item.closingRemindDays}}天 - {{(item.auditLog && item.auditLog.committedTime) ? (item.auditLog.committedTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}} - {{item.auditStatus | auditStatus}} + - 编辑 - 撤销审核 - 审核详情 + 编辑 + 撤销审核 + 详情 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 7983bdb..576c104 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 @@ -26,9 +26,23 @@ 是否年检 - + + + 是否需要上传附件 + + + + + + 办理类型 + + + + + + \ 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 ca3640d..083c833 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 @@ -2,6 +2,7 @@ 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 { handleType,handleTypeList } from 'src/app/pages/license/inform/inform.component'; @Component({ @@ -19,10 +20,15 @@ export class AddUpdateOfLicenseComponent implements OnInit { name: [null, [Validators.required]], handleRemindDays: [90, [Validators.required]], closingRemindDays: [30, [Validators.required]], - isYearlyCheck: [true, [Validators.required]] + isYearlyCheck: [true, [Validators.required]], + hasAttachment: [false, [Validators.required]], + handleTypes: [[], [Validators.required]] }); } destroyModal(): void { this.modal.destroy({ data: 'this the result data' }); } + + handleTypeList: handleTypeList[] = new handleType().list; //办理类型list + } 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 7983bdb..576c104 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 @@ -26,9 +26,23 @@ 是否年检 - + + + 是否需要上传附件 + + + + + + 办理类型 + + + + + + \ 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 13fd904..e48067f 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 @@ -2,6 +2,7 @@ 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 { handleType,handleTypeList } from 'src/app/pages/license/inform/inform.component'; @Component({ selector: 'app-edit-update-of-license', @@ -19,11 +20,15 @@ export class EditUpdateOfLicenseComponent implements OnInit { name: [this.data.licenseName, [Validators.required]], handleRemindDays: [this.data.handleRemindDays, [Validators.required]], closingRemindDays: [this.data.closingRemindDays, [Validators.required]], - isYearlyCheck: [this.data.isYearlyCheck, [Validators.required]] + isYearlyCheck: [this.data.isYearlyCheck, [Validators.required]], + hasAttachment: [this.data.hasAttachment, [Validators.required]], + handleTypes: [this.data.handleTypes, [Validators.required]] }); } destroyModal(): void { this.modal.destroy({ data: 'this the result data' }); } + handleTypeList: handleTypeList[] = new handleType().list; //办理类型list + } 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 19df34e..6514fb5 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 @@ -48,12 +48,13 @@ export class UpdateOfLicenseComponent implements OnInit { nzOnOk: async () => { if (instance.validateForm.valid) { await new Promise(resolve => { - console.log('表单信息', instance.validateForm) let body = { licenseName: instance.validateForm.value.name, handleRemindDays: instance.validateForm.value.handleRemindDays, closingRemindDays: instance.validateForm.value.closingRemindDays, - isYearlyCheck: instance.validateForm.value.isYearlyCheck + isYearlyCheck: instance.validateForm.value.isYearlyCheck, + hasAttachment: instance.validateForm.value.hasAttachment, + handleTypes: instance.validateForm.value.handleTypes, } this.http.post('/api/services/app/ValidityLicenseType/Create', body).subscribe(data => { resolve(data) @@ -93,7 +94,9 @@ export class UpdateOfLicenseComponent implements OnInit { licenseName: instance.validateForm.value.name, handleRemindDays: instance.validateForm.value.handleRemindDays, closingRemindDays: instance.validateForm.value.closingRemindDays, - isYearlyCheck: instance.validateForm.value.isYearlyCheck + isYearlyCheck: instance.validateForm.value.isYearlyCheck, + hasAttachment: instance.validateForm.value.hasAttachment, + handleTypes: instance.validateForm.value.handleTypes, } this.http.put('/api/services/app/ValidityLicenseType/Update', body).subscribe(data => { resolve(data) From adf48b8b396d057f8f0aefab010e56c71211b12f Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Tue, 24 May 2022 14:34:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=89=AF=E6=9C=ACui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details-update-category.component.html | 2 +- .../edit-update-category.component.html | 20 ++++++++++++++++--- .../update-category.component.html | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) 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 9dfca80..72a69d6 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 @@ -13,7 +13,7 @@

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

-

办理类型:   {{getHandleTypes(data.handleTypes)}}

+

办理类型:   {{getHandleTypes(data.handleTypesDefault)}}

有效期类型:   {{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 4bbc24a..e2be913 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 @@ -38,7 +38,7 @@ - + @@ -53,12 +53,26 @@ -
- + +
+ +
+ + + + + + +
+
+ +
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 4ced581..31ccdf6 100644 --- a/src/app/pages/license/update-category/update-category.component.html +++ b/src/app/pages/license/update-category/update-category.component.html @@ -35,7 +35,7 @@ - {{getHandleTypes(item.handleTypes)}} + {{getHandleTypes(item.handleTypesDefault)}}