diff --git a/proxy.config.json b/proxy.config.json
index 8129e12..e61e510 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,6 +1,6 @@
{
"/api": {
- "target": "http://121.36.37.70:8201/",
+ "target": "http://10.81.73.39:8000/",
"生产": "http://10.81.73.39:8000/",
"测试": "http://121.36.37.70:8201/",
"生产2": "http://183.194.244.232:8088/",
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
index 504a8d0..a9ea096 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -101,7 +101,11 @@
[ngClass]="{'green': item.operation == '0','red':item.operation == '2','yellow':item.operation == '1'}">
{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 20%;">{{item.organizationName}}</td>
- <td style="width: 10%;">
+ <td style="width: 10%;"
+ [ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">
+ {{item.verifyState=='0'?'待初审':item.verifyState=='1'?
+ '初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}
+ <!-- <td style="width: 10%;">
<span
*ngIf="item.verifyState=='0' && (item.contentType == 3 || item.contentType == 4 || item.contentType == 5) && item.itemObj.isFollowed">待初审</span>
<span
@@ -110,7 +114,7 @@
<span class="red" *ngIf="item.verifyState=='2'">初审驳回</span>
<span *ngIf="item.verifyState=='3'">待终审</span>
<span class="green" *ngIf="item.verifyState=='4'">终审通过</span>
- <span class="red" *ngIf="item.verifyState=='5'">终审驳回</span>
+ <span class="red" *ngIf="item.verifyState=='5'">终审驳回</span> -->
</td>
<td style="width: 7%;">{{item.creatorName}}</td>
<td style="width: 13%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
diff --git a/src/app/plan-management/entry-plan-look/auditresult.html b/src/app/plan-management/entry-plan-look/auditresult.html
index f71fe5d..3f6a7e9 100644
--- a/src/app/plan-management/entry-plan-look/auditresult.html
+++ b/src/app/plan-management/entry-plan-look/auditresult.html
@@ -1,11 +1,3 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: sueRimn
- * @Date: 2020-12-24 10:59:48
- * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-16 14:34:07
--->
<div style="text-align: center;">
<span mat-dialog-title>审批结果</span>
</div>
@@ -15,7 +7,7 @@
<p>提交时间：{{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
<p>发起申请：{{commitOrganizationName }}</p>
<mat-divider></mat-divider>
- <p>
+ <!-- <p>
<ng-container *ngIf="data.element.plan.company.isFollowed; else elseTemplate">初审</ng-container>
<ng-template #elseTemplate>终审</ng-template>时间：{{data.element.firstAudittedTime| date:'yyyy-MM-dd HH:mm:ss'}}
</p>
@@ -46,7 +38,17 @@
<p>终审意见：{{data.element.auditOpinion}}</p>
<p>终审结果：{{data.element.auditStatus==2?'终审通过':data.element.auditStatus==4?'终审退回':''}}</p>
</ng-container>
-
+ -->
+ <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?'初审退回':data.element.auditStatus==2||data.element.auditStatus==4?'初审通过':''}}
+ </p>
+ <mat-divider></mat-divider>
+ <p>终审时间：{{data.element.audittedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
+ <p>终审机构：{{data.element.auditorOrganizationName}}</p>
+ <p>终审意见：{{data.element.auditOpinion}}</p>
+ <p>终审结果：{{data.element.auditStatus==2?'终审通过':data.element.auditStatus==4?'终审退回':''}}</p>
</div>