diff --git a/src/app/interface.ts b/src/app/interface.ts
index df5d7b2..dd3ef79 100644
--- a/src/app/interface.ts
+++ b/src/app/interface.ts
@@ -1,3 +1,11 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-24 10:59:48
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 16:44:22
+ */
 export interface Data {
     token:string,
     refreshToken:string,
@@ -30,12 +38,36 @@ export enum AuditStatusEnum {
     "zero",
     "审核中",
     "审核通过",
-    "",
-    "审核退回",
+    "two",
+    "终审退回",
     "five",
     "six",
     "seven",
-    "未提交审核"
+    "未提交审核",
+    "nine",
+    "ten",
+    "eleven",
+    "twelve",
+    "thieteen",
+    "fourteen",
+    "fifteen",
+    "待终审",
+    "shiqi",
+    "shiba",
+    "shijiu",
+    "ershi",
+    "ershiyi",
+    "ershier",
+    "ershis",
+    "t1",
+    "t2",
+    "t3",
+    "t4",
+    "t5",
+    "t6",
+    "t7",
+    "t8",
+    "初审退回",
 }
 
 export enum PlanLevelEnum {
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html
index fa0d039..ea625a8 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.html
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html
@@ -72,6 +72,17 @@
                         </mat-select>
                     </mat-form-field>
                 </div>
+                <div class="queryField" style="margin-left: 100px;">
+                    <label style="margin-right: 10px;">完整度查询:</label>
+                    <mat-form-field class="example-full-width">
+                        <input type="number" oninput="if(value>1)value=1;if(value<0)value=0"  matInput placeholder="请输入完整度最小值" name="companyName" [(ngModel)]="integrityScoreMin" autocomplete="off">
+                    </mat-form-field>
+                    🠊
+                    <mat-form-field class="example-full-width" style="margin-left: 5px;">
+                        <input type="number" oninput="if(value>1)value=1;if(value<0)value=0"  matInput placeholder="请输入完整度最大值" name="companyName" [(ngModel)]="integrityScoreMax" autocomplete="off">
+                    </mat-form-field>
+                </div>
+                
             </div>
             <div style="width: 100%;text-align: center;">
                 <button mat-raised-button color="primary">查询</button>
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
index eb1b536..03424f3 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
@@ -54,6 +54,8 @@ export class KeyUnitManagementComponent implements OnInit {
   tabledataSource:any
   allorganizations:any
   oldDataSource:any; //原始表格数据
+  integrityScoreMin//下界
+  integrityScoreMax//上界
   //表头排序
   sortData (e) {
     let data = this.tabledataSource.filteredData;
@@ -347,6 +349,8 @@ export class KeyUnitManagementComponent implements OnInit {
       PageSize:  this.pageSizeOptions[0],
       Sort: this.integritySort ? 'integrityscore' : '',
       SortType: this.integritySort || '',
+      IntegrityScoreMin:this.integrityScoreMin||0,
+      IntegrityScoreMax:this.integrityScoreMax||1
     }
     this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
 
@@ -573,7 +577,15 @@ export class KeyUnitManagementComponent implements OnInit {
   onSubmit(value){
     this.PageNumber = 1
     this.pageEvent.pageIndex = 0
-    this.getAllKeyUnit();
+    const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+    if(this.integrityScoreMax<this.integrityScoreMin){
+      this.snackBar.open('最大值不能小于最小值!','确定',config);
+    }else{
+      this.getAllKeyUnit();
+    }
+    
   }
   bigclosediv(e){
     this.isorganizationbox = false
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 8c82e5d..c5f78f0 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-19 14:29:15
+ * @LastEditTime: 2021-01-20 16:35:27
  */
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -175,7 +175,7 @@ export class WaitExamineerComponent implements OnInit {
     this.snackBar.open('审核未通过，请修改后再来审核!','确定',config);
   }
 if(this.chuorzhong==0){
-  this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:4}).subscribe(data=>{
+  this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:32}).subscribe(data=>{
     this.snackBar.open('操作成功!','确定',config);
     this.checked=''
     this.getAlltabledate()
diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html
index 805108f..2518591 100644
--- a/src/app/plan-management/entry-plan-look/AddPlanone.html
+++ b/src/app/plan-management/entry-plan-look/AddPlanone.html
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-13 10:45:42
+ * @LastEditTime: 2021-01-19 16:21:16
 -->
 <form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
     <div class="topbox" style="text-align: center;">
@@ -36,8 +36,8 @@
                   <mat-form-field>
                     <mat-select name="reservePlanType" formControlName="firstCtrlthree"  placeholder='请选择预案级别'  required>
                       <mat-option value='3'>Ⅲ级预案</mat-option>
-                      <mat-option value='4'>Ⅳ级预案</mat-option>
-                      <mat-option value='5'>Ⅴ级预案</mat-option>
+                      <mat-option value='4' *ngIf="levels!='1'&&levels!='2'">Ⅳ级预案</mat-option>
+                      <mat-option value='5' *ngIf="levels!='1'&&levels!='2'">Ⅴ级预案</mat-option>
                     </mat-select>
                   </mat-form-field>
                 </div>
diff --git a/src/app/plan-management/entry-plan-look/auditresult.html b/src/app/plan-management/entry-plan-look/auditresult.html
index 2c61b7e..e393c41 100644
--- a/src/app/plan-management/entry-plan-look/auditresult.html
+++ b/src/app/plan-management/entry-plan-look/auditresult.html
@@ -1,15 +1,29 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-24 10:59:48
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 17:09:15
+-->
 <div style="text-align: center;">
     <span  mat-dialog-title>审批结果</span>
 </div>
 
 <div class="auditDiv">
     <p>预案名称：{{planName}}</p>
-    <p>提交时间：{{commitTime|  date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>提交时间：{{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>发起申请：{{commitOrganizationName }}</p>
     <mat-divider></mat-divider>
-    <p>审批大队：{{auditOrganizationName}}</p>
-    <p>审批结果：{{auditResult | auditsatus}}</p>
-    <p>审批意见：{{auditOpinion}}</p>
+    <p>初审时间：{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>初审机构：{{data.element.firstAuditorName}}</p>
+    <p>初审意见：{{data.element.firstAuditOpinion}}</p>
+    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
+    <mat-divider></mat-divider>
+    <p>终审时间：{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>终审机构：{{data.element.auditorOrganizationName}}</p>
+    <p>终审意见：{{data.element.auditOpinion}}</p>
+    <p>终审结果：{{data.element.auditStatus==2?'终审通过':data.element.auditStatus==4?'终审退回':''}}</p>
 </div>
 
 
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
index a1562de..fdf827c 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html
@@ -1,3 +1,11 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-24 10:59:48
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 08:41:09
+-->
 <!-- <p>录入预案</p> -->
 <div class="header" style="position: relative;">
     <div>
@@ -71,7 +79,6 @@
                     <span (click)="readFile(element)" [ngClass]="{'grey': element.planMode == '1' || element.planMode == '2' || element.planMode == '3'}">下载</span>
                     <span (click)="deletePlan(element)">删除</span>
                     <span (click)="auditResult(element)">审批结果</span>
-
                     <span (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 2 || element.auditStatus == 4"  [ngClass]="{'grey': element.auditStatus == '2'}">提交审核</span>
                     <span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
                 </td>
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 724d4aa..d8267e4 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
@@ -433,7 +433,7 @@ export class AddPlanone {
   
   
   ngOnInit(): void {
-    
+    this.levels=sessionStorage.getItem("level")
     this.firstFormGroup = this._formBuilder.group({
       firstCtrlone: ['', Validators.required],
       firstCtrltwo: ['', Validators.required],
@@ -447,6 +447,7 @@ export class AddPlanone {
   onNoClick(): void {
     this.dialogRef.close();
   }
+  levels//
   isup:boolean = true //上传input框是否显示
   isweb:boolean = false //web输入框是否显示
   isinput:boolean = false //导入是否显示
@@ -810,6 +811,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 4853099..e8a02da 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.html
+++ b/src/app/plan-management/meet-plan/meet-plan.component.html
@@ -119,7 +119,7 @@
             </ng-container>
             <ng-container matColumnDef="passstate">
             <th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':'审核退回'}}</td>
+            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?'审核退回':'待终审'}}</td>
             </ng-container>
             <ng-container matColumnDef="isopen">
               <th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th>
@@ -135,6 +135,7 @@
                   <span  style="color: blue;">查看预案</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)="auditResult(element)">审批结果</span>
                   <span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>
                   <span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 删除</span>
                 </td>
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss
index 6b4385f..e1288e2 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.scss
+++ b/src/app/plan-management/meet-plan/meet-plan.component.scss
@@ -149,4 +149,10 @@
         // margin-left: 160px;
     }
 
+}
+.auditDiv{
+    p{
+        margin: 8px 0;
+        margin-left: 16px;
+    }
 }
\ No newline at end of file
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 875e4e8..c879164 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -278,8 +278,20 @@ export class MeetPlanComponent implements OnInit {
     }
     );
   }
+
+  //审核结果
+  auditResult(element){
+    // console.log(element)
+    const dialogRef = this.dialog.open(meetAuditResult, {
+      width:"400px",
+      //height:"300px",
+      data: {element:element}
+    });
+
+  }
 }
 
+//新建
 @Component({
   selector: 'new-unit',
   templateUrl: './newunit.html',
@@ -508,3 +520,25 @@ export class newunitMeet{
     this.dialogRef.close();
   }
 }
+
+//查看审核结果
+@Component({
+  selector: 'resultmeet',
+  templateUrl: './resultmeetPlan.html',
+  styleUrls: ['./meet-plan.component.scss']
+})
+export class meetAuditResult{
+  constructor(private http: HttpClient,public dialogRef: MatDialogRef<meetAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
+  planName:any = this.data.element.name
+  commitTime:any = this.data.element.committedTime
+  commitOrganizationName:any = this.data.element.committerOrganizationName
+
+  auditOrganizationName:any = this.data.element.auditorOrganizationName
+  auditResult:any = this.data.element.auditStatus
+  auditOpinion:any = this.data.element.auditOpinion
+  ngOnInit(): void {
+  }
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+}
\ No newline at end of file
diff --git a/src/app/plan-management/meet-plan/resultmeetPlan.html b/src/app/plan-management/meet-plan/resultmeetPlan.html
new file mode 100644
index 0000000..82110af
--- /dev/null
+++ b/src/app/plan-management/meet-plan/resultmeetPlan.html
@@ -0,0 +1,32 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-01-20 09:31:24
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 17:09:00
+-->
+<div style="text-align: center;">
+    <span  mat-dialog-title>审批结果</span>
+</div>
+
+<div class="auditDiv">
+    <p>预案名称：{{planName}}</p>
+    <p>提交时间：{{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>发起申请：{{commitOrganizationName }}</p>
+    <mat-divider></mat-divider>
+    <p>初审时间：{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>初审机构：{{data.element.firstAuditorName}}</p>
+    <p>初审意见：{{data.element.firstAuditOpinion}}</p>
+    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
+    <mat-divider></mat-divider>
+    <p>终审时间：{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>终审机构：{{data.element.auditorOrganizationName}}</p>
+    <p>终审意见：{{data.element.auditOpinion}}</p>
+    <p>终审结果：{{data.element.auditStatus==2?'终审通过':data.element.auditStatus==4?'终审退回':''}}</p>
+</div>
+
+
+<div style="text-align: center;margin-top: 18px; ">
+    <button mat-raised-button  (click)="onNoClick()">关闭</button>
+</div>
\ No newline at end of file
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 c62aee1..4ef9cb6 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-19 15:01:55
+ * @LastEditTime: 2021-01-20 09:36:09
 -->
 <div style="height: 100%;overflow-y: auto;">
     <div class="header" >
@@ -119,7 +119,7 @@
             </ng-container>
             <ng-container matColumnDef="passstate">
             <th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':'审核退回'}}</td>
+            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?'审核退回':'待终审'}}</td>
             </ng-container>
             <ng-container matColumnDef="isopen">
               <th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th>
@@ -133,8 +133,9 @@
                 <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 == 4"  [ngClass]="{'grey': element.auditStatus == '2'}">提交审核</span>
+                    <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 "  >提交审核</span>
                     <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
+                    <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</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)' *ngIf="element.auditStatus == 8"> 删除</span>
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
index 06f4edd..b801081 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
@@ -149,4 +149,11 @@
         // margin-left: 160px;
     }
 
+}
+
+.auditDiv{
+    p{
+        margin: 8px 0;
+        margin-left: 16px;
+    }
 }
\ No newline at end of file
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 9b4d3f1..cc6f32e 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,12 +4,13 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-19 14:55:16
+ * @LastEditTime: 2021-01-20 14:28:39
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
 import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
 import { MatPaginator } from '@angular/material/paginator';
+
 import { FlatTreeControl } from '@angular/cdk/tree';
 import { FormControl } from '@angular/forms';
 import { Router,ActivatedRoute } from '@angular/router'
@@ -193,6 +194,17 @@ export class OnetwoEntryPlanComponent implements OnInit {
     }
     );
   }
+
+  //审核结果
+  auditResult(element){
+    // console.log(element)
+    const dialogRef = this.dialog.open(onetwoAuditResult, {
+      width:"400px",
+      //height:"300px",
+      data: {element:element}
+    });
+
+  }
   //下载↓
   selectDownloadFile:any; //选择下载的文件
   download:any; //下载文件元数据
@@ -301,6 +313,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
 
 }
 
+//新建
 @Component({
   selector: 'new-unit',
   templateUrl: './newunit.html',
@@ -526,3 +539,25 @@ export class newunitComponent{
     this.dialogRef.close();
   }
 }
+
+//查看审核结果
+@Component({
+  selector: 'resultonetwo',
+  templateUrl: './resultPlanonetwo.html',
+  styleUrls: ['./onetwo-entry-plan.component.scss']
+})
+export class onetwoAuditResult{
+  constructor(private http: HttpClient,public dialogRef: MatDialogRef<onetwoAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
+  planName:any = this.data.element.name
+  commitTime:any = this.data.element.committedTime
+  commitOrganizationName:any = this.data.element.committerOrganizationName
+
+  auditOrganizationName:any = this.data.element.auditorOrganizationName
+  auditResult:any = this.data.element.auditStatus
+  auditOpinion:any = this.data.element.auditOpinion
+  ngOnInit(): void {
+  }
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+}
\ No newline at end of file
diff --git a/src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html b/src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html
new file mode 100644
index 0000000..1b71f36
--- /dev/null
+++ b/src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html
@@ -0,0 +1,32 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-01-20 09:31:24
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 17:07:50
+-->
+<div style="text-align: center;">
+    <span  mat-dialog-title>审批结果</span>
+</div>
+
+<div class="auditDiv">
+    <p>预案名称：{{planName}}</p>
+    <p>提交时间：{{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>发起申请：{{commitOrganizationName }}</p>
+    <mat-divider></mat-divider>
+    <p>初审时间：{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>初审机构：{{data.element.firstAuditorName}}</p>
+    <p>初审意见：{{data.element.firstAuditOpinion}}</p>
+    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
+    <mat-divider></mat-divider>
+    <p>终审时间：{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>终审机构：{{data.element.auditorOrganizationName}}</p>
+    <p>终审意见：{{data.element.auditOpinion}}</p>
+    <p>终审结果：{{data.element.auditStatus==2?'终审通过':data.element.auditStatus==4?'终审退回':''}}</p>
+</div>
+
+
+<div style="text-align: center;margin-top: 18px; ">
+    <button mat-raised-button  (click)="onNoClick()">关闭</button>
+</div>
\ No newline at end of file
diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts
index 3c10cd0..0cadd06 100644
--- a/src/app/plan-management/plan-management.module.ts
+++ b/src/app/plan-management/plan-management.module.ts
@@ -57,12 +57,15 @@ import { newunitMeet }from './meet-plan/meet-plan.component';
 import { TypePlanComponent } from './type-plan/type-plan.component';
 import { newunitType }from './type-plan/type-plan.component';
 import { PsViewer } from './entry-plan-look/entry-plan-look.component'
+import { onetwoAuditResult } from './onetwo-entry-plan/onetwo-entry-plan.component';
+import { meetAuditResult }from './meet-plan/meet-plan.component';
+import { typeAuditResult } from './type-plan/type-plan.component'
 
 
 
 @NgModule({
   declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent,AddPlanone,PlanType,AuditSatus,PlanLevel,DownloadFile,AuditResult,ChangeName, 
-    WebLookComponent, OnetwoEntryPlanComponent,newunitComponent, MeetPlanComponent,newunitMeet, TypePlanComponent,newunitType,PsViewer],
+    WebLookComponent, OnetwoEntryPlanComponent,newunitComponent, MeetPlanComponent,newunitMeet, TypePlanComponent,newunitType,PsViewer,onetwoAuditResult,meetAuditResult,typeAuditResult],
   imports: [
     CommonModule,
     PlanManagementRoutingModule,
diff --git a/src/app/plan-management/type-plan/resulttypePlan.html b/src/app/plan-management/type-plan/resulttypePlan.html
new file mode 100644
index 0000000..94fbc01
--- /dev/null
+++ b/src/app/plan-management/type-plan/resulttypePlan.html
@@ -0,0 +1,32 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-01-20 09:31:24
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-01-20 17:08:43
+-->
+<div style="text-align: center;">
+    <span  mat-dialog-title>审批结果</span>
+</div>
+
+<div class="auditDiv">
+    <p>预案名称：{{planName}}</p>
+    <p>提交时间：{{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>发起申请：{{commitOrganizationName }}</p>
+    <mat-divider></mat-divider>
+    <p>初审时间：{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>初审机构：{{data.element.firstAuditorName}}</p>
+    <p>初审意见：{{data.element.firstAuditOpinion}}</p>
+    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
+    <mat-divider></mat-divider>
+    <p>终审时间：{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+    <p>终审机构：{{data.element.auditorOrganizationName}}</p>
+    <p>终审意见：{{data.element.auditOpinion}}</p>
+    <p>终审结果：{{data.element.auditStatus==2?'终审通过':data.element.auditStatus==4?'终审退回':''}}</p>
+</div>
+
+
+<div style="text-align: center;margin-top: 18px; ">
+    <button mat-raised-button  (click)="onNoClick()">关闭</button>
+</div>
\ No newline at end of file
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 c6acccc..652f247 100644
--- a/src/app/plan-management/type-plan/type-plan.component.html
+++ b/src/app/plan-management/type-plan/type-plan.component.html
@@ -97,7 +97,7 @@
             </ng-container>
             <ng-container matColumnDef="passstate">
             <th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th>
-            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':'审核退回'}}</td>
+            <td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?'审核退回':'待终审'}}</td>
             </ng-container>
             <ng-container matColumnDef="isopen">
               <th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th>
@@ -111,8 +111,9 @@
                 <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 == 4"  >提交审核</span>
+                  <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 "  >提交审核</span>
                     <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
+                    <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
                   <span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>
                   <span style="color: red;margin-left: 4px" (click)='deletePlan(element.id)' *ngIf="element.auditStatus == 8"> 删除</span>
                 </td>
diff --git a/src/app/plan-management/type-plan/type-plan.component.scss b/src/app/plan-management/type-plan/type-plan.component.scss
index 71cadc2..43059ae 100644
--- a/src/app/plan-management/type-plan/type-plan.component.scss
+++ b/src/app/plan-management/type-plan/type-plan.component.scss
@@ -149,4 +149,10 @@
         // margin-left: 160px;
     }
 
+}
+.auditDiv{
+    p{
+        margin: 8px 0;
+        margin-left: 16px;
+    }
 }
\ No newline at end of file
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 623917f..b658d26 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-15 15:15:49
+ * @LastEditTime: 2021-01-20 15:03:08
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -179,6 +179,16 @@ export class TypePlanComponent implements OnInit {
     }
     );
     
+  }
+  //审核结果
+  auditResult(element){
+    // console.log(element)
+    const dialogRef = this.dialog.open(typeAuditResult, {
+      width:"400px",
+      //height:"300px",
+      data: {element:element}
+    });
+
   }
 
   //下载↓
@@ -282,6 +292,7 @@ export class TypePlanComponent implements OnInit {
 
 }
 
+//新建
 @Component({
   selector: 'new-unit',
   templateUrl: './newunit.html',
@@ -500,3 +511,25 @@ export class newunitType{
     this.dialogRef.close();
   }
 }
+
+//查看审核结果
+@Component({
+  selector: 'resultmeet',
+  templateUrl: './resulttypePlan.html',
+  styleUrls: ['./type-plan.component.scss']
+})
+export class typeAuditResult{
+  constructor(private http: HttpClient,public dialogRef: MatDialogRef<typeAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
+  planName:any = this.data.element.name
+  commitTime:any = this.data.element.committedTime
+  commitOrganizationName:any = this.data.element.committerOrganizationName
+
+  auditOrganizationName:any = this.data.element.auditorOrganizationName
+  auditResult:any = this.data.element.auditStatus
+  auditOpinion:any = this.data.element.auditOpinion
+  ngOnInit(): void {
+  }
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
+}