From e2df63a0f31a04de8cdef60dd87a92e7573222f4 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Sat, 23 Jan 2021 14:31:34 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=89=B9=E9=87=8F=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wait-examineer.component.html | 3 +- .../wait-examineer.component.ts | 119 +++++++++++----- .../entry-plan/entry-plan.component.html | 9 ++ .../entry-plan/entry-plan.component.ts | 3 + .../meet-plan/meet-plan.component.ts | 4 +- .../onetwo-entry-plan.component.ts | 6 +- .../pass-plan/pass-plan.component.html | 132 +----------------- .../pass-plan/pass-plan.component.ts | 6 +- .../type-plan/type-plan.component.ts | 8 +- 9 files changed, 117 insertions(+), 173 deletions(-) diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index c7961ea..fccb149 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -56,7 +56,8 @@ diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts index a444aff..d7e833a 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-25 16:13:50 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-21 11:17:39 + * @LastEditTime: 2021-01-23 14:16:10 */ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -91,6 +91,7 @@ export class WaitExamineerComponent implements OnInit { checked//是否选中 chuorzhong//判断初审还是终审 radioid//选中的id + shenheTable=[]//选中要审核的对象 //获取表格数据 getAlltabledate(){ @@ -132,11 +133,21 @@ export class WaitExamineerComponent implements OnInit { this.getAlltabledate() } //radio点击事件 - radioClick(item){ + radioClick(e,item){ //e.target.parentElement.bgColor='#2196F3' - console.log(item) - this.chuorzhong=item.verifyState - this.radioid=item.itemId + //console.log(e,item) + if(e.checked){ + this.shenheTable.push(item) + } + else{ + for(var i=0;i{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) + }else if(this.shenheTable[0].verifyState==3){ + this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) + } + } + else{ + for(var i=0;i{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) } - if(this.chuorzhong==0){ - this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:16}).subscribe(data=>{ + this.shenheTable=[] + } + //拒绝操作 + refuse(){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + var refuseList=[] + if(this.shenheTable.length==0){ + this.snackBar.open('请选择要审核的预案!','确定',config); + } + else if(this.shenheTable.length==1){ + if(this.shenheTable[0].verifyState==0){ + this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:32}).subscribe(data=>{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) + }else if(this.shenheTable[0].verifyState==3){ + this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{ this.snackBar.open('操作成功!','确定',config); - this.checked='' this.getAlltabledate() }) + } } - else if(this.chuorzhong==3){ - this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{ + else{ + for(var i=0;i{ this.snackBar.open('操作成功!','确定',config); - this.checked='' this.getAlltabledate() }) } - this.chuorzhong=undefined - } - //拒绝操作 - refuse(){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - if(this.chuorzhong==2){ - this.snackBar.open('审核未通过，请修改后再来审核!','确定',config); - } -if(this.chuorzhong==0){ - this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:32}).subscribe(data=>{ - this.snackBar.open('操作成功!','确定',config); - this.checked='' - this.getAlltabledate() - }) -} -else if(this.chuorzhong==3){ -this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{ - this.snackBar.open('操作成功!','确定',config); - this.checked='' - this.getAlltabledate() -}) -} -this.chuorzhong=undefined + this.shenheTable=[] + + } //分数饼状图 diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html index fcc41f3..67ad0fb 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.html +++ b/src/app/plan-management/entry-plan/entry-plan.component.html @@ -94,6 +94,15 @@ +
+ + + + 有预案 + 无预案 + + +
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts index feb6b5d..807af6f 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -53,6 +53,7 @@ export class EntryPlanComponent implements OnInit { organizationName:any //当前单位组织机构名称 preparelevels:any integritySort:any //完整度排序 + haveyuan//有无预案 colorRgb(sColor){ var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/; var sColor = sColor.toLowerCase(); @@ -304,6 +305,7 @@ export class EntryPlanComponent implements OnInit { PageSize: this.pageSizeOptions[0], Sort: this.integritySort ? 'integrityscore' : '', SortType: this.integritySort || '', + HasPlanComponents:this.haveyuan||'' } this.http.get("/api/Plans",{params:paramsdata}).subscribe((data:any)=>{ @@ -349,6 +351,7 @@ export class EntryPlanComponent implements OnInit { this.preparelevel = '' this.integritySort = '' this.plcheck = false + this.haveyuan='' //重新获取初始化列表 // console.log(this.pageEvent) this.pageEvent.pageIndex = 0 diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts index 8ff1a69..cc7d5f8 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -87,8 +87,8 @@ export class MeetPlanComponent implements OnInit { PlanType:reservePlanType||'', CreatorName:this.addname||'', AuditStatus:this.unitstate|| '', - QueryStartTime:this.addtime||'', - QueryEndTime:this.endtime||'', + CreationTimeRangeStart:this.addtime||'', + CreationTimeRangeEnd:this.endtime||'', PlanLevel:this.projectlevel||'', HasChildrenPlanLevel:this.plcheck||'', PageNumber: this.PageNumber || '1', diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts index 693ad3a..01ff599 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 14:15:10 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-21 14:32:43 + * @LastEditTime: 2021-01-22 09:17:40 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -98,8 +98,8 @@ export class OnetwoEntryPlanComponent implements OnInit { PlanType:reservePlanType||'', CreatorName:this.addname||'', AuditStatus:this.unitstate|| '', - QueryStartTime:this.addtime||'', - QueryEndTime:this.endtime||'', + CreationTimeRangeStart:this.addtime||'', + CreationTimeRangeEnd:this.endtime||'', PlanLevel:this.projectlevel||'', HasChildrenPlanLevel:this.plcheck||'', PageNumber: this.PageNumber || '1', diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html index 8c34ed6..6c0411c 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.html +++ b/src/app/plan-management/pass-plan/pass-plan.component.html @@ -83,16 +83,6 @@
-
- - - - - 🠊 - - - -
@@ -114,126 +104,16 @@
- + + + + + diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 0f0334d..9096503 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -42,7 +42,7 @@ export class PassPlanComponent implements OnInit { pageSizeOptions: number[] = [10] //设置每页条数 PageNumber:any; //第几页 - displayedColumns: string[] = ['planname', 'addpeople','addtime','plantype','auditStatus','openRange','projectlevel','operation']; + displayedColumns: string[] = ['planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation']; allorganizations:any //所有组织机构 allunittype:any //所有单位类型 tabledataSource:any //表格数据 @@ -97,6 +97,8 @@ export class PassPlanComponent implements OnInit { AuditStatus:'', //审核状态 PlanLevel: this.preparelevel || '', HasChildrenPlanLevel: this.plcheck || '', + CreationTimeRangeStart:this.addtime||'', + CreationTimeRangeEnd:this.endtime||'', PageNumber: this.PageNumber || '1', PageSize: this.pageSizeOptions[0], Sort: '' @@ -342,6 +344,8 @@ export class PassPlanComponent implements OnInit { this.unittype = '' this.reservePlanType = '' this.preparelevel = '' + this.addtime='' + this.endtime='' this.plcheck = false //重新获取初始化列表 this.pageEvent.pageIndex = 0 diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts index 0a1163c..91227db 100644 --- a/src/app/plan-management/type-plan/type-plan.component.ts +++ b/src/app/plan-management/type-plan/type-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-01-06 09:47:43 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-21 14:15:40 + * @LastEditTime: 2021-01-23 09:45:17 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -86,8 +86,8 @@ export class TypePlanComponent implements OnInit { planCategories:8, CreatorName:this.addname||'', AuditStatus:this.unitstate|| '', - QueryStartTime:this.addtime||'', - QueryEndTime:this.endtime||'', + CreationTimeRangeStart:this.addtime||'', + CreationTimeRangeEnd:this.endtime||'', PlanLevel:this.projectlevel||'', HasChildrenPlanLevel:this.plcheck||'', PageNumber: this.PageNumber || '1', @@ -371,6 +371,7 @@ export class newunitType{ PlanCategory:8, PlanLevel:PlanLevel, PlanMode:1, + PlanType:8, attachmentUrls:[`${this.objectName}`] } this.http.post("/api/PlanComponentsMajor",body).subscribe((data:any)=>{ @@ -461,6 +462,7 @@ export class newunitType{ PlanCategory:8, PlanLevel:PlanLevel, PlanMode:1, + PlanType:8, attachmentUrls:[`${this.objectName}`] }
- + + {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'? 'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':'消防车辆'}} {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}预案名称 {{element.name}} 添加人 {{element.creatorName}} 预案级别{{element.planCategory==1?'Ⅰ级预案':element.planCategory==2?'Ⅱ级预案': + element.planCategory==3?'Ⅲ级预案':element.planCategory==4?'Ⅳ级预案':element.planCategory==5?'Ⅴ级预案':element.planCategory==8?'类型预案':'应急预案'}} 添加时间 {{element.creationTime | date:'yyyy-MM-dd'}}