From 4ec554ce0cab0ff2c95f24f7ea7ad50b4051ec7e Mon Sep 17 00:00:00 2001
From: weiyu <weiyu.wei@eascs.com>
Date: Wed, 27 Apr 2022 17:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../billing-order.component.html              |  3 ++
 .../billing-order/billing-order.component.ts  | 34 +++++++++++++------
 2 files changed, 27 insertions(+), 10 deletions(-)

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 @@
             <span *ngIf="item.sts === '6'">已撤销</span>
             <span *ngIf="item.sts === '7'">已作废</span>
         </ng-template>
+        <ng-template st-row="serviceType" let-item let-index="index">
+            <span>{{item.billTypeLabel + item.serviceTypeLabel}}</span>
+        </ng-template>
     </st>
 </nz-card>
\ 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',
       },