Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Sinopec-Anxin

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>

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>

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