shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[新增]待审核功能

dev
chenjingyu 4 years ago
parent
c163259b79
commit
1308691653
8 changed files with 124 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  2. 2
      src/app/plan-audit/wait-examineer/wait-examineer.component.scss
  3. 109
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  4. 1
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  5. 4
      src/app/plan-management/meet-plan/meet-plan.component.html
  6. 7
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
  7. 3
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
  8. 4
      src/app/plan-management/type-plan/type-plan.component.html

46
src/app/plan-audit/wait-examineer/wait-examineer.component.html
Unescape View File

@ -4,22 +4,22 @@
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
<div class="headdiv" style="margin-top: 30px;">
<span>操作类型：</span>
<!-- <input type="radio" name="level" value="1"><span>全部</span>
<input type="radio" name="level" style="margin-left: 50px;" value="2"><span>更新</span>
<input type="radio" name="level" style="margin-left: 50px;" value="3"><span>新增</span>
<input type="radio" name="level" style="margin-left: 50px;" value="4"><span>删除</span> -->
<mat-radio-group name='aaa' [(ngModel)]="level" style="position: relative;bottom: 3px;">
<mat-radio-button class='radio' style="margin-left: 3px;" value="1">全部</mat-radio-button>
<mat-radio-button style="margin-left: 20px;height: 10px;" value="2">更新</mat-radio-button>
<mat-radio-button style="margin-left: 20px;" value="3">新增</mat-radio-button>
<mat-radio-button style="margin-left: 20px;" value="4">删除</mat-radio-button>
</mat-radio-group>
<span style="margin-left: 120px;">共计：80条</span>
<input type="radio" name="level" value="" [(ngModel)]="level"><span>全部</span>
<input type="radio" name="level" style="margin-left: 50px;" value="1" [(ngModel)]="level"><span>更新</span>
<input type="radio" name="level" style="margin-left: 50px;" value="0" [(ngModel)]="level"><span>新增</span>
<input type="radio" name="level" style="margin-left: 50px;" value="2" [(ngModel)]="level"><span>删除</span>
<!-- <mat-radio-group name='aaa' [(ngModel)]="level" style="position: relative;bottom: 3px;">
<mat-radio-button class='radio' style="margin-left: 3px;" value="" >全部</mat-radio-button>
<mat-radio-button style="margin-left: 20px;height: 10px;" value="1">更新</mat-radio-button>
<mat-radio-button style="margin-left: 20px;" value="0">新增</mat-radio-button>
<mat-radio-button style="margin-left: 20px;" value="2">删除</mat-radio-button>
</mat-radio-group> -->
<span style="margin-left: 100px;">共计：{{count}}条</span>
</div>
<div class="headthree">
<span>类型：</span>
<mat-form-field>
<mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="level">
<mat-select placeholder='请选择单位类型' name="unittype" [(ngModel)]="projectlevel">
<mat-option value="1">Ⅰ级预案</mat-option>
<mat-option value="2">Ⅱ级预案</mat-option>
<mat-option value="3">Ⅲ级预案</mat-option>
@ -32,12 +32,12 @@
</mat-form-field>
<span style="margin-left: 30px;">编制级别：</span>
<mat-form-field>
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="projectlevel">
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="PlanLevel">
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
</mat-select>
</mat-form-field>
<button mat-raised-button color="primary" style="margin-left: 40px;" type="submit" >查询</button>
<button mat-raised-button color="primary" style="margin-left: 20px;"><img src="../../../assets/images/refresh.png" (click)='record()' > 刷新</button>
<button mat-raised-button color="primary" style="margin-left: 20px;" (click)='record()'><img src="../../../assets/images/refresh.png" > 刷新</button>
</div>
</form>
@ -54,15 +54,17 @@
</table>
<div class="tbodycss" id="tbodydiv" >
<table cellspacing="0" cellpadding="0" id="table" >
<tr *ngFor="let item of tableDate;let key = index" (click)='tableClick($event,key)'>
<tr *ngFor="let item of tableDate;let key = index" >
<td style="width: 15%;">
<mat-checkbox color="primary" ></mat-checkbox>
{{item.contentType=='3'?'预案':''}}</td>
<td style="width: 15%;" [ngClass]="{'green': item.option == '更新','red':item.option == '删除','blue':item.option == '新增'}">{{item.option}}</td>
<input type="radio" name="yuan" value={{item.id}} [(ngModel)]="checked" (click)='radioClick(item)'>
{{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'?'重点单位':'消防车辆'}}</td>
<td style="width: 15%;" [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 15%;">{{item.verifyOrganizationName}}</td>
<td style="width: 15%;" [ngClass]="{'green': item.unitstate == '已通过','red':item.unitstate == '已拒绝'}">{{item.verifyState}}</td>
<td style="width: 15%;" [ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
'初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}</td>
<td style="width: 15%;">{{item.creatorName}}</td>
<td style="width: 25%;">{{item.verifyTime|date:'yyyy-MM-dd'}}</td>
<td style="width: 25%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
</tr>
</table>
</div>
@ -79,8 +81,8 @@
<button mat-raised-button *ngIf="isallDate" style="background-color: #FFCC00; color: #FFFFFF;" (click)="preview()"><img src="../../../assets/images/change.png" style="margin-bottom: 2px;" > 预览得分</button>
</div>
<div class="rightheadtwo">
<button mat-raised-button style="color: #FFFFFF;background-color: #FF7161;float: right;">拒绝</button>
<button mat-raised-button style="color: #FFFFFF;background-color: #38D984;float: right;">同意</button>
<button mat-raised-button style="color: #FFFFFF;background-color: #FF7161;float: right;" (click)='refuse()'>拒绝</button>
<button mat-raised-button style="color: #FFFFFF;background-color: #38D984;float: right;" (click)='agree()'>同意</button>
</div>
</div>

2
src/app/plan-audit/wait-examineer/wait-examineer.component.scss
Unescape View File

@ -19,7 +19,7 @@
}
span{
font-size: 16px;
//margin-left: 3px;
margin-left: 3px;
}
input{
margin-left: 15px;

109
src/app/plan-audit/wait-examineer/wait-examineer.component.ts
Unescape View File

@ -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(){

1
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
Unescape View File

@ -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

4
src/app/plan-management/meet-plan/meet-plan.component.html
Unescape View File

@ -133,10 +133,10 @@
<th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;">查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 2 || element.auditStatus == 4" [ngClass]="{'grey': element.auditStatus == '2'}">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 4" >提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>
<span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)'> 删除</span>
<span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 删除</span>
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>

7
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
Unescape View File

@ -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
-->
<div style="height: 100%;overflow-y: auto;">
<div class="header" >
@ -133,10 +133,11 @@
<th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;">查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 2 || element.auditStatus == 4" [ngClass]="{'grey': element.auditStatus == '2'}">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 4" [ngClass]="{'grey': element.auditStatus == '2'}">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
<!-- <span style="color: blue;margin-left: 4px;" *ngIf="element.auditStatus == 2">审核通过</span> -->
<span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>
<span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)'> 删除</span>
<span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 删除</span>
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>

3
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
Unescape View File

@ -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)
})
}

4
src/app/plan-management/type-plan/type-plan.component.html
Unescape View File

@ -111,10 +111,10 @@
<th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;">查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 2 || element.auditStatus == 4" [ngClass]="{'grey': element.auditStatus == '2'}">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 4" >提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>
<span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)'> 删除</span>
<span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 删除</span>
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>

Write Preview
Loading…
Cancel
Save