[修改]审批结果初审不显示问题

src/app/plan-management/entry-plan-look/auditresult.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-07 13:58:53
+ * @LastEditTime: 2021-03-06 09:14:55
 -->
 <div style="text-align: center;">
     <span  mat-dialog-title>审批结果</span>
@@ -18,7 +18,7 @@
     <p>初审时间：{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>初审机构：{{data.element.firstAuditorOrganizationName}}</p>
     <p>初审意见：{{data.element.firstAuditOpinion}}</p>
-    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
+    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':data.element.auditStatus==2||4?'初审通过':''}}</p>
     <mat-divider></mat-divider>
     <p>终审时间：{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>终审机构：{{data.element.auditorOrganizationName}}</p>

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

@@ -272,20 +272,23 @@ export class EntryPlanLookComponent implements OnInit {
   }
   //提交审核
   submitAudit(element){
-    // console.log(element)
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
     if(element.auditStatus == 4){
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
       this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config);
     }else{
       if(element.planType == 1){//如果提交审核的是二维预案
         this.http.put(`/api/PlanComponents2D/${element.id}/Commit`,"").subscribe(data=>{
           this.getAllPlanComponents()
+        },err => {
+          this.snackBar.open(err,'确定',config);
         })
       }else{
         this.http.put(`/api/PlanComponents/${element.id}/Commit`,"").subscribe(data=>{
           this.getAllPlanComponents()
+        },err => {
+          this.snackBar.open(err,'确定',config);
         })
       }
     }

src/app/plan-management/meet-plan/meet-plan.component.ts

@@ -143,22 +143,29 @@ export class MeetPlanComponent implements OnInit {
   //提交审核
   submitAudit(element){
     // console.log(element)
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
     if(element.auditStatus == 4){
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
       this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config);
     }else{
       this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{
         this.getAlltabledate()
+      },err => {
+        this.snackBar.open(err,'确定',config);
       })
     }
     
   }
   //撤销审核
   cancelAudit(element){
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
     this.http.put(`/api/PlanComponentsMajor/${element.id}/Cancel`,"").subscribe(data=>{
       this.getAlltabledate()
+    },err => {
+      this.snackBar.open(err,'确定',config);
     })
   }
   

src/app/plan-management/meet-plan/resultmeetPlan.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-20 09:31:24
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-07 13:58:01
+ * @LastEditTime: 2021-03-06 09:03:34
 -->
 <div style="text-align: center;">
     <span  mat-dialog-title>审批结果</span>
@@ -18,7 +18,7 @@
     <p>初审时间：{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>初审机构：{{data.element.firstAuditorOrganizationName}}</p>
     <p>初审意见：{{data.element.firstAuditOpinion}}</p>
-    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
+    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':data.element.auditStatus==2||4?'初审通过':''}}</p>
     <mat-divider></mat-divider>
     <p>终审时间：{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>终审机构：{{data.element.auditorOrganizationName}}</p>

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-02-20 16:34:35
+ * @LastEditTime: 2021-03-06 09:14:22
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -170,7 +170,9 @@ export class OnetwoEntryPlanComponent implements OnInit {
 
   //提交审核
   submitAudit(element){
-    // console.log(element)
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
     if(element.auditStatus == 4){
       const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
@@ -179,14 +181,21 @@ export class OnetwoEntryPlanComponent implements OnInit {
     }else{
       this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{
         this.getAlltabledate()
+      },err => {
+        this.snackBar.open(err,'确定',config);
       })
     }
     
   }
   //撤销审核
   cancelAudit(element){
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
     this.http.put(`/api/PlanComponentsMajor/${element.id}/Cancel`,"").subscribe(data=>{
       this.getAlltabledate()
+    },err => {
+      this.snackBar.open(err,'确定',config);
     })
   }
   //查看预案

src/app/plan-management/onetwo-entry-plan/resultPlanonetwo.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-20 09:31:24
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-07 13:58:29
+ * @LastEditTime: 2021-03-06 09:13:25
 -->
 <div style="text-align: center;">
     <span  mat-dialog-title>审批结果</span>
@@ -18,7 +18,7 @@
     <p>初审时间：{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>初审机构：{{data.element.firstAuditorOrganizationName}}</p>
     <p>初审意见：{{data.element.firstAuditOpinion}}</p>
-    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
+    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':data.element.auditStatus==2||4?'初审通过':''}}</p>
     <mat-divider></mat-divider>
     <p>终审时间：{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>终审机构：{{data.element.auditorOrganizationName}}</p>

src/app/plan-management/type-plan/resulttypePlan.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-20 09:31:24
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-07 13:58:16
+ * @LastEditTime: 2021-03-06 09:11:10
 -->
 <div style="text-align: center;">
     <span  mat-dialog-title>审批结果</span>
@@ -18,7 +18,7 @@
     <p>初审时间：{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>初审机构：{{data.element.firstAuditorOrganizationName}}</p>
     <p>初审意见：{{data.element.firstAuditOpinion}}</p>
-    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':''}}</p>
+    <p>初审结果：{{data.element.auditStatus==16?'待终审':data.element.auditStatus==32?'初审退回':data.element.auditStatus==2||4?'初审通过':''}}</p>
     <mat-divider></mat-divider>
     <p>终审时间：{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>终审机构：{{data.element.auditorOrganizationName}}</p>

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-02-07 16:13:27
+ * @LastEditTime: 2021-03-06 09:12:59
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -154,23 +154,29 @@ export class TypePlanComponent implements OnInit {
   
   //提交审核
   submitAudit(element){
-    // console.log(element)
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
     if(element.auditStatus == 4){
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
       this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config);
     }else{
       this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{
         this.getAlltabledate()
+      },err => {
+        this.snackBar.open(err,'确定',config);
       })
     }
     
   }
   //撤销审核
   cancelAudit(element){
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
     this.http.put(`/api/PlanComponentsMajor/${element.id}/Cancel`,"").subscribe(data=>{
       this.getAlltabledate()
+    },err => {
+      this.snackBar.open(err,'确定',config);
     })
   }
   //查看预案

src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts

@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { ActivatedRoute } from '@angular/router';
 import {EchartsDataService} from '../../echarts-data.service';
+import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { CompangInfoComponent } from '../../compang-info/compang-info.component'
 declare var echarts: any;
 @Component({
   selector: 'app-add-unit-two-type-details',
@@ -10,7 +12,7 @@ declare var echarts: any;
 })
 export class AddUnitTwoTypeDetailsComponent implements OnInit {
 
-  constructor(public route: ActivatedRoute,private router: Router,public echartsData:EchartsDataService) { }
+  constructor(public route: ActivatedRoute,private router: Router,public dialog: MatDialog,public echartsData:EchartsDataService) { }
   forward(){
     this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_type'])
   }
@@ -122,6 +124,12 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit {
       }]
     };
     this.detailPlanEchart.setOption(option);
+    this.detailPlanEchart.on('click', (params) => {
+      //this.router.navigate(['/statisticanalysis/buildingType_one/buildingType_two_reverse'],{queryParams:{'level':params.name}});
+      /* const dialogRef = this.dialog.open(CompangInfoComponent, {
+        width:"400px",
+      }); */
+    });
   }
 
  

src/app/statistic-analysis/compang-info/compang-info.component.ts

@@ -1,13 +1,32 @@
-import { Component, OnInit } from '@angular/core';
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-03-05 15:57:08
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-03-06 08:43:10
+ */
+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'
+import { PageEvent } from '@angular/material/paginator';
+import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
+import { TreeService } from '../../http-interceptors/tree.service'
+declare var CryptoJS
 
 @Component({
   selector: 'app-compang-info',
   templateUrl: './compang-info.component.html',
   styleUrls: ['./compang-info.component.scss']
 })
-export class CompangInfoComponent implements OnInit {
+export class CompangInfoComponent  implements OnInit{
 
-  constructor() { }
+  constructor(private http: HttpClient,public snackBar: MatSnackBar) {}
 
   ngOnInit(): void {
   }