diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
index 3f494035..047cdf2a 100644
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
@@ -33,5 +33,8 @@
已撤销
已作废
+
+ {{item.billTypeLabel + item.serviceTypeLabel}}
+
\ No newline at end of file
diff --git 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
index 08e37c74..521040b2 100644
--- 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
@@ -77,14 +77,28 @@ export class BillingOrderComponent implements OnInit {
serviceType: {
title: '服务类型',
type: 'string',
+ enum: [{
+ label: '全部',
+ value: ''
+ },{
+ label: '整车抢单',
+ value: 1
+ },{
+ label: '整车指派',
+ value: 2
+ },{
+ label: '大宗抢单',
+ value: 3
+ },{
+ label: '大宗指派',
+ value: 4
+ },{
+ label: '结算单',
+ value: 5
+ }],
ui: {
- widget: 'dict-select',
- params: { dictKey: 'service:type' },
- containsAllLabel: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- } as SFSelectWidgetSchema
+ widget: 'select',
+ }
},
shipperAppUserName: {
type: 'string',
@@ -179,7 +193,7 @@ export class BillingOrderComponent implements OnInit {
private initST(): STColumn[] {
return [
- { title: '订单号', index: 'billCode', type:'link', className: 'text-center', width: 180, click: _record => this.routeTo(_record) },
+ { title: '订单号', index: 'billCode', type: 'link', className: 'text-center', width: 180, click: _record => this.routeTo(_record) },
{ title: '运单号', index: 'wayBillCode', width: 180, className: 'text-center' },
{ title: '银行类型', index: 'bankTypeLabel', render: 'bankType', width: 100, className: 'text-center' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: 220, className: 'text-center' },
@@ -234,7 +248,7 @@ export class BillingOrderComponent implements OnInit {
{ title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center', },
{
title: '服务类型',
- index: 'serviceTypeLabel',
+ render: 'serviceType',
width: '120px',
className: 'text-center'
},
@@ -244,7 +258,7 @@ export class BillingOrderComponent implements OnInit {
{ title: '车牌号', index: 'carNo', className: 'text-center', width: '120px' },
{
title: '承运司机',
- index:'driverName',
+ index: 'driverName',
className: 'text-center',
width: '120px',
},