From d9b7631ca1548c0b91c480b769e363896a62776a Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 15 Jul 2022 14:41:46 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=B9=B4=E6=A3=80=E6=9B=B4=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../audit-dispose/audit-dispose.component.html      | 13 +++++++++++++
 .../edit-update-category.component.html             |  2 +-
 .../update-category/update-category.component.ts    |  5 +++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
index 2ebdedd..8ad4c42 100644
--- a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
+++ b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
@@ -96,6 +96,19 @@
                 src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.attachment)">
         </p>
         <div class="cutoffrule" *ngIf="data.getData.hasAttachmentDefault && data.getData.attachment"></div>
+        <p *ngIf="data.getData.yearlyCheckAttachment">年检更新附件: &nbsp;&nbsp;
+            <img *ngIf="data.getData.yearlyCheckAttachment && getFileType(data.getData.yearlyCheckAttachment) == 'img'"
+                [src]="data.getData.yearlyCheckAttachment" (click)="viewImg(data.getData.yearlyCheckAttachment)">
+            <img *ngIf="data.getData.yearlyCheckAttachment && getFileType(data.getData.yearlyCheckAttachment) == 'word'"
+                src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.yearlyCheckAttachment)">
+            <img *ngIf="data.getData.yearlyCheckAttachment && getFileType(data.getData.yearlyCheckAttachment) == 'pdf'"
+                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.yearlyCheckAttachment)">
+        </p>
+        <div class="cutoffrule" *ngIf="data.getData.yearlyCheckAttachment"></div>
+        <p *ngIf="data.getData.yearlyCheckDescription">年检更新说明: &nbsp;&nbsp;
+            <span>{{data.getData.yearlyCheckDescription}}</span>
+        </p>
+        <div class="cutoffrule" *ngIf="data.getData.yearlyCheckDescription"></div>
         <p>审批意见: </p>
         <textarea style="background: #173350;height: 100px;width: 100%;border-radius: 0;border: 0;color: white;"
             cols="30" rows="10" [(ngModel)]="textarea"></textarea>
diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html
index 5e2f4f2..5e9cf57 100644
--- a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html
+++ b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html
@@ -112,7 +112,7 @@
                             nzTheme="outline"></i>重新上传</button>
                 </div>
             </div>
-            <p *ngIf="data2.lastLicenseAuditType == 1">年检更新说明</p>
+            <p *ngIf="data2.lastLicenseAuditType == 1">年检更新说明<span style="color: red;">*</span></p>
             <div *ngIf="data2.lastLicenseAuditType == 1">
                 <textarea [(ngModel)]="data2.yearlyCheckDescription" formControlName="explain" nz-input
                     rows="2"></textarea>
diff --git a/src/app/pages/license/update-category/update-category.component.ts b/src/app/pages/license/update-category/update-category.component.ts
index c03eb64..da0c0d4 100644
--- a/src/app/pages/license/update-category/update-category.component.ts
+++ b/src/app/pages/license/update-category/update-category.component.ts
@@ -163,6 +163,11 @@ export class UpdateCategoryComponent implements OnInit {
             body.attachment = newUrl
           }
 
+          if (body.isYearlyCheck && !body.yearlyCheckDescription) {
+            this.message.create('warning', '请填写年检更新说明！');
+            return false
+          }
+
           if (body.lastLicenseAuditType == 0) {
             body.yearlyCheckAttachment = null
             body.yearlyCheckDescription = null