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

This commit is contained in:
wangshiming
2022-05-05 15:20:53 +08:00

View File

@ -51,7 +51,7 @@
<st #st [columns]="columns" [data]='service.$api_get_freight_list' [req]="{ process: beforeReq }" <st #st [columns]="columns" [data]='service.$api_get_freight_list' [req]="{ process: beforeReq }"
[res]="{ process: dataProcess }" [scroll]="{ x: '1200px' }" [page]=" {}" [loading]="loadingList"> [res]="{ process: dataProcess }" [scroll]="{ x: '1200px',y:scrollY }" [page]=" {}" [loading]="loadingList">
<ng-template st-row="enterpriseName" let-item let-index="index"> <ng-template st-row="enterpriseName" let-item let-index="index">
<label>{{ item.enterpriseName }}</label><br> <label>{{ item.enterpriseName }}</label><br>
<ng-container *ngIf="item.score!==null; else billEvaluateelseTemplate"> <ng-container *ngIf="item.score!==null; else billEvaluateelseTemplate">