From b1c382b51d44a22997a43dd49e9e7a071371e533 Mon Sep 17 00:00:00 2001
From: Sjh <55341701@qq.com>
Date: Thu, 2 Nov 2023 12:00:20 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=A2=84=E6=A1=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entry-plan-look/auditresult.html          | 44 ++++++++++++++-----
 .../entry-plan-look.component.ts              |  4 +-
 src/index.html                                |  8 ++--
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/app/plan-management/entry-plan-look/auditresult.html b/src/app/plan-management/entry-plan-look/auditresult.html
index f1ce80d..f71fe5d 100644
--- a/src/app/plan-management/entry-plan-look/auditresult.html
+++ b/src/app/plan-management/entry-plan-look/auditresult.html
@@ -7,7 +7,7 @@
  * @LastEditTime: 2021-03-16 14:34:07
 -->
 <div style="text-align: center;">
-    <span  mat-dialog-title>审批结果</span>
+    <span mat-dialog-title>审批结果</span>
 </div>
 
 <div class="auditDiv">
@@ -15,15 +15,39 @@
     <p>提交时间：{{data.element.committedTime| date:'yyyy-MM-dd HH:mm:ss'}}</p>
     <p>发起申请：{{commitOrganizationName }}</p>
     <mat-divider></mat-divider>
-    <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>
+    <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>
+    <p>
+        <ng-container *ngIf="data.element.plan.company.isFollowed; else elseTemplate">初审</ng-container>
+        <ng-template #elseTemplate>终审</ng-template>机构：{{data.element.firstAuditorOrganizationName}}
+    </p>
+    <p>
+        <ng-container *ngIf="data.element.plan.company.isFollowed; else elseTemplate">初审</ng-container>
+        <ng-template #elseTemplate>终审</ng-template>意见：{{data.element.firstAuditOpinion}}
+    </p>
+    <p>
+        <ng-container *ngIf="data.element.plan.company.isFollowed; else elseTemplate">初审</ng-container>
+        <ng-template #elseTemplate>终审</ng-template>结果：
+        <ng-container *ngIf="data.element.auditStatus==16">待终审</ng-container>
+        <ng-container *ngIf="data.element.auditStatus==32">
+            <ng-container *ngIf="data.element.plan.company.isFollowed; else elseTemplate">初审</ng-container>
+            <ng-template #elseTemplate>终审</ng-template>退回</ng-container>
+        <ng-container *ngIf="data.element.auditStatus==2 ||data.element.auditStatus==4">
+            <ng-container *ngIf="data.element.plan.company.isFollowed; else elseTemplate">初审</ng-container>
+            <ng-template #elseTemplate>终审</ng-template>通过</ng-container>
+    </p>
+
+    <ng-container *ngIf="data.element.plan.company.isFollowed">
+        <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>
+    </ng-container>
+
+
 </div>
 
 
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 e8f49b5..92f2a10 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
@@ -1901,7 +1901,9 @@ export class AuditResult {
   auditOrganizationName: any = this.data.element.auditorOrganizationName;
   auditResult: any = this.data.element.auditStatus;
   auditOpinion: any = this.data.element.auditOpinion;
-  ngOnInit(): void {}
+  ngOnInit(): void {
+    console.log( this.data.element)
+  }
   onNoClick(): void {
     this.dialogRef.close();
   }
diff --git a/src/index.html b/src/index.html
index 93a46ec..e709411 100644
--- a/src/index.html
+++ b/src/index.html
@@ -19,17 +19,17 @@
 
 <!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> -->
 
-<!-- <script type="text/javascript">
+<script type="text/javascript">
   window._AMapSecurityConfig = {
     securityJsCode: '0afa0b144398727fad2ca06f5f7156b3'
   }
 </script>
-<script
+<!-- <script
   src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
 <script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
-<!-- <script
+<script
   src="https://webapi.amap.com/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->
+<script src="https://webapi.amap.com/ui/1.1/main.js"></script>
 <script src="/assets/html2canvas.js"></script>
 <script type="text/javascript" src="/assets/wordexport/jquery.js"></script>
 <script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>