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] =?UTF-8?q?=E7=BB=8F=E8=90=A5=E7=B1=BB=E8=AF=81=E7=85=A7?=
=?UTF-8?q?=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');
+ })
})
}