From 1302165626fff5fbbf2c053edba796a8d29d06fd Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 2 Aug 2022 16:02:53 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E7=94=B3=E8=AF=89=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appeal-details/appeal-details.component.html      |  3 +++
 .../get-out-of-line-details.component.html            | 11 +++++++----
 .../get-out-of-line-details.component.ts              |  3 +++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/audit/audit-ing/appeal-details/appeal-details.component.html b/src/app/pages/audit/audit-ing/appeal-details/appeal-details.component.html
index 4c80788..8b7b2b4 100644
--- a/src/app/pages/audit/audit-ing/appeal-details/appeal-details.component.html
+++ b/src/app/pages/audit/audit-ing/appeal-details/appeal-details.component.html
@@ -7,6 +7,9 @@
     </div>
 
     <div class="content">
+        <p *ngIf="data.auditType != 0 && data.auditType != 1 && data.gasStation">{{data.gasStation.companyName}} -
+            {{data.gasStation.locationName}} - {{data.gasStation.stationName}}</p>
+        <div class="cutoffrule" *ngIf="data.auditType != 0 && data.auditType != 1 && data.gasStation"></div>
         <p>预警事件: {{data.auditTitle}}</p>
         <div class="cutoffrule"></div>
         <p>预警时间: {{data.itemData.ViolateTime | date:"yyyy-MM-dd HH:mm:ss"}}</p>
diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
index 91d1233..5d41eea 100644
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
+++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
@@ -39,8 +39,11 @@
         </div>
     </div>
     <p style="margin-bottom: 0px;margin-top: 3px;box-sizing: border-box;padding: 0 12px;"
-        *ngIf="data.appealStatus == 3">
-        驳回说明:{{data.appealLog.rejectReason}}</p>
+        *ngIf="data.appealStatus == 3 && data.handleStateStr != '已处置'">
+        <span style="margin-right: 10px;">驳回人:{{data.appealLog.auditUser.name}}</span>
+        <span style="margin-right: 10px;">驳回时间:{{data.appealLog.auditTime | date:"yyyy-MM-dd HH:mm:ss"}}</span>
+        <span>驳回说明:{{data.appealLog.rejectReason}}</span>
+    </p>
     <!-- 只有非证照预警才可以处置 或者 申诉-->
     <div class="disposebox" *ngIf="!isLicenseWarning">
         <div class="title">
@@ -51,10 +54,10 @@
             </ng-container>
             <ng-template #elseTemplate>
                 <div class="btn">
-                    <span *ngIf="!data.handleTime && data.appealStatus ==1"
+                    <span *ngIf="!data.handleTime && data.appealStatus ==1 && isSubmit"
                         style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="Unappeal()">申诉撤销</span>
                     <span
-                        *ngIf="!data.handleTime && (data.appealStatus == 0 || data.appealStatus == 3 || data.appealStatus == 4)"
+                        *ngIf="!data.handleTime && (data.appealStatus == 0 || data.appealStatus == 3 || data.appealStatus == 4) && isSubmit"
                         style="color: #FF4B65;cursor: pointer;margin-right: 20px;" (click)="appeal()">申诉</span>
                     <nz-modal [(nzVisible)]="isAppeal" nzTitle="申诉原因" (nzOnOk)="handleOk()"
                         (nzOnCancel)="handleCancel()">
diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
index e4e7d89..67c5511 100644
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
+++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
@@ -34,6 +34,8 @@ export class GetOutOfLineDetailsComponent implements OnInit {
   isSubmit
   ngOnInit(): void {
 
+    console.log('预警信息', this.data)
+
     if (this.data.violation.violationType == '证照资质') {
       this.isLicenseWarning = true
     } else {
@@ -117,6 +119,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
     this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => {
       this.message.create('success', '处置成功！');
       this.data.handleTime = new Date()
+      this.data.handleStateStr = '已处置'
       this.data.handleRecord = this.content
     })
   }