Browse Source

[新增]采集页面增加审批意见提示

zhuzhou
邵佳豪 4 years ago
parent
commit
16ee42f9f2
  1. 4
      src/app/data-collection/fire-force/fire-force.component.html
  2. 4
      src/app/data-collection/linkage-forces/linkage-forces.component.html
  3. 4
      src/app/data-collection/water-collection/water-collection.component.html
  4. 5
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts

4
src/app/data-collection/fire-force/fire-force.component.html

@ -147,8 +147,8 @@
<span *ngIf="selectedFireForce.contentVerify.operation == 0" >新增</span> <span *ngIf="selectedFireForce.contentVerify.operation == 0" >新增</span>
<span *ngIf="selectedFireForce.contentVerify.operation == 1" >更新</span> <span *ngIf="selectedFireForce.contentVerify.operation == 1" >更新</span>
待审核)</span> 待审核)</span>
<span class="state" style="color: rgb(92, 214, 78);" *ngIf="selectedFireForce.contentVerify && selectedFireForce.contentVerify.verifyState == 4">(审核通过)</span> <span [matTooltip]="selectedFireForce.contentVerify.remark" class="state" style="color: rgb(92, 214, 78);" *ngIf="selectedFireForce.contentVerify && selectedFireForce.contentVerify.verifyState == 4">(审核通过)</span>
<span class="state" *ngIf="selectedFireForce.contentVerify && selectedFireForce.contentVerify.verifyState == 5">(审核驳回)</span> <span [matTooltip]="selectedFireForce.contentVerify.remark" class="state" *ngIf="selectedFireForce.contentVerify && selectedFireForce.contentVerify.verifyState == 5">(审核驳回)</span>
<span class="submitAudit" *ngIf="!selectedFireForce.contentVerify || selectedFireForce.contentVerify.verifyState == 5 || selectedFireForce.contentVerify.verifyState == 4" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span> <span class="submitAudit" *ngIf="!selectedFireForce.contentVerify || selectedFireForce.contentVerify.verifyState == 5 || selectedFireForce.contentVerify.verifyState == 4" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span>
<span class="state" *ngIf="selectedFireForce.contentVerify && selectedFireForce.contentVerify.verifyState == 3" (click)="cancelAudit()">撤销审核</span> <span class="state" *ngIf="selectedFireForce.contentVerify && selectedFireForce.contentVerify.verifyState == 3" (click)="cancelAudit()">撤销审核</span>

4
src/app/data-collection/linkage-forces/linkage-forces.component.html

@ -122,8 +122,8 @@
<span *ngIf="LinkageForceDetailInfo.contentVerify.operation == 0" >新增</span> <span *ngIf="LinkageForceDetailInfo.contentVerify.operation == 0" >新增</span>
<span *ngIf="LinkageForceDetailInfo.contentVerify.operation == 1" >更新</span> <span *ngIf="LinkageForceDetailInfo.contentVerify.operation == 1" >更新</span>
待审核)</span> 待审核)</span>
<span class="state" style="color: rgb(92, 214, 78);" *ngIf="LinkageForceDetailInfo.contentVerify && LinkageForceDetailInfo.contentVerify.verifyState == 4">(审核通过)</span> <span [matTooltip]="LinkageForceDetailInfo.contentVerify.remark" class="state" style="color: rgb(92, 214, 78);" *ngIf="LinkageForceDetailInfo.contentVerify && LinkageForceDetailInfo.contentVerify.verifyState == 4">(审核通过)</span>
<span class="state" *ngIf="LinkageForceDetailInfo.contentVerify && LinkageForceDetailInfo.contentVerify.verifyState == 5">(审核驳回)</span> <span [matTooltip]="LinkageForceDetailInfo.contentVerify.remark" class="state" *ngIf="LinkageForceDetailInfo.contentVerify && LinkageForceDetailInfo.contentVerify.verifyState == 5">(审核驳回)</span>
<span class="submitAudit" *ngIf="!LinkageForceDetailInfo.contentVerify || LinkageForceDetailInfo.contentVerify.verifyState == 5 || LinkageForceDetailInfo.contentVerify.verifyState == 4" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span> <span class="submitAudit" *ngIf="!LinkageForceDetailInfo.contentVerify || LinkageForceDetailInfo.contentVerify.verifyState == 5 || LinkageForceDetailInfo.contentVerify.verifyState == 4" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span>
<span class="state" *ngIf="LinkageForceDetailInfo.contentVerify && LinkageForceDetailInfo.contentVerify.verifyState == 3" (click)="cancelAudit()">撤销审核</span> <span class="state" *ngIf="LinkageForceDetailInfo.contentVerify && LinkageForceDetailInfo.contentVerify.verifyState == 3" (click)="cancelAudit()">撤销审核</span>

