From 5ce810cb8488a5e3aec345daf2032cd9cb34eaf8 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 25 May 2022 10:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file-category.component.html              |  6 +--
 .../file-category/file-category.component.ts  | 25 +++++----
 .../edit-update-category.component.html       |  2 +-
 .../update-category.component.html            |  9 +++-
 .../update-category.component.ts              | 54 +++++++++++--------
 5 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/src/app/pages/license/file-category/file-category.component.html b/src/app/pages/license/file-category/file-category.component.html
index 42fcd2c..5fcb294 100644
--- a/src/app/pages/license/file-category/file-category.component.html
+++ b/src/app/pages/license/file-category/file-category.component.html
@@ -4,8 +4,8 @@
             [nzShowPagination]="false" [nzScroll]="{ y:tableScrollHeight }" [nzNoResult]='null' nzTableLayout="fixed">
             <thead>
                 <tr>
-                    <th [nzWidth]="'16%'">
-                        <span style="margin-left: 25%;">证照名称</span>
+                    <th [nzWidth]="'45%'">
+                        <span style="margin-left: 10%;">证照名称</span>
                     </th>
                     <th>有无证照</th>
                     <!-- <th>提交时间</th>
@@ -17,7 +17,7 @@
             <tbody id="table">
                 <tr *ngFor="let item of headerTable.data;let key = index">
                     <td>
-                        <span style="margin-left: 25%;">{{item.licenseTypeName || ''}}</span>
+                        <span style="margin-left: 10%;">{{item.licenseTypeName || ''}}</span>
                     </td>
                     <td>
                         <span *ngIf="item.validatyType == 0">不适用</span>
diff --git a/src/app/pages/license/file-category/file-category.component.ts b/src/app/pages/license/file-category/file-category.component.ts
index 5f557ca..8d9fc07 100644
--- a/src/app/pages/license/file-category/file-category.component.ts
+++ b/src/app/pages/license/file-category/file-category.component.ts
@@ -120,22 +120,27 @@ export class FileCategoryComponent implements OnInit {
           this.message.create('warning', '请上传附件！');
           return false;
         }
-        await new Promise(resolve => {
-          instance.data2.validatyType = Number(instance.validatyType)
+        if (instance.validatyType != '2' && !instance.data2.remark) {
+          this.message.create('warning', '请填写完整！');
+          return false;
+        }
+        instance.data2.validatyType = Number(instance.validatyType)
+        if (!instance.isSubmit) {
           this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe((data: any) => {
-            if (!instance.isSubmit) {
-              resolve(data);
-              this.getStationList();
-              this.message.create('success', '修改成功！');
-              return true;
-            } else { //提交审核
+            this.getStationList();
+            this.message.create('success', '修改成功！');
+          })
+          return false;
+        } else {
+          await new Promise(resolve => {
+            this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe((data: any) => {
               this.submitReview(data.result).then(res=>{
                 resolve(data);
                 return true;
               });
-            }
+            })
           })
-        })
+        } //else
       }
     });
     const instance = modal.getContentComponent();
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 ec85ad4..4323f8b 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
@@ -58,7 +58,7 @@
                 <img *ngIf="data2.attachment && getFileType(data2.attachment) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data2.attachment)">
 
                 <input *ngIf="!data2.attachment" (change)="filechange($event,false)" class="fileinput" type="file" name="" id="">
-                <button *ngIf="!data2.attachment" nz-button [nzLoading]="isLoadingSave"><i nz-icon nzType="upload" nzTheme="outline"></i>上传副本</button>
+                <button *ngIf="!data2.attachment" nz-button [nzLoading]="isLoadingSave">上传附件副本</button>
             </div>
             <div class="uploadDiv" *ngIf="data2.attachment && data2.hasAttachmentDefault">
                 <input (change)="filechange($event,false)" class="fileinput" type="file" name="" id="">
