From 1b355af493296766e790f0023dc923cdf5773535 Mon Sep 17 00:00:00 2001 From: jingbowen <970029315@qq.com> Date: Sat, 4 Mar 2023 14:25:42 +0800 Subject: [PATCH 1/3] 441 --- src/app/service/pattern.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/service/pattern.service.ts b/src/app/service/pattern.service.ts index 813dfe3..cbe7e99 100644 --- a/src/app/service/pattern.service.ts +++ b/src/app/service/pattern.service.ts @@ -4,10 +4,10 @@ import { Injectable } from '@angular/core'; providedIn: 'root' }) export class PatternService { - static isProd: any = true; + static isProd: any = false; constructor() { } - public isProd: boolean = true //是否是生产环境 + public isProd: boolean = false //是否是生产环境 } From 7c20eb89ad1988264d077574acd393a365e8ad18 Mon Sep 17 00:00:00 2001 From: jingbowen <970029315@qq.com> Date: Sat, 4 Mar 2023 16:35:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=8F=E8=90=A5=E7=B1=BB=E8=AF=81?= =?UTF-8?q?=E7=85=A7=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E9=87=8D=E8=A6=81?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../add-update-of-license.component.html | 11 ++++++ .../add-update-of-license.component.ts | 38 +++++++++++-------- .../edit-update-of-license.component.html | 10 +++++ .../edit-update-of-license.component.ts | 8 +++- .../update-of-license.component.html | 2 + .../update-of-license.component.ts | 9 +++-- 6 files changed, 58 insertions(+), 20 deletions(-) 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 e81d414..e0f13f7 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 @@ -35,6 +35,16 @@ + + 重要等级 + + + + + + + + 是否上传副本 @@ -48,5 +58,6 @@ + \ 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 4b5af42..376fb7e 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 @@ -1,20 +1,28 @@ -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'; - +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-add-update-of-license', - templateUrl: './add-update-of-license.component.html', - styleUrls: ['./add-update-of-license.component.scss'] + selector: "app-add-update-of-license", + templateUrl: "./add-update-of-license.component.html", + styleUrls: ["./add-update-of-license.component.scss"], }) export class AddUpdateOfLicenseComponent implements OnInit { - validateForm!: FormGroup; - constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { } - + constructor( + private modal: NzModalRef, + private fb: FormBuilder, + private http: HttpClient + ) {} + importantLevelList= [ + { name: "普通", value: 0 }, + { name: "重要", value: 1 } + ]; ngOnInit(): void { this.validateForm = this.fb.group({ name: [null, [Validators.required]], @@ -22,13 +30,13 @@ export class AddUpdateOfLicenseComponent implements OnInit { closingRemindDays: [30, [Validators.required]], handleType: [[], [Validators.required]], isEctype: [false, [Validators.required]], - isYearlyCheck: [true, [Validators.required]] + isYearlyCheck: [true, [Validators.required]], + importantLevel: [0, [Validators.required]], }); } destroyModal(): void { - this.modal.destroy({ data: 'this the result data' }); + 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 d1395a1..7dbfd4b 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 @@ -34,6 +34,16 @@ + + 重要等级 + + + + + + + + 是否上传副本 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 0fc8089..33e66f7 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 @@ -14,7 +14,10 @@ export class EditUpdateOfLicenseComponent implements OnInit { @Input() data?: any; validateForm!: FormGroup; constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { } - + importantLevelList= [ + { name: "普通", value: 0 }, + { name: "重要", value: 1 } + ]; ngOnInit(): void { this.validateForm = this.fb.group({ name: [this.data.licenseName, [Validators.required]], @@ -22,7 +25,8 @@ export class EditUpdateOfLicenseComponent implements OnInit { closingRemindDays: [this.data.closingRemindDays, [Validators.required]], handleType: [this.data.handleTypes, [Validators.required]], isEctype: [this.data.hasAttachment, [Validators.required]], - isYearlyCheck: [this.data.isYearlyCheck, [Validators.required]] + isYearlyCheck: [this.data.isYearlyCheck, [Validators.required]], + importantLevel: [this.data.importantLevel, [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 6e8c812..0ef1cad 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 @@ -19,6 +19,7 @@ 办理类型 是否上传副本 是否年检 + 重要等级 操作 @@ -30,6 +31,7 @@ {{getHandleTypes(data.handleTypes)}} {{data.hasAttachment ? '是' : '否'}} {{data.isYearlyCheck ? '是' : '否'}} + {{data.importantLevel ? '重要':'普通'}} 编辑 删除 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 35cd12c..d108841 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 @@ -49,6 +49,7 @@ export class UpdateOfLicenseComponent implements OnInit { nzWidth: 588, nzComponentParams: {}, nzOnOk: async () => { + if (instance.validateForm.valid) { await new Promise(resolve => { let body = { @@ -57,7 +58,8 @@ export class UpdateOfLicenseComponent implements OnInit { closingRemindDays: instance.validateForm.value.closingRemindDays, hasAttachment: instance.validateForm.value.isEctype, handleTypes: instance.validateForm.value.handleType, - isYearlyCheck: instance.validateForm.value.isYearlyCheck + isYearlyCheck: instance.validateForm.value.isYearlyCheck, + importantLevel: instance.validateForm.value.importantLevel, } this.http.post('/api/services/app/ValidityLicenseType/Create', body).subscribe(data => { resolve(data) @@ -90,7 +92,7 @@ export class UpdateOfLicenseComponent implements OnInit { }, nzOnOk: async () => { if (instance.validateForm.valid) { - await new Promise(resolve => { + await new Promise(resolve => { console.log('表单信息', instance.validateForm) let body = { id: item.id, @@ -99,7 +101,8 @@ export class UpdateOfLicenseComponent implements OnInit { closingRemindDays: instance.validateForm.value.closingRemindDays, hasAttachment: instance.validateForm.value.isEctype, handleTypes: instance.validateForm.value.handleType, - isYearlyCheck: instance.validateForm.value.isYearlyCheck + isYearlyCheck: instance.validateForm.value.isYearlyCheck, + importantLevel: instance.validateForm.value.importantLevel, } this.http.put('/api/services/app/ValidityLicenseType/Update', body).subscribe(data => { resolve(data) From ff49495b7e7fa4b0278eff0e748535af4c042980 Mon Sep 17 00:00:00 2001 From: jingbowen <970029315@qq.com> Date: Sat, 4 Mar 2023 16:45:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=8F=E8=90=A5=E7=B1=BB=E8=AF=81?= =?UTF-8?q?=E7=85=A7=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E9=87=8D=E8=A6=81?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/service/pattern.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/service/pattern.service.ts b/src/app/service/pattern.service.ts index cbe7e99..813dfe3 100644 --- a/src/app/service/pattern.service.ts +++ b/src/app/service/pattern.service.ts @@ -4,10 +4,10 @@ import { Injectable } from '@angular/core'; providedIn: 'root' }) export class PatternService { - static isProd: any = false; + static isProd: any = true; constructor() { } - public isProd: boolean = false //是否是生产环境 + public isProd: boolean = true //是否是生产环境 }