Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangshiming
2022-04-08 17:40:43 +08:00
parent 769f660e3a ab9810d80b
commit 54ef73b6db
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
View File

@ -248,7 +248,7 @@ export class DatatableFundReportingComponent implements OnInit {
{ title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '150px' },
{ title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '200px' },
{ title: '车牌号', index: 'carNumber', className: 'text-center', width: '180px' },
{ title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' },
{ title: '车牌颜色', index: 'carColorLabel', className: 'text-center', width: '180px' },
{ title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' },
{ title: '付款方式', index: 'payType', className: 'text-center', width: '150px' },

2
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
View File

@ -46,7 +46,7 @@
</ng-template>
<ng-template st-row="checkStatus" let-item let-index="index">
<a (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
<a *ngIf="item?.checkStatus === 2" (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
<span *ngIf="item?.checkStatus !== 2">{{filterCheckStatus(item?.checkStatus)}}</span>
</ng-template>