[修改]待审核页面添加公司名称

src/app/key-unit/key-unit-management/key-unit-management.component.ts

@@ -361,7 +361,7 @@ export class KeyUnitManagementComponent implements OnInit {
       data.items.forEach( (item,index) => {
         item.integrity = this.wanzhengduArr[index]
       })
-      console.log(789,data.items)
+      //console.log(789,data.items)
       this.tabledataSource = new MatTableDataSource(data.items);
     })
   }
@@ -669,7 +669,7 @@ export class KeyUnitManagementComponent implements OnInit {
   }
   //提交审核
   submitAudit(element){
-   console.log(element)
+   //console.log(element)
    let body:any = {
     title:element.name,
     Operation:0,
@@ -679,21 +679,24 @@ export class KeyUnitManagementComponent implements OnInit {
    }
    this.http.post(`/api/ContentVerifies`,body).subscribe(data=>{
     this.getAllKeyUnit()
+  },err=>{
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open(err,'确定',config);
   })
     
   }
   //撤销审核
   cancelAudit(element){
-    let body:any = {
-      //title:element.name,
-      //Operation:0,
-      id:element.contentVerify.id,
-      itemId:element.id,
-      verifyState:-1,
-      contentType:11
-     }
      this.http.delete(`/api/ContentVerifies/${element.contentVerify.id}`).subscribe(data=>{
       this.getAllKeyUnit()
+    },
+    err=>{
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open(err,'确定',config);
     })
   }
   //审核结果
@@ -748,7 +751,6 @@ export class CreateUnit {
     this.jsId = node.id
   }
   onSubmit(value){
-    // console.log(value)
     let myDate = new Date();
     let body = {
       id: "",

src/app/plan-audit/plan-record/plan-record.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-03 13:54:44
+ * @LastEditTime: 2021-03-05 14:49:01
 -->
 <div class="box">
     <div class="boxleft">
@@ -88,7 +88,8 @@
               <table  cellspacing="0" cellpadding="0" style="margin-top: 10px;">
                   <thead>
                       <th style="width: 15%;">类型</th>
-                      <th style="width: 15%;">操作</th>
+                      <th style="width: 15%;">名称</th>
+                      <th style="width: 10%;">操作</th>
                       <th style="width: 15%;">所属组织</th>
                       <th style="width: 15%;">审核状态</th>
                       <th style="width: 15%;">提交人</th>
@@ -102,7 +103,8 @@
                           <!-- <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.title}}</td>
+                        <td style="width: 10%;" [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.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>

src/app/plan-audit/wait-examineer/wait-examineer.component.html

@@ -45,7 +45,8 @@
                 <table  cellspacing="0" cellpadding="0" style="margin-top: 10px;">
                     <thead>
                         <th style="width: 15%;">类型</th>
-                        <th style="width: 15%;">操作</th>
+                        <th style="width: 15%;">名称</th>
+                        <th style="width: 10%;">操作</th>
                         <th style="width: 15%;">所属组织</th>
                         <th style="width: 15%;">审核状态</th>
                         <th style="width: 15%;">提交人</th>
@@ -59,7 +60,8 @@
                             <mat-checkbox color="primary" (change)='radioClick($event,item)'></mat-checkbox>
                             {{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=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}</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.title}}</td>
+                          <td style="width: 10%;" [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.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>

src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@@ -244,16 +244,17 @@ export class EntryPlanLookComponent implements OnInit {
   }
   //删除预案
   deletePlan(plandata){
-
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
     let isTrue = confirm('您确定要删除吗')
     if (isTrue) {
       if(plandata.planType == 1){//如果删除的是二维预案
         this.http.delete(`/api/PlanComponents2D/${plandata.id}`).subscribe(data=>{
-          const config = new MatSnackBarConfig();
-          config.verticalPosition = 'top';
-          config.duration = 3000
           this.snackBar.open('删除成功!','确定',config);
           this.getAllPlanComponents()
+        },err => {
+          this.snackBar.open(err,'确定',config);
         })
       }else{
         this.http.delete(`/api/PlanComponents/${plandata.id}`).subscribe(data=>{
@@ -262,6 +263,8 @@ export class EntryPlanLookComponent implements OnInit {
           config.duration = 3000
           this.snackBar.open('删除成功!','确定',config);
           this.getAllPlanComponents()
+        },err => {
+          this.snackBar.open(err,'确定',config);
         })
       }
     }