解决冲突
This commit is contained in:
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-06 20:20:26
|
* @Date : 2021-12-06 20:20:26
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-02-22 10:16:11
|
* @LastEditTime : 2022-02-28 19:47:14
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
*/
|
*/
|
||||||
@ -36,7 +36,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
|
|||||||
{ title: '款项', index: 'expenseName' },
|
{ title: '款项', index: 'expenseName' },
|
||||||
{ title: '运输费(元)', render: 'price' },
|
{ title: '运输费(元)', render: 'price' },
|
||||||
{ title: '附加费(元)', render: 'surcharge' },
|
{ title: '附加费(元)', render: 'surcharge' },
|
||||||
{ title: '支付时间', index: ' paymentTime' },
|
{ title: '支付时间', index: 'paymentTime' },
|
||||||
{
|
{
|
||||||
title: '支付状态',
|
title: '支付状态',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
|
|||||||
Reference in New Issue
Block a user