From 5e6f55b7dc191c1e77ba887a1e9f7dafdb5a0b6a Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 18 Jan 2022 19:26:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/vehicle/vehicle.component.ts   | 56 +++++++++----------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
index 9617a64e..5b6ebe00 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -121,6 +121,17 @@ export class WaybillManagementVehicleComponent implements OnInit {
             }
           }
         },
+        enterpriseProjectId: {
+          type: 'string',
+          title: '所属项目',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            asyncData: () => this.shipperservice.getEnterpriseProject()
+          } as SFSelectWidgetSchema
+        },
         driverName: {
           title: '承运司机',
           type: 'string',
@@ -160,18 +171,19 @@ export class WaybillManagementVehicleComponent implements OnInit {
             }
           } as SFSelectWidgetSchema
         },
-        createTime: {
-          title: '创建时间',
+        serviceType: {
+          title: '服务类型',
           type: 'string',
           ui: {
-            widget: 'date',
-            mode: 'range',
-            format: 'yyyy-MM-dd',
+            widget: 'dict-select',
+            containsAllLable: true,
+            params: { dictKey: 'service:type' },
             visibleIf: {
               _$expand: (value: boolean) => value
             }
-          } as SFDateWidgetSchema
+          } as SFSelectWidgetSchema
         },
+     
         riskStatus: {
           type: 'string',
           title: '是否风险单',
@@ -201,35 +213,17 @@ export class WaybillManagementVehicleComponent implements OnInit {
             asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
         },
-        // goodsName: {
-        //   type: 'string',
-        //   title: '货物名称',
-        //   ui: {
-        //     placeholder: '请选择',
-        //     visibleIf: {
-        //       _$expand: (value: boolean) => value
-        //     },
-        //   }
-        // }
-        goodsNameId: {
+        createTime: {
+          title: '创建时间',
           type: 'string',
-          title: '货物名称',
           ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            errors: { required: '请选择货物类型' },
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd',
             visibleIf: {
               _$expand: (value: boolean) => value
-            },
-            asyncData: () =>
-              this.shipperservice.loadConfigByKey('goods.name.config.type').pipe(
-                map((data: any) => {
-                  return data[0].children?.map((m: any) => {
-                    return { label: m.name, value: m.id };
-                  });
-                })
-              ),
-          } as SFSelectWidgetSchema
+            }
+          } as SFDateWidgetSchema
         },
       },
       type: 'object'