From 13086916531bb03878d5805b2f269613b862a65a Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Tue, 19 Jan 2021 15:26:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=BE=85=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=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 | 46 ++++---- .../wait-examineer.component.scss | 2 +- .../wait-examineer.component.ts | 109 ++++++++++++++---- .../entry-plan-look.component.ts | 1 + .../meet-plan/meet-plan.component.html | 4 +- .../onetwo-entry-plan.component.html | 7 +- .../onetwo-entry-plan.component.ts | 3 +- .../type-plan/type-plan.component.html | 4 +- 8 files changed, 124 insertions(+), 52 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 18ca1f3..c7961ea 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -4,22 +4,22 @@
操作类型： - - - 全部 - 更新 - 新增 - 删除 - - 共计：80条 + 全部 + 更新 + 新增 + 删除 + + 共计：{{count}}条
类型： - + Ⅰ级预案 Ⅱ级预案 Ⅲ级预案 @@ -32,12 +32,12 @@ 编制级别： - + {{item.name}} - +
@@ -54,15 +54,17 @@
- + - + + {{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.contentType=='3'?'预案':''}}{{item.option}}{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}} {{item.verifyOrganizationName}}{{item.verifyState}}{{item.verifyState=='0'?'待初审':item.verifyState=='1'? + '初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}} {{item.creatorName}}{{item.verifyTime|date:'yyyy-MM-dd'}}{{item.createTime|date:'yyyy-MM-dd'}}
@@ -79,8 +81,8 @@
- - + +
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss index 5cc4fea..549aa98 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss @@ -19,7 +19,7 @@ } span{ font-size: 16px; - //margin-left: 3px; + margin-left: 3px; } input{ margin-left: 15px; 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 a7ac208..8c82e5d 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -4,10 +4,11 @@ * @Author: sueRimn * @Date: 2020-12-25 16:13:50 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-18 11:07:46 + * @LastEditTime: 2021-01-19 14:29:15 */ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { HttpClient } from '@angular/common/http' declare var echarts: any; @@ -18,7 +19,7 @@ declare var echarts: any; }) export class WaitExamineerComponent implements OnInit { - constructor(private http:HttpClient) { } + constructor(private http:HttpClient,public snackBar: MatSnackBar) { } ngOnInit(): void { let level = sessionStorage.getItem("level"); @@ -29,28 +30,28 @@ export class WaitExamineerComponent implements OnInit { {name:"大队",value:"4"}, {name:"中队",value:"8"} ] - this.PlanLevel=1 + this.PlanLevel=0 } if(level == "1"){//如果是支队 this.preparelevels = [ - {name:"支队",value:"2"}, - {name:"大队",value:"4"}, - {name:"中队",value:"8"} + {name:"支队",value:"1"}, + {name:"大队",value:"2"}, + {name:"中队",value:"3"} ] - this.PlanLevel=2 + this.PlanLevel=1 } if(level == "2"){//如果是大队 this.preparelevels = [ {name:"大队",value:"4"}, {name:"中队",value:"8"} ] - this.PlanLevel=4 + this.PlanLevel=2 } if(level == "3"){//如果是中队 this.preparelevels = [ {name:"中队",value:"8"} ] - this.PlanLevel=8 + this.PlanLevel=3 } var scrollflaga = true; var win=document.getElementById('tbodydiv') @@ -75,10 +76,10 @@ export class WaitExamineerComponent implements OnInit { preparelevels:any selected = new FormControl(0); //选项卡 实例 - level//类型 + level=''//操作类型 js//组织机构 addtime//时间 - projectlevel//编制级别 + projectlevel//预案级别 previewshow=false//预览得分是否显示 tableDate isallDate=true//是否显示完成数据，默认显示 @@ -86,42 +87,108 @@ export class WaitExamineerComponent implements OnInit { indexbar //饼状图实例 indexzhu PlanLevel//编制级别 + count//一共多少条 + checked//是否选中 + chuorzhong//判断初审还是终审 + radioid//选中的id //获取表格数据 getAlltabledate(){ let paramsdata:any = { - VerifyType:3, - ContentType:Number(this.level)||'', - Level:this.PlanLevel||'' - + Operation:this.level||[], + ContentType:Number(this.projectlevel)||[], + Level:this.PlanLevel||[], + verifyState:[0,3] } this.http.get("/api/ContentVerifies",{params:paramsdata}).subscribe((data:any)=>{ - console.log(data) + //console.log(data) this.tableDate=data.items + this.count=data.totalCount }) } //提交查询 onSubmit(value){ - console.log(value) + //console.log(value) this.getAlltabledate() } //刷新 record(){ this.level='' - this.PlanLevel='' + this.projectlevel='' + let level = sessionStorage.getItem("level"); + if(level == "0"){//如果是总队 + this.PlanLevel=0 + } + if(level == "1"){//如果是支队 + this.PlanLevel=1 + } + if(level == "2"){//如果是大队 + this.PlanLevel=2 + } + if(level == "3"){//如果是中队 + this.PlanLevel=3 + } this.getAlltabledate() } - //表格点击事件 - tableClick(e,key){ + //radio点击事件 + radioClick(item){ //e.target.parentElement.bgColor='#2196F3' - console.log(e) + console.log(item) + this.chuorzhong=item.verifyState + this.radioid=item.itemId } //变更数据和全部数据切换按钮 buttonChange(){ this.isallDate=!this.isallDate this.previewshow=false } + //同意操作 + agree(){ + 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:16}).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=>{ + this.snackBar.open('操作成功!','确定',config); + this.checked='' + this.getAlltabledate() + }) + } + } + //拒绝操作 + 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:4}).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() +}) +} + } //分数饼状图 bar(){ diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index 45342f6..724d4aa 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -885,6 +885,7 @@ export class AddPlanone { name: this.selectedPLanName, planType:Number(this.selectedPLanType), planMode: Number(this.defaultisshow), + planCategory: Number(this.selectedPLanLevel), planLevel: PlanLevel, url: this.webaddress, attachmentUrls: null diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html index f648b51..4853099 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -133,10 +133,10 @@ 操作 查看预案 - 提交审核 + 提交审核 撤销审核 下载 - 删除 + 删除 diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html index 99ae087..c62aee1 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 14:15:10 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-15 14:11:36 + * @LastEditTime: 2021-01-19 15:01:55 -->
@@ -133,10 +133,11 @@ 操作 查看预案 - 提交审核 + 提交审核 撤销审核 + 下载 - 删除 + 删除 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 1031949..9b4d3f1 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-15 15:05:18 + * @LastEditTime: 2021-01-19 14:55:16 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -108,6 +108,7 @@ export class OnetwoEntryPlanComponent implements OnInit { this.http.get("/api/PlanComponentsMajor",{params:paramsdata}).subscribe((data:any)=>{ this.length = data.totalCount this.tabledataSource = data.items + console.log(this.tabledataSource) }) } diff --git a/src/app/plan-management/type-plan/type-plan.component.html b/src/app/plan-management/type-plan/type-plan.component.html index 4dfa58b..c6acccc 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -111,10 +111,10 @@ 操作 查看预案 - 提交审核 + 提交审核 撤销审核 下载 - 删除 + 删除