From 4786d7d1f30eb80429aceaa59189bba0aa275d6f Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 18 Jan 2022 19:30:14 +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/bulk/bulk.component.ts         | 64 +++++--------------
 1 file changed, 16 insertions(+), 48 deletions(-)

diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
index edfd87bc..285f207d 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -156,18 +156,19 @@ tabs = {
             },
           } 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,
+              _$expand: (value: boolean) => value
+            }
+          } as SFSelectWidgetSchema
         },
+   
         riskStatus: {
           type: 'string',
           title: '是否风险单',
@@ -184,7 +185,7 @@ tabs = {
             },
           },
         },
-        enterpriseInfoName: {
+        enterpriseInfoId: {
           type: 'string',
           title: '网络货运人',
           ui: {
@@ -197,50 +198,17 @@ tabs = {
             asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
           },
         },
-        settlementBasis: {
-          title: '结算依据',
+        createTime: {
+          title: '创建时间',
           type: 'string',
           ui: {
-            widget: 'dict-select',
-            containsAllLable: true,
-            params: { dictKey: 'goodresource:settlement:type' },
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd',
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
-          } as SFSelectWidgetSchema,
-        },
-        goodsNameId: {
-          type: 'string',
-          title: '货物名称',
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            errors: { required: '请选择货物类型' },
-            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
-        },
-        serviceType: {
-          title: '服务类型',
-          type: 'string',
-          default: '',
-          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containAllLable:true,
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFSelectWidgetSchema,
+          } as SFDateWidgetSchema,
         },
       },
       type: 'object',