diff --git a/src/app/pages/license/update-category/update-category.component.html b/src/app/pages/license/update-category/update-category.component.html
index 31ccdf6..82c1642 100644
--- a/src/app/pages/license/update-category/update-category.component.html
+++ b/src/app/pages/license/update-category/update-category.component.html
@@ -49,8 +49,13 @@
                     </td>
                     <td>
                         <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'img'" [src]="item.imageUrl" (click)="viewImg(item.imageUrl)">
-                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(item)">
-                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(item)">
+                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(item.imageUrl)">
+                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(item.imageUrl)">
+                        <label *ngIf="item.attachment && item.hasAttachmentDefault" style="margin-left: 10px;">
+                            <img *ngIf="item.attachment && getFileType(item.attachment) == 'img'" [src]="item.attachment" (click)="viewImg(item.attachment)">
+                            <img *ngIf="item.attachment && getFileType(item.attachment) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(item.attachment)">
+                            <img *ngIf="item.attachment && getFileType(item.attachment) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(item.attachment)">
+                        </label>
                     </td>
                     <td class="operation">
                         <span class="blueColor" (click)="edit(item)">编辑</span>
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 3f9ac38..480add9 100644
--- a/src/app/pages/license/update-category/update-category.component.ts
+++ b/src/app/pages/license/update-category/update-category.component.ts
@@ -93,15 +93,15 @@ export class UpdateCategoryComponent implements OnInit {
 
   //查看文件
   lookFile(item) {
-    if (!item.imageUrl) {
+    if (!item) {
       return
     }
-    if (this.getFileType(item.imageUrl) == 'word') {
-      let arr = item.imageUrl.split('.')
+    if (this.getFileType(item) == 'word') {
+      let arr = item.split('.')
       arr[arr.length - 1] = 'pdf'
       window.open(arr.join('.'))
-    } else  if (this.getFileType(item.imageUrl) == 'pdf') {
-      window.open(item.imageUrl)
+    } else  if (this.getFileType(item) == 'pdf') {
+      window.open(item)
     } else {
       this.message.create('warning', '暂不支持查看！');
     }
@@ -133,33 +133,41 @@ export class UpdateCategoryComponent implements OnInit {
       nzFooter: null,
       nzClosable: false,
       nzOnOk: async () => {
+        if (!instance.data2.imageUrl) {
+          this.message.create('warning', '请上传附件！');
+          return false;
+        }
+        if (instance.data2.hasAttachmentDefault && !instance.data2.attachment) {
+          this.message.create('warning', '请上传附件副本！');
+          return false;
+        }
         if (instance.validateForm.valid) {
-          await new Promise(resolve => {
-            let body = instance.data2
-            // 日期
-            if (body.isLongTerm) {
-              body.validityStartTime = instance.isLongTermTime || new Date()
-            } else {
-              body.validityStartTime = instance.isNoLongTermTime[0] || new Date()
-              body.validityEndTime = instance.isNoLongTermTime[1] || new Date()
-            }
+          let body = instance.data2
+          if (body.isLongTerm) {
+            body.validityStartTime = instance.isLongTermTime || new Date()
+          } else {
+            body.validityStartTime = instance.isNoLongTermTime[0] || new Date()
+            body.validityEndTime = instance.isNoLongTermTime[1] || new Date()
+          }
+          if (!instance.isSubmit) {
             this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe((data:any) => {
-              if (!instance.isSubmit) {
-                resolve(data);
-                this.getStationList();
-                this.message.create('success', '修改成功！');
-                return true;
-              } else { //提交审核
+              this.getStationList();
+              this.message.create('success', '修改成功！');
+            })
+            return false;
+          } else {
+            await new Promise(resolve => {
+              this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe((data:any) => {
                 this.submitReview(data.result).then(res=>{
                   resolve(data);
                   return true;
                 });
-              }
+              })
             })
-          })
+          } //else
         } else {
           this.message.create('warning', '请填写完整！');
-          return false
+          return false;
         }
       }
     });