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

2022-05-09 13:45:01 +08:00
parent 2bf2b47b5c d472ef8da3
commit abe398d0c2
1 changed files with 4 additions and 0 deletions
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
@ -213,7 +213,11 @@ export class BillingOrderComponent extends BasicTableComponent {
        className: 'text-center',
        index: 'paymentMethodRate',
        width: 130,
+<<<<<<< HEAD
+        format: record => `${(record.paymentMethodRate*100).toFixed(2)}%`
+=======
        format: record => `${record.paymentMethodRate * 100}%`
+>>>>>>> b6b51c9a662efd271b713242c077a04c199ed167
      },
      { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
      { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' },