[完善]修改预案审核提示bug

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

@@ -570,28 +570,23 @@ export class EntryPlanLookComponent implements OnInit {
     const config = new MatSnackBarConfig();
     config.verticalPosition = 'top';
     config.duration = 3000
-    /*  if(element.auditStatus == 4){
+    if (element.auditStatus == 4 || element.auditStatus == 32) {
       this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!', '确定', config);
-     } */
+    }
     if (element.planType == 1) {//如果提交审核的是二维预案
-      if (element.auditStatus == 8) {
+      if (element.auditStatus == 8 || (element.auditStatus == 2 && !element.isNewData)) {
         this.http.put(`/api/PlanComponents2D/${element.id}/Commit`, "").subscribe(data => {
           this.getAllPlanComponents()
-        }/* ,err => {
-            this.snackBar.open(err,'确定',config);
-          } */)
-      }
-      else {
-        this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!', '确定', config);
+        })
       }
     } else {
       this.http.put(`/api/PlanComponents/${element.id}/Commit`, "").subscribe(data => {
         this.getAllPlanComponents()
       })
     }
+  }
 
   
-  }
   //撤销审核
   cancelAudit(element) {
     if (element.planType == 1) {//如果撤销审核的是二维预案
@@ -601,29 +596,15 @@ export class EntryPlanLookComponent implements OnInit {
     } else {
       this.http.put(`/api/PlanComponents/${element.id}/Cancel`, "").subscribe(data => {
         this.getAllPlanComponents()
-      }/* ,err => {
-        const config = new MatSnackBarConfig();
-        config.verticalPosition = 'top';
-        config.duration = 3000
-        this.snackBar.open(err,'确定',config);
-      } */)
+      })
     }
   }
   //审核结果
   auditResult(element) {
-    // console.log(element)
     const dialogRef = this.dialog.open(AuditResult, {
       width: "395px",
       data: { element: element }
     });
-    dialogRef.afterClosed().subscribe(
-      data => {
-        if (data) {
-
-        }
-      }
-    );
-
   }
 
   //下载↓

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

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

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

@@ -192,12 +192,9 @@ export class OnetwoEntryPlanComponent implements OnInit {
     const config = new MatSnackBarConfig();
     config.verticalPosition = 'top';
     config.duration = 3000
-    /* if(element.auditStatus == 4){
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
+    if (element.auditStatus == 4 || element.auditStatus == 32) {
       this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!', '确定', config);
-    } */
+    }
     this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`, "").subscribe(data => {
       this.getAlltabledate()
     }, err => {

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

@@ -177,9 +177,9 @@ export class TypePlanComponent implements OnInit {
     const config = new MatSnackBarConfig();
     config.verticalPosition = 'top';
     config.duration = 3000
-    /* if(element.auditStatus == 4){
+    if (element.auditStatus == 4 || element.auditStatus == 32) {
       this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!', '确定', config);
-    } */
+    }
     this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`, "").subscribe(data => {
       this.getAlltabledate()
     }, err => {