Merge branch 'lxx' into 'develop'
Lxx See merge request tms-ui/tms-obc-web!15
This commit is contained in:
		| @ -281,12 +281,12 @@ export class DatatableOrderReportingComponent implements OnInit { | |||||||
|   initST() { |   initST() { | ||||||
|     this.columns = [ |     this.columns = [ | ||||||
|       { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, |       { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, | ||||||
|       { title: '订单状态', render: 'billPutStatusLabel', className: 'text-center', width: '120px', }, |       { title: '订单状态', index: 'billPutStatusLabel', className: 'text-center', width: '120px', }, | ||||||
|       { title: '司机状态', render: 'driverPutStatusLabel', className: 'text-center', width: '120px', }, |       { title: '司机状态', index: 'driverPutStatusLabel', className: 'text-center', width: '120px', }, | ||||||
|  |  | ||||||
|       { title: '车辆状态', render: 'carPutStatusLabel', className: 'text-center', width: '120px', }, |       { title: '车辆状态', index: 'carPutStatusLabel', className: 'text-center', width: '120px', }, | ||||||
|  |  | ||||||
|       { title: '本地校验', render: 'checkStatusLabel', className: 'text-center', width: '120px', }, |       { title: '本地校验', index: 'checkStatusLabel', className: 'text-center', width: '120px', }, | ||||||
|       { |       { | ||||||
|         title: '订单号', |         title: '订单号', | ||||||
|         render: 'billCode', |         render: 'billCode', | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user