Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
wangshiming
2022-05-11 16:04:40 +08:00
2 changed files with 20 additions and 5 deletions

View File

@ -59,21 +59,24 @@
<ng-template st-row="loadingPicture" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item.loadingPicture">
<app-imagelist style="width: 60px" [imgList]="[item.loadingPicture]"> </app-imagelist>
<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>
</ng-template>
<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>
@ -84,7 +87,8 @@
<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>

View File

@ -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);
}
@ -474,4 +477,12 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
nzContent: content
});
}
viewPhoto(images: any[]) {
if (images.length > 0) {
const imgs = images.map(item => ({ src: item }));
this.imageService.preview(imgs);
}
}
}