From 82cb2bdb42c00a716e3892184fe6abddf31074e1 Mon Sep 17 00:00:00 2001
From: chenjingyu <bobsun@hotmail.com>
Date: Thu, 25 Mar 2021 16:38:41 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=8F=90=E4=BA=A4=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=8C=89=E9=92=AE=E9=9A=90=E8=97=8F=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../key-unit-management.component.html        |  3 ++-
 .../entry-plan-look.component.ts              | 21 ++++++++++++-------
 .../meet-plan/meet-plan.component.html        |  3 ++-
 .../meet-plan/meet-plan.component.ts          |  6 +++---
 .../onetwo-entry-plan.component.html          |  5 +++--
 .../onetwo-entry-plan.component.ts            |  8 +++----
 .../pass-plan/pass-plan.component.html        |  3 ++-
 .../type-plan/type-plan.component.html        |  3 ++-
 .../type-plan/type-plan.component.ts          |  8 +++----
 9 files changed, 35 insertions(+), 25 deletions(-)

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 6a62535..ffb8368 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
@@ -81,7 +81,8 @@
                     <mat-form-field class="example-full-width">
                         <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最小值" name="integrityScoreMin" [(ngModel)]="integrityScoreMin" autocomplete="off">
                     </mat-form-field>
-                    <mat-icon aria-hidden="false" style="position: relative;right: 125px;top: 5px;">arrow forward</mat-icon>
+                    🠚
+                    <!-- <mat-icon aria-hidden="false" style="width: 5px;padding: 0;margin:0">arrow forward</mat-icon> -->
                     <mat-form-field class="example-full-width" style="margin-left: 5px;">
                         <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最大值" name="integrityScoreMax" [(ngModel)]="integrityScoreMax" autocomplete="off">
                     </mat-form-field>
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 21a58c6..5bc72a0 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
@@ -277,15 +277,20 @@ export class EntryPlanLookComponent implements OnInit {
     const config = new MatSnackBarConfig();
     config.verticalPosition = 'top';
     config.duration = 3000
-    if(element.auditStatus == 4){
+   /*  if(element.auditStatus == 4){
       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);
-        })
+        if(element.auditStatus ==8){
+          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()
@@ -293,7 +298,7 @@ export class EntryPlanLookComponent implements OnInit {
           this.snackBar.open(err,'确定',config);
         })
       }
-    }
+    
     
   }
   //撤销审核
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 cbbcb42..280d8e3 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.html
+++ b/src/app/plan-management/meet-plan/meet-plan.component.html
@@ -33,7 +33,8 @@
             <mat-form-field class="example-full-width">
               <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
             </mat-form-field>
-            <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
+            <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
+            <span style="margin-left: 15px;">🠊</span>
             <mat-form-field class="example-full-width" style="margin-left: 10px;">
               <input type="date" matInput name="endtime" autocomplete="off" [(ngModel)]="endtime">
             </mat-form-field>
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 9923850..10d1ec2 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -160,15 +160,15 @@ export class MeetPlanComponent implements OnInit {
     const config = new MatSnackBarConfig();
     config.verticalPosition = 'top';
     config.duration = 3000
-    if(element.auditStatus == 4){
+    /* if(element.auditStatus == 4){
       this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config);
-    }else{
+    } */
       this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{
         this.getAlltabledate()
       },err => {
         this.snackBar.open(err,'确定',config);
       })
-    }
+    
     
   }
   //撤销审核
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 e2b1644..927c709 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-03-25 14:24:32
+ * @LastEditTime: 2021-03-25 16:33:38
 -->
 <div style="height: 100%;overflow-y: auto;">
     <div class="header" >
@@ -30,7 +30,8 @@
             <mat-form-field class="example-full-width">
               <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
             </mat-form-field>
-            <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
+            <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
+            <span style="margin-left: 15px;">🠊</span>
             <mat-form-field class="example-full-width" style="margin-left: 10px;">
               <input type="date" matInput name="endtime"  autocomplete="off"  [(ngModel)]="endtime">
             </mat-form-field>
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 7ef7919..ff859ed 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,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-25 14:25:00
+ * @LastEditTime: 2021-03-25 15:16:17
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -186,18 +186,18 @@ export class OnetwoEntryPlanComponent implements OnInit {
     const config = new MatSnackBarConfig();
     config.verticalPosition = 'top';
     config.duration = 3000
-    if(element.auditStatus == 4){
+    /* 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);
       })
-    }
+    
     
   }
   //撤销审核
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html
index 0e980c5..eb4f771 100644
--- a/src/app/plan-management/pass-plan/pass-plan.component.html
+++ b/src/app/plan-management/pass-plan/pass-plan.component.html
@@ -81,7 +81,8 @@
           <mat-form-field class="example-full-width">
             <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
           </mat-form-field>
-          <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
+          <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
+          <span style="margin-left: 15px;">🠊</span>
           <mat-form-field class="example-full-width" style="margin-left: 10px;">
             <input type="date" matInput name="endtime"  autocomplete="off"  [(ngModel)]="endtime">
           </mat-form-field>
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 17aa0d7..6d27121 100644
--- a/src/app/plan-management/type-plan/type-plan.component.html
+++ b/src/app/plan-management/type-plan/type-plan.component.html
@@ -23,7 +23,8 @@
             <mat-form-field class="example-full-width">
               <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
             </mat-form-field>
-            <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
+            <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
+            <span style="margin-left: 15px;">🠊</span>
             <mat-form-field class="example-full-width" style="margin-left: 10px;">
               <input type="date" matInput  autocomplete="off" name="endtime" [(ngModel)]="endtime">
             </mat-form-field>
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 ab0ed90..5765e5b 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-03-25 14:22:15
+ * @LastEditTime: 2021-03-25 15:16:56
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -170,15 +170,15 @@ export class TypePlanComponent implements OnInit {
     const config = new MatSnackBarConfig();
     config.verticalPosition = 'top';
     config.duration = 3000
-    if(element.auditStatus == 4){
+    /* if(element.auditStatus == 4){
       this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config);
-    }else{
+    } */
       this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{
         this.getAlltabledate()
       },err => {
         this.snackBar.open(err,'确定',config);
       })
-    }
+    
     
   }
   //撤销审核