[修改]提交审核按钮显隐修改

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

@@ -350,7 +350,7 @@
                     <td mat-cell *matCellDef="let element" class="operation">
                         <span (click)="unitdetails(element)">查看详情</span>
                         <span style="color: blue;margin-left: 4px;"
-                            *ngIf="element.contentVerify==null||element.contentVerify.verifyState==-1||element.contentVerify.verifyState==1||element.contentVerify.verifyState==2||element.contentVerify.verifyState==4||element.contentVerify.verifyState==5"
+                            *ngIf="(element.isNewData && element.newVerifyState=='未提交审核')||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'))"
                             (click)='submitAudit(element)'>提交审核</span>
                         <span style="color: blue;margin-left: 4px;"
                             *ngIf="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3) "

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

@@ -76,13 +76,13 @@
                 <ng-container matColumnDef="auditstate">
                     <th mat-header-cell *matHeaderCellDef>新增审核</th>
                     <td mat-cell *matCellDef="let element">
-                        {{element.newVerifyState}}
+                        {{element.newVerifyState==null?'':element.newVerifyState}}
                     </td>
                 </ng-container>
                 <ng-container matColumnDef="weihustate">
                     <th mat-header-cell *matHeaderCellDef>维护审核</th>
                     <td mat-cell *matCellDef="let element">
-                        {{element.maintenanceVerifyState}}
+                        {{element.maintenanceVerifyState==null?'':element.maintenanceVerifyState}}
                     </td>
                 </ng-container>
                 <ng-container matColumnDef="isopen">
@@ -106,7 +106,8 @@
                         <span (click)="deletePlan(element)" *ngIf="element.auditStatus==8">删除</span>
                         <span (click)="auditResult(element)">审批结果</span>
                         <span (click)="submitAudit(element)"
-                            *ngIf="element.auditStatus==8">提交审核</span>
+                            *ngIf="(element.isNewData && element.newVerifyState=='未提交审核')||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'))">
+                            提交审核</span>
                         <span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span>
                     </td>
                 </ng-container>

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

@@ -443,6 +443,7 @@ export class EntryPlanLookComponent implements OnInit {
     );
   }
   //获得所有预案组件
+  audit:boolean
   getAllPlanComponents() {
     let pagetype = this.route.snapshot.queryParams.pagetype
     let unitId = this.route.snapshot.queryParams.unitId
@@ -478,6 +479,11 @@ export class EntryPlanLookComponent implements OnInit {
       this.length = data.totalCount
       this.allPlanComponents = data
       this.tabledataSource = data.items
+      /* if(this.tabledataSource.isNewData){
+        this.tabledataSource.auditStatus==8?this.audit=true:false
+      }else{
+        (this.tabledataSource.newVerifyState=='待终审'&&this.tabledataSource.newVerifyState=='审核中'&&this.tabledataSource.maintenanceVerifyState!='未提交审核')?this.audit=false:true
+      } */
     })
   }
   //删除预案

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

@@ -168,7 +168,7 @@
                 <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;" (click)='openPlan(element)'>查看预案</span>
-                  <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span>
+                  <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="(element.isNewData && element.newVerifyState=='未提交审核')||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'))">提交审核</span>
                   <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span>
                   <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
                   <span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>

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

@@ -155,7 +155,7 @@
                 <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;" (click)='openPlan(element)'>查看预案</span>
-                    <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span>
+                    <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="(element.isNewData && element.newVerifyState=='未提交审核')||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'))">提交审核</span>
                     <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span>
                     <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
                     <!-- <span style="color: blue;margin-left: 4px;"  *ngIf="element.auditStatus == 2">审核通过</span> -->

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

@@ -141,7 +141,7 @@
                 <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;" (click)='openPlan(element)'>查看预案</span>
-                  <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span>
+                  <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="(element.isNewData && element.newVerifyState=='未提交审核')||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'))">提交审核</span>
                     <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span>
                     <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
                   <span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>