详情完善

src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html

@@ -37,32 +37,47 @@
             <div class="cutoffrule"></div>
             <p>证照编号: &nbsp;&nbsp;{{data.getData.licenseCode || ''}}</p>
             <div class="cutoffrule"></div>
-            <p>证照效期: &nbsp;&nbsp;<span *ngIf="!data.getData.isLongTerm">{{data.getData.validityStartTime |
+            <p>证照效期: &nbsp;&nbsp;{{data.getData.isLongTerm ? '长期证照' : (data.getData.validityEndTime | date:"yyyy/MM/dd")}}</p>
-                    date:"yyyy/MM/dd"}} - </span>{{data.getData.validityEndTime | date:"yyyy/MM/dd"}}</p>
             <div class="cutoffrule"></div>
-            <p>办理类型: &nbsp;&nbsp;{{getHandleTypes(data.getData.handleTypes)}}</p>
+            <p>办理类型: &nbsp;&nbsp;{{getHandleTypes(data.getData.handleTypesDefault)}}</p>
             <div class="cutoffrule"></div>
-            <p>有效期类型: &nbsp;&nbsp;{{data.getData.validityDays || 0}}天</p>
+            <p>有效天数: &nbsp;&nbsp;
+                <ng-container *ngIf="data.getData.isLongTerm; else elseTemplate">
+                    长期
+                </ng-container>
+                <ng-template #elseTemplate>
+                    {{data.getData.validityDays ? data.getData.validityDays+'天' : '/'}}
+                </ng-template>
+            </p>
             <div class="cutoffrule"></div>
-            <p>是否年检: &nbsp;&nbsp;<span *ngIf="data.getData.isYearlyCheck">是</span><span
+            <p>是否年检: &nbsp;&nbsp;<span *ngIf="data.getData.isYearlyCheck">是</span><span *ngIf="!data.getData.isYearlyCheck">否</span></p>
-                    *ngIf="!data.getData.isYearlyCheck">否</span></p>
         </div>
         <div *ngIf="data.auditType == 3">
             <p>证照名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p>
             <div class="cutoffrule"></div>
-            <p>有无证照: &nbsp;&nbsp;<span *ngIf="data.getData.validatyType == 0">不适用</span><span
+            <p>有无证照: &nbsp;&nbsp;
-                    *ngIf="data.getData.validatyType == 1">无</span><span *ngIf="data.getData.validatyType == 2">有</span>
+                <span *ngIf="data.getData.validatyType == 0">不适用</span><span *ngIf="data.getData.validatyType == 1">无</span><span *ngIf="data.getData.validatyType == 2">有</span>
             </p>
+            <div class="cutoffrule"></div>
+            <p>说明:  &nbsp;&nbsp;{{data.getData.remark}}</p>
         </div>
         <div class="cutoffrule"></div>
         <p [hidden]="data.getData.imageUrl === undefined">附件: &nbsp;&nbsp;
             <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'img'"
                 [src]="data.getData.imageUrl" (click)="viewImg(data.getData.imageUrl)">
             <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'word'"
-                src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData)">
+                src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.imageUrl)">
             <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'pdf'"
-                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData)">
+                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.imageUrl)">
         <div class="cutoffrule" [hidden]="data.getData.imageUrl === undefined"></div>
+        <p *ngIf="data.getData.hasAttachmentDefault && data.getData.attachment">附件副本: &nbsp;&nbsp;
+            <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'img'"
+                [src]="data.getData.attachment" (click)="viewImg(data.getData.attachment)">
+            <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'word'"
+                src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.attachment)">
+            <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'pdf'"
+                src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.attachment)">
+        <div class="cutoffrule" *ngIf="data.getData.hasAttachmentDefault && data.getData.attachment"></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/audit/audit-ing/audit-dispose/audit-dispose.component.ts

