驳回说明, 审批状态

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)
       })
     })

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)
       })
     })

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>

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>

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>

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>