解决冲突
This commit is contained in:
@ -4,7 +4,7 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-01-12 10:52:50
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-02-21 20:16:13
|
||||
* @LastEditTime : 2022-02-24 15:57:34
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
-->
|
||||
@ -68,14 +68,24 @@
|
||||
{{ item.freightPrice | currency }}
|
||||
</ng-template>
|
||||
<ng-template st-row="loadingLadingBillFilePath" let-item let-index="index">
|
||||
<div>
|
||||
<span><img style="height: 60px; padding-right: 5px" [src]="item.loadingLadingBillFilePath" alt="" /></span>
|
||||
<span><img style="height: 60px" [src]="item.loadingPeopleVehiclesGoodsFilePath" alt="" /></span>
|
||||
<div class="imgBox">
|
||||
<div *ngIf="item.loadingLadingBillFilePath">
|
||||
<app-imagelist style="width: 40px" [imgList]="[item.loadingLadingBillFilePath]"> </app-imagelist>
|
||||
</div>
|
||||
<div *ngIf="item.loadingPeopleVehiclesGoodsFilePath">
|
||||
<app-imagelist style="width: 40px" [imgList]="[item.loadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index">
|
||||
<span><img style="height: 60px; padding-right: 5px" [src]="item.unloadingLadingBillFilePath" alt="" /></span>
|
||||
<span><img style="height: 60px" [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt="" /></span>
|
||||
<div class="imgBox">
|
||||
<div *ngIf="item.unloadingLadingBillFilePath">
|
||||
<app-imagelist style="width: 40px" [imgList]="[item.unloadingLadingBillFilePath]"> </app-imagelist>
|
||||
</div>
|
||||
<div *ngIf="item.unloadingPeopleVehiclesGoodsFilePath">
|
||||
<app-imagelist style="width: 40px" [imgList]="[item.unloadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="loadingTime" let-item let-index="index">
|
||||
<div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
|
||||
|
||||
Reference in New Issue
Block a user