@@ -85,15 +85,15 @@ export class AuditDisposeComponent implements OnInit {
 
   //查看文件
   lookFile(item) {
-    if (!item.imageUrl) {
+    if (!item) {
       return
     }
-    if (this.getFileType(item.imageUrl) == 'word') {
+    if (this.getFileType(item) == 'word') {
-      let arr = item.imageUrl.split('.')
+      let arr = item.split('.')
       arr[arr.length - 1] = 'pdf'
       window.open(arr.join('.'))
-    } else  if (this.getFileType(item.imageUrl) == 'pdf') {
+    } else  if (this.getFileType(item) == 'pdf') {
-      window.open(item.imageUrl)
+      window.open(item)
     } else {
       this.message.create('warning', '暂不支持查看！');
     }

src/app/pages/license/file-category/details-file-category/details-file-category.component.html

@@ -7,13 +7,13 @@
     </div>
 
     <div class="content">
-        <p>证件名称: &nbsp;&nbsp;{{data.licenseTypeName}}</p>
+        <p>证照名称: &nbsp;&nbsp;{{data.licenseTypeName}}</p>
         <div class="cutoffrule"></div>
         <p>有无证照: &nbsp;&nbsp;<span *ngIf="data.validatyType == 0">不适用</span><span *ngIf="data.validatyType == 1">无</span><span *ngIf="data.validatyType == 2">有</span></p>
         <div class="cutoffrule"></div>
         <!-- <p>是否年检: &nbsp;&nbsp;是</p>
         <div class="cutoffrule"></div> -->
-        <p>证件图片: &nbsp;&nbsp;
+        <p>附件: &nbsp;&nbsp;
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'img'" [src]="data.imageUrl" (click)="viewImg(data.imageUrl)">
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(data)">
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data)">

src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html

@@ -6,7 +6,7 @@
         <i nz-icon nzType="close" nzTheme="outline" (click)="destroyModal()"></i>
     </div>
     <form nz-form [formGroup]="validateForm" class="form">
-        <p>证件名称: {{data2.licenseTypeName || ''}}</p>
+        <p>证照名称: {{data2.licenseTypeName || ''}}</p>
 
         <div class="cutoffrule"></div>
 

src/app/pages/license/update-category/details-update-category/details-update-category.component.html

@@ -7,24 +7,37 @@
     </div>
 
     <div class="content">
-        <p>证件名称: &nbsp;&nbsp;{{data.licenseTypeName || ''}}</p>
+        <p>证照名称: &nbsp;&nbsp;{{data.licenseTypeName || ''}}</p>
         <div class="cutoffrule"></div>
-        <p>证件编号: &nbsp;&nbsp;{{data.licenseCode || ''}}</p>
+        <p>证照编号: &nbsp;&nbsp;{{data.licenseCode || ''}}</p>
         <div class="cutoffrule"></div>
-        <p>证件有效期: &nbsp;&nbsp;<span *ngIf="!data.isLongTerm">{{data.validityStartTime | date:"yyyy/MM/dd"}} - </span>{{data.validityEndTime | date:"yyyy/MM/dd"}}</p>
+        <p>证照效期: &nbsp;&nbsp;{{data.isLongTerm ? '长期证照' : (data.validityEndTime | date:"yyyy/MM/dd")}}</p>
         <div class="cutoffrule"></div>
         <p>办理类型: &nbsp;&nbsp;{{getHandleTypes(data.handleTypesDefault)}}</p>
         <div class="cutoffrule"></div>
-        <p>有效期类型: &nbsp;&nbsp;{{data.validityDays || 0}}天</p>
+        <p>有效天数: &nbsp;&nbsp;
+            <ng-container *ngIf="data.isLongTerm; else elseTemplate">
+                长期
+            </ng-container>
+            <ng-template #elseTemplate>
+                {{data.validityDays ? data.validityDays+'天' : '/'}}
+            </ng-template>
+        </p>
         <div class="cutoffrule"></div>
         <!-- <p>是否年检: &nbsp;&nbsp;<span *ngIf="data.isYearlyCheck">是</span><span *ngIf="!data.isYearlyCheck">否</span></p>
         <div class="cutoffrule"></div> -->
-        <p>证件图片: &nbsp;&nbsp;
+        <p>附件: &nbsp;&nbsp;
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'img'" [src]="data.imageUrl" (click)="viewImg(data.imageUrl)">
-            <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(data)">
+            <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(data.imageUrl)">
-            <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data)">
+            <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.imageUrl)">
         </p>
         <div class="cutoffrule"></div>
+        <p *ngIf="data.hasAttachmentDefault && data.attachment">附件副本: &nbsp;&nbsp;
+            <img *ngIf="data.attachment && getFileType(data.attachment) == 'img'" [src]="data.attachment" (click)="viewImg(data.attachment)">
+            <img *ngIf="data.attachment && getFileType(data.attachment) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(data.attachment)">
+            <img *ngIf="data.attachment && getFileType(data.attachment) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.attachment)">
+        </p>
+        <div class="cutoffrule" *ngIf="data.hasAttachmentDefault && data.attachment"></div>
         <p class="recordP" style="margin-bottom: 32px">
             <span>审核记录</span>
             <span>

src/app/pages/license/update-category/details-update-category/details-update-category.component.ts

@@ -91,15 +91,15 @@ export class DetailsUpdateCategoryComponent implements OnInit {
 
    //查看文件
    lookFile(item) {
-    if (!item.imageUrl) {
+    if (!item) {
       return
     }
-    if (this.getFileType(item.imageUrl) == 'word') {
+    if (this.getFileType(item) == 'word') {
-      let arr = item.imageUrl.split('.')
+      let arr = item.split('.')
       arr[arr.length - 1] = 'pdf'
       window.open(arr.join('.'))
-    } else  if (this.getFileType(item.imageUrl) == 'pdf') {
+    } else  if (this.getFileType(item) == 'pdf') {
-      window.open(item.imageUrl)
+      window.open(item)
     } else {
       this.message.create('warning', '暂不支持查看！');
     }

src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html

@@ -6,20 +6,20 @@
         <i nz-icon nzType="close" nzTheme="outline" (click)="destroyModal()"></i>
     </div>
     <form nz-form [formGroup]="validateForm" class="form">
-        <p>证件名称: {{data2.licenseTypeName}}</p>
+        <p>证照名称: {{data2.licenseTypeName}}</p>
 
         <div class="cutoffrule"></div>
 
-        <p>证件编号<span style="color: red;">*</span></p>
+        <p>证照编号<span style="color: red;">*</span></p>
         <nz-form-item>
             <nz-form-control>
                 <nz-input-group>
-                    <input nz-input type="text" formControlName="number" placeholder="请输入证件编号" [(ngModel)]="data2.licenseCode"/>
+                    <input nz-input type="text" formControlName="number" placeholder="请输入证照编号" [(ngModel)]="data2.licenseCode"/>
                 </nz-input-group>
             </nz-form-control>
         </nz-form-item>
 
-        <p>证件有效期<span style="color: red;">*</span></p>
+        <p>证照效期<span style="color: red;">*</span></p>
 
         <div class="validity">
             <label nz-checkbox (ngModelChange)="validityChange($event)" [(ngModel)]="data2.isLongTerm" formControlName="isLongTerm">
@@ -34,15 +34,7 @@
             <!-- <span>是否年检: <span *ngIf="data2.isYearlyCheck">是</span><span *ngIf="!data2.isYearlyCheck">否</span></span> -->
         </p>
 
-        <p>办理类型</p>
+        <p>办理类型: &nbsp;&nbsp;{{getHandleTypes(data2.handleTypesDefault)}}</p>
-
-        <nz-form-item>
-            <nz-form-control>
-                <nz-select formControlName="type" nzMode="multiple" [(ngModel)]="data2.handleTypesDefault" nzDisabled>
-                    <nz-option [nzValue]="item.value" [nzLabel]="item.name" *ngFor="let item of handleTypeList"></nz-option>
-                </nz-select>
-            </nz-form-control>
-        </nz-form-item>
 
         <p>附件上传（图片格式、pdf格式、word格式）</p>
 

src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts

@@ -27,7 +27,6 @@ export class EditUpdateCategoryComponent implements OnInit {
     this.validateForm = this.fb.group({
       number: [null, [Validators.required]],
       isLongTerm: [null, [Validators.required]],
-      type: [null, [Validators.required]],
       isLongTermTime: [null,],
       isNoLongTermTime: [null,],
     });
@@ -104,6 +103,22 @@ export class EditUpdateCategoryComponent implements OnInit {
     }
   }
 
+  //获取办理类型
+  getHandleTypes(handleTypes: any[]):string {
+    if (!handleTypes || !handleTypes.length) {
+      return
+    }
+    let names: string[] = []
+    let handleTypeList = JSON.parse(JSON.stringify(handleTypes));
+    let list: handleTypeList[] = new handleType().list;
+    handleTypeList.forEach(item=>{
+      list.find(element=>{
+        item == element.value? names.push(element.name) : null
+      })
+    })
+    return names.join(',')
+  }
+
   //获取文件格式
   getFileType(name: string):string {
     let suffix