From 380933769a105b5dc98cdf5ab6c24bf53b0c0d21 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 18 May 2022 16:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E8=AF=B4=E6=98=8E,=20?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/audit/audit-ing/audit-ing.component.ts         | 4 ++++
 src/app/pages/audit/audit-record/audit-record.component.ts   | 4 ++++
 .../details-file-category.component.html                     | 5 +++--
 .../pages/license/file-category/file-category.component.html | 2 +-
 .../details-update-category.component.html                   | 5 +++--
 .../license/update-category/update-category.component.html   | 2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.ts b/src/app/pages/audit/audit-ing/audit-ing.component.ts
index 1a29b58..3d57d8d 100644
--- a/src/app/pages/audit/audit-ing/audit-ing.component.ts
+++ b/src/app/pages/audit/audit-ing/audit-ing.component.ts
@@ -188,6 +188,10 @@ export class AuditIngComponent implements OnInit {
     return new Promise((resolve, reject) => {
       let params = { id: item.itemId }
       this.http.get(url, { params }).subscribe((data: any) => {
+        let auditLog = { rejectReason: item.rejectReason }
+        if (item.auditType == 1 && item.rejectReason) {
+          data.result.auditLog = auditLog
+        }
         resolve(data.result)
       })
     })
diff --git a/src/app/pages/audit/audit-record/audit-record.component.ts b/src/app/pages/audit/audit-record/audit-record.component.ts
index 74a9f46..9826955 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.ts
+++ b/src/app/pages/audit/audit-record/audit-record.component.ts
@@ -241,6 +241,10 @@ export class AuditRecordComponent implements OnInit {
     return new Promise((resolve, reject) => {
       let params = { id: item.itemId }
       this.http.get(url, { params }).subscribe((data: any) => {
+        let auditLog = { rejectReason: item.rejectReason }
+        if (item.auditType == 1 && item.rejectReason) {
+          data.result.auditLog = auditLog
+        }
         resolve(data.result)
       })
     })
diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
index c44bbdd..08f809e 100644
--- a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
+++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
@@ -32,8 +32,9 @@
         </p>
         <nz-timeline>
             <nz-timeline-item *ngFor="let item of auditList">
-                <span style="margin-right: 12px;">{{item.creationTime | date:"yyyy/MM/dd"}}</span>
-                <span>{{item.auditStatus | auditStatus}}</span>
+                <span>{{item.creationTime | date:"yyyy/MM/dd"}}</span>
+                <span style="margin: 0 10px;">{{item.auditStatus | auditStatus}}</span>
+                <span *ngIf="item.auditStatus == 3">驳回说明：{{item.auditLog? item.auditLog.rejectReason : ''}}</span>
             </nz-timeline-item>
         </nz-timeline>
         <ng-template #soccerTemplate>
diff --git a/src/app/pages/license/file-category/file-category.component.html b/src/app/pages/license/file-category/file-category.component.html
index a279810..376fd49 100644
--- a/src/app/pages/license/file-category/file-category.component.html
+++ b/src/app/pages/license/file-category/file-category.component.html
@@ -31,7 +31,7 @@
                     </td>
                     <td>{{item.committedTime | date:"yyyy/MM/dd"}}<span *ngIf="!item.committedTime">未提交审核</span></td>
                     <td>
-                        <span>{{item.auditStatus | auditStatus}}</span>
+                        <span *ngIf="item.auditLog">{{item.auditLog.auditStatusDesc || ''}}</span>
                     </td>
                     <td class="operation">
                         <span class="blueColor" (click)="edit(item)">编辑</span>
diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
index 7ac2a22..a1bd1a5 100644
--- a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
+++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
@@ -38,8 +38,9 @@
         </p>
         <nz-timeline>
             <nz-timeline-item *ngFor="let item of auditList">
-                <span style="margin-right: 12px;">{{item.creationTime | date:"yyyy/MM/dd"}}</span>
-                <span>{{item.auditStatus | auditStatus}}</span>
+                <span>{{item.creationTime | date:"yyyy/MM/dd"}}</span>
+                <span style="margin: 0 10px;">{{item.auditStatus | auditStatus}}</span>
+                <span *ngIf="item.auditStatus == 3">驳回说明：{{item.auditLog? item.auditLog.rejectReason : ''}}</span>
             </nz-timeline-item>
         </nz-timeline>
         <ng-template #soccerTemplate>
diff --git a/src/app/pages/license/update-category/update-category.component.html b/src/app/pages/license/update-category/update-category.component.html
index b205c16..e3c3c23 100644
--- a/src/app/pages/license/update-category/update-category.component.html
+++ b/src/app/pages/license/update-category/update-category.component.html
@@ -44,7 +44,7 @@
                     <!-- <td><span *ngIf="item.isYearlyCheck">是</span><span *ngIf="!item.isYearlyCheck">否</span></td> -->
                     <td>{{item.committedTime | date:"yyyy/MM/dd"}}<span *ngIf="!item.committedTime">未提交审核</span></td>
                     <td>
-                        <span>{{item.auditStatus | auditStatus}}</span>
+                        <span *ngIf="item.auditLog">{{item.auditLog.auditStatusDesc || ''}}</span>
                     </td>
                     <td>
                         <span *ngIf="item.licenseViolationType == 0">无</span>