Merge branch 'weiyu' into develop
This commit is contained in:
		| @ -269,8 +269,8 @@ export class BillingOrderComponent implements OnInit { | ||||
|       { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' }, | ||||
|       // { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, // TODO | ||||
|       { | ||||
|         title: 'ETC开票金额', render: 'vatmoney', className: 'text-center', width: 200, type: 'widget', | ||||
|         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.surcharge }) } | ||||
|         title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 200, type: 'widget', | ||||
|         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.etcInvoiceMoney }) } | ||||
|       } | ||||
|     ]; | ||||
|   } | ||||
|  | ||||
		Reference in New Issue
	
	Block a user