From 0352cd2f08175a8d4b90297c586a8c445a6200e6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 12 Jan 2022 14:33:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bulk/bulk.component.ts | 31 ++++++++++++++----- .../components/vehicle/vehicle.component.ts | 3 -- .../components/bulk/bulk.component.ts | 17 +++++++--- .../components/vehicle/vehicle.component.ts | 30 +++++++++++++----- .../services/business/shipper-base.service.ts | 1 + 5 files changed, 59 insertions(+), 23 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 171d83e8..d8671e7f 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -287,18 +287,35 @@ tabs = { asyncData: () => this.service2.getNetworkFreightForwarder(), }, }, - goodsName: { + // goodsName: { + // type: 'string', + // title: '货物名称', + // ui: { + // widget: 'select', + // placeholder: '请选择', + // visibleIf: { + // _$expand: (value: boolean) => value, + // }, + // allowClear: true, + // asyncData: () => this.getCatalogueMember(), + // }, + // }, + goodsTypeId: { type: 'string', title: '货物名称', ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - _$expand: (value: boolean) => value, - }, - allowClear: true, - asyncData: () => this.getCatalogueMember(), - }, + errors: { required: '请选择货物类型' }, + asyncData: () => + this.service2.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: '服务类型', diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 3fbbebb3..bfda3a74 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -305,13 +305,10 @@ resourceStatus: any; type: 'string', title: '货物名称', ui: { - widget: 'select', placeholder: '请选择', visibleIf: { _$expand: (value: boolean) => value, }, - allowClear: true, - asyncData: () => this.getCatalogueMember(), }, }, serviceType: { 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 38a9b6a2..f2731b05 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -261,18 +261,25 @@ tabs = { }, } as SFSelectWidgetSchema, }, - goodsName: { + goodsNameId: { type: 'string', title: '货物名称', ui: { widget: 'select', placeholder: '请选择', + errors: { required: '请选择货物类型' }, visibleIf: { - _$expand: (value: boolean) => value, + _$expand: (value: boolean) => value }, - allowClear: true, - asyncData: () => this.getCatalogueMember(), - }, + asyncData: () => + this.service2.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: '服务类型', 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 0ae544d0..dc842b95 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -102,9 +102,6 @@ export class WaybillManagementVehicleComponent implements OnInit { serverSearch: true, searchDebounceTime: 300, searchLoadingText: '搜索中...', - visibleIf: { - _$expand: (value: boolean) => value - }, onSearch: (q: any) => { console.log(q) if (!!q) { @@ -260,19 +257,36 @@ export class WaybillManagementVehicleComponent implements OnInit { asyncData: () => this.service2.getNetworkFreightForwarder() } }, - goodsName: { + // goodsName: { + // type: 'string', + // title: '货物名称', + // ui: { + // placeholder: '请选择', + // visibleIf: { + // _$expand: (value: boolean) => value + // }, + // } + // } + goodsNameId: { type: 'string', title: '货物名称', ui: { widget: 'select', placeholder: '请选择', + errors: { required: '请选择货物类型' }, visibleIf: { _$expand: (value: boolean) => value }, - allowClear: true, - asyncData: () => this.getCatalogueMember() - } - } + asyncData: () => + this.service2.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 + }, }, type: 'object' }; diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 4f0258b8..3d7c3305 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -140,6 +140,7 @@ export class ShipperBaseService extends BaseService { getNetworkTransporterById(id: string) { return this.request(this.$api_get_network_freight_forwarder_one, { id }); } + // 根据FullKey获取系统子配置(树) loadConfigByKey(configFullKey:string ='') { return this.http.post(this.$api_getSysConfigTreeByParentFullKey, { configFullKey }).pipe(