From d827e9b6d9f541358113f4d80f05c72b50940561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Wed, 11 May 2022 16:03:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8A=E6=8A=A5=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order-reporting/order-reporting.component.html  | 11 +++++++----
 .../order-reporting/order-reporting.component.ts    | 13 +++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
index 23348f41..9c3b1970 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
@@ -55,7 +55,7 @@
     <ng-template st-row="loadingPicture" let-item let-index="index">
       <div class="imgBox">
         <div *ngIf="item.loadingPicture">
-          <button nz-button>查看</button>
+          <a (click)="viewPhoto([item.loadingPicture])" class="text-blue-dark" nzType="text" nz-button>查看</a>
           <!-- <app-imagelist style="width: 60px" [imgList]="[item.loadingPicture]"> </app-imagelist> -->
         </div>
       </div>
@@ -63,21 +63,24 @@
     <ng-template st-row="unloadPicture" let-item let-index="index">
       <div class="imgBox">
         <div *ngIf="item.unloadPicture">
-          <app-imagelist style="width: 40px" [imgList]="[item.unloadPicture]"> </app-imagelist>
+          <a (click)="viewPhoto([item.unloadPicture])" class="text-blue-dark" nzType="text" nz-button>查看</a>
+          <!-- <app-imagelist style="width: 40px" [imgList]="[item.unloadPicture]"> </app-imagelist> -->
         </div>
       </div>
     </ng-template>
     <ng-template st-row="loadingLadingBill" let-item let-index="index">
       <div class="imgBox">
         <div *ngIf="item.loadingLadingBill">
-          <app-imagelist style="width: 40px" [imgList]="[item.loadingLadingBill]"> </app-imagelist>
+          <a (click)="viewPhoto([item.loadingLadingBill])" class="text-blue-dark" nzType="text" nz-button>查看</a>
+          <!-- <app-imagelist style="width: 40px" [imgList]="[item.loadingLadingBill]"> </app-imagelist> -->
         </div>
       </div>
     </ng-template>
     <ng-template st-row="signatureForm" let-item let-index="index">
       <div class="imgBox">
         <div *ngIf="item.signatureForm">
-          <app-imagelist style="width: 40px" [imgList]="[item.signatureForm]"> </app-imagelist>
+          <a (click)="viewPhoto([item.signatureForm])" class="text-blue-dark" nzType="text" nz-button>查看</a>
+          <!-- <app-imagelist style="width: 40px" [imgList]="[item.signatureForm]"> </app-imagelist> -->
         </div>
       </div>
     </ng-template>
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
index 336fb385..7ce5c714 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@@ -10,6 +10,8 @@ import { BasicTableComponent } from 'src/app/routes/commom';
 import { TaxManagementService } from '../../services/tax-management.service';
 import { TaxManagementUploadSettingComponent } from './upload-setting/upload-setting.component';
 import { TaxManagementOrderVerifyResultComponent } from './verify-result/verify-result.component';
+import { NzImageService } from 'ng-zorro-antd/image';
+import { image } from 'html2canvas/dist/types/css/types/image';
 
 @Component({
   selector: 'app-tax-management-order-reporting',
@@ -35,7 +37,8 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
     private router: Router,
     private ar: ActivatedRoute,
     private modal: NzModalService,
-    public searchDrawerService: SearchDrawerService
+    public searchDrawerService: SearchDrawerService,
+    public imageService: NzImageService
   ) {
     super(searchDrawerService);
   }
@@ -473,9 +476,11 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
     });
   }
 
-  viewPhoto(url: string) {
-    if (url) {
-      this.
+  viewPhoto(images: any[]) {
+
+    if (images.length > 0) {
+      const imgs = images.map(item => ({ src: item }));
+      this.imageService.preview(imgs);
     }
   }
 }