Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

车辆对接

Browse Source
This commit is contained in:
wangshiming
2022-01-12 14:33:13 +08:00
parent 22ee46d6b6
commit 0352cd2f08
5 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -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: '服务类型',

3
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -305,13 +305,10 @@ resourceStatus: any;
type: 'string',
title: '货物名称',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
},
allowClear: true,
asyncData: () => this.getCatalogueMember(),
},
},
serviceType: {

17
src/app/routes/waybill-management/components/bulk/bulk.component.ts
View File

@ -261,18 +261,25 @@ tabs = {
},
} as SFSelectWidgetSchema,
},
goodsName: {
goodsNameId: {
type: 'string',
title: '货物名称',
ui: {
widget: 'select',
placeholder: '请选择',
errors: { required: '请选择货物类型' },
visibleIf: {
_$expand: (value: boolean) => value,
},
allowClear: true,
asyncData: () => this.getCatalogueMember(),
_$expand: (value: boolean) => value
},
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: '服务类型',

30
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -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'
};

1
src/app/shared/services/business/shipper-base.service.ts
View File

@ -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(