@@ -29,6 +32,8 @@
{{item.handleRemindDays}}天
{{item.closingRemindDaysDefault}}天
{{item.closingRemindDays}}天
+ {{item.isYearlyCheckDefault ? '是' : '否'}}
+ {{item.yearlyCheckDate | date:"MM/dd"}}
{{(item.auditLog && item.auditLog.committedTime) ? (item.auditLog.committedTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}
{{item.auditStatus | auditStatus}}
@@ -36,7 +41,7 @@
[ngClass]="{'greyColor': item.auditStatus == 1}">编辑
撤销审核
- 审核详情
+ 详情
diff --git a/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html
index 176eade..6d4e7d1 100644
--- a/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html
+++ b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html
@@ -35,6 +35,15 @@
修改说明
diff --git a/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.ts b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.ts
index 3e4b643..042d6b8 100644
--- a/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.ts
+++ b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.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 { NzMessageService } from 'ng-zorro-antd/message';
+import * as moment from 'moment';
@Component({
selector: 'app-edit-inform-time',
templateUrl: './edit-inform-time.component.html',
@@ -16,13 +17,14 @@ export class EditInformTimeComponent implements OnInit {
validateForm!: FormGroup;
constructor(private message: NzMessageService, private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService) { }
-
+ dateFormat = 'MM/dd';
dataCopy
ngOnInit(): void {
this.dataCopy = JSON.parse(JSON.stringify(this.data))
this.validateForm = this.fb.group({
time1: [this.dataCopy.handleRemindDays, [Validators.required]],
time2: [this.dataCopy.closingRemindDays, [Validators.required]],
+ time: [this.dataCopy.yearlyCheckDate, [Validators.required]],//年检时间
explain: [null]
});
@@ -44,6 +46,7 @@ export class EditInformTimeComponent implements OnInit {
organizationId: this.dataCopy.organizationId,
handleRemindDays: this.validateForm.value.time1,
closingRemindDays: this.validateForm.value.time2,
+ yearlyCheckDate: moment(this.validateForm.value.time).format('YYYY-MM-DD'),
remark: this.validateForm.value.explain
}
console.log(body)
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 b52cd69..c72c45b 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
@@ -7,52 +7,65 @@
-
{{data.gasStation.companyName}} - {{data.gasStation.locationName}} - {{data.gasStation.stationName}}
+
{{data.gasStation.companyName}} -
+ {{data.gasStation.locationName}} - {{data.gasStation.stationName}}
-
+
公司名称: {{data.organization.displayName}}
证照名称: {{data.getData.licenseType.licenseName}}
- 办理提醒时间：修改时间 {{data.getData.handleRemindDays}}天
+ 办理提醒时间: 修改时间 {{data.getData.handleRemindDays}}天
默认时间 {{data.getData.handleRemindDaysDefault}}天
- 临期提醒时间：修改时间 {{data.getData.closingRemindDays}}天
+ 临期提醒时间: 修改时间 {{data.getData.closingRemindDays}}天
默认时间 {{data.getData.closingRemindDaysDefault}}天
-
修改说明： {{data.getData.remark}}
+
年检时间: {{data.getData.yearlyCheckDate | date:"MM/dd"}}
+
+
修改说明: {{data.getData.remark}}
证照名称: {{data.getData.licenseTypeName}}
证照编号: {{data.getData.licenseCode || ''}}
-
证照效期: {{data.getData.validityStartTime | date:"yyyy/MM/dd"}} - {{data.getData.validityEndTime | date:"yyyy/MM/dd"}}
+
证照效期: {{data.getData.validityStartTime |
+ date:"yyyy/MM/dd"}} - {{data.getData.validityEndTime | date:"yyyy/MM/dd"}}
办理类型: {{getHandleTypes(data.getData.handleTypes)}}
有效期类型: {{data.getData.validityDays || 0}}天
-
是否年检: 是 否
+
是否年检: 是 否
证照名称: {{data.getData.licenseTypeName}}
-
有无证照: 不适用 无 有
+
有无证照: 不适用 无 有
+
附件:
-
-
审批意见：
-
+
审批意见:
+
通过
驳回
diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.ts b/src/app/pages/audit/audit-ing/audit-ing.component.ts
index 05065b8..bd55cf7 100644
--- a/src/app/pages/audit/audit-ing/audit-ing.component.ts
+++ b/src/app/pages/audit/audit-ing/audit-ing.component.ts
@@ -135,18 +135,24 @@ export class AuditIngComponent implements OnInit {
}
details(item) {
+ let itemCopy = JSON.parse(JSON.stringify(item))
let component
if (item.auditType == 0) {
component = GasBaseInfoComponent
} else if (item.auditType == 1) {
component = AuditDetailsInformTimeComponent
+
} else if (item.auditType == 2) {
component = DetailsUpdateCategoryComponent
} else if (item.auditType) {
component = DetailsFileCategoryComponent
}
- this.getData(item).then(res => {
+ this.getData(item).then((res: any) => {
+ // console.log('res', res)
item.getData = res
+ if (item.auditType == 1) {
+ item.getData.isYearlyCheckDefault = res.licenseType.isYearlyCheck
+ }
const modal = this.modal.create({
nzContent: component,
nzViewContainerRef: this.viewContainerRef,
@@ -189,7 +195,7 @@ export class AuditIngComponent implements OnInit {
let params = { id: item.itemId }
this.http.get(url, { params }).subscribe((data: any) => {
let auditLog = { rejectReason: item.rejectReason }
- let organization = { displayName: item.organization? item.organization.displayName : "" }
+ let organization = { displayName: item.organization ? item.organization.displayName : "" }
if (item.auditType == 1) {
data.result.auditLog = auditLog
data.result.organization = organization
diff --git a/src/app/pages/audit/audit-nav/audit-nav.component.html b/src/app/pages/audit/audit-nav/audit-nav.component.html
index 49f53ab..fb888d7 100644
--- a/src/app/pages/audit/audit-nav/audit-nav.component.html
+++ b/src/app/pages/audit/audit-nav/audit-nav.component.html
@@ -6,10 +6,10 @@
{{item}}
- 通知时间
- 年检设置
+ 预警规则
+
- 
+