4
src/app/data-collection/water-collection/water-collection.component.html

@ -84,8 +84,8 @@
<span *ngIf="waterData.contentVerify.operation == 0" >新增</span> <span *ngIf="waterData.contentVerify.operation == 0" >新增</span>
<span *ngIf="waterData.contentVerify.operation == 1" >更新</span> <span *ngIf="waterData.contentVerify.operation == 1" >更新</span>
待审核)</span> 待审核)</span>
<span class="state" style="color: rgb(92, 214, 78);" *ngIf="waterData.contentVerify && waterData.contentVerify.verifyState == 4">(审核通过)</span> <span [matTooltip]="waterData.contentVerify.remark" class="state" style="color: rgb(92, 214, 78);" *ngIf="waterData.contentVerify && waterData.contentVerify.verifyState == 4">(审核通过)</span>
<span class="state" *ngIf="waterData.contentVerify && waterData.contentVerify.verifyState == 5">(审核驳回)</span> <span [matTooltip]="waterData.contentVerify.remark" class="state" *ngIf="waterData.contentVerify && waterData.contentVerify.verifyState == 5">(审核驳回)</span>
<span class="submitAudit" *ngIf="!waterData.contentVerify || waterData.contentVerify.verifyState == 5 || waterData.contentVerify.verifyState == 4" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span> <span class="submitAudit" *ngIf="!waterData.contentVerify || waterData.contentVerify.verifyState == 5 || waterData.contentVerify.verifyState == 4" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span>
<span class="state" *ngIf="waterData.contentVerify && waterData.contentVerify.verifyState == 3" (click)="cancelAudit()">撤销审核</span> <span class="state" *ngIf="waterData.contentVerify && waterData.contentVerify.verifyState == 3" (click)="cancelAudit()">撤销审核</span>

5
src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@ -686,7 +686,6 @@ export class remark{
title:this.shenheTable[0].title title:this.shenheTable[0].title
} }
this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{ this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
//this.showtype = -1
this.snackBar.open('操作成功!','确定',config); this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close() this.dialogRef.close()
}) })
@ -696,13 +695,11 @@ export class remark{
this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:32}).subscribe(data=>{ this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:32}).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config); this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close() this.dialogRef.close()
//this.getAlltabledate()
}) })
}else if(this.shenheTable[0].verifyState==3){ }else if(this.shenheTable[0].verifyState==3){
this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{ this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config); this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close() this.dialogRef.close()
//this.getAlltabledate()
}) })
} }
} }
@ -723,7 +720,6 @@ export class remark{
this.http.put(`/api/ContentVerifies/Batch`,this.companyrefuseList).subscribe(data=>{ this.http.put(`/api/ContentVerifies/Batch`,this.companyrefuseList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config); this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close() this.dialogRef.close()
//this.getAlltabledate()
}) })
}else{ }else{
for(var i=0;i<this.shenheTable.length;i++){ for(var i=0;i<this.shenheTable.length;i++){
@ -737,7 +733,6 @@ export class remark{
this.http.put(`/api/PlanAudits/Batch`,this.refuseList).subscribe(data=>{ this.http.put(`/api/PlanAudits/Batch`,this.refuseList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config); this.snackBar.open('操作成功!','确定',config);
this.dialogRef.close() this.dialogRef.close()
//this.getAlltabledate()
}) })
} }
this.shenheTable=[] this.shenheTable=[]

Loading…
Cancel
Save