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 8557a511..079024fc 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -280,18 +280,17 @@ export class OrderManagementBulkComponent implements OnInit { asyncData: () => this.getCatalogueMember(), }, }, - appId5: { - type: 'string', + serviceType: { title: '服务类型', + type: 'string', + default: '', ui: { - widget: 'select', - placeholder: '请选择', + widget: 'dict-select', + params: { dictKey: 'ServiceType' }, visibleIf: { _$expand: (value: boolean) => value, }, - allowClear: true, - asyncData: () => this.getCatalogueMember(), - }, + } as SFSelectWidgetSchema, }, }, type: 'object', 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 e93ae6c9..c14a2e49 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -267,18 +267,13 @@ export class OrderManagementVehicleComponent implements OnInit { }, } as SFSelectWidgetSchema, }, - sex5: { + serviceType: { title: '服务类型', type: 'string', - default: 0, - enum: [ - { label: '未知', value: 0 }, - { label: '男', value: 1 }, - { label: '女', value: 2 }, - { label: '保密', value: 3 }, - ], + default: '', ui: { - widget: 'select', + widget: 'dict-select', + params: { dictKey: 'ServiceType' }, visibleIf: { _$expand: (value: boolean) => value, }, diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index ff3c31c0..e09c9514 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -76,13 +76,10 @@ export class SupplyManagementBulkComponent implements OnInit { serviceType: { title: '服务类型', type: 'string', - default: 0, - enum: [ - { label: '抢单', value: 1 }, - { label: '指派', value: 2 }, - ], + default: '', ui: { - widget: 'select', + widget: 'dict-select', + params: { dictKey: 'ServiceType' }, visibleIf: { _$expand: (value: boolean) => value, }, @@ -92,8 +89,9 @@ export class SupplyManagementBulkComponent implements OnInit { title: '结算依据', type: 'string', enum: [ - { label: '以收获为准', value: 1 }, - { label: '以发货为准', value: 2 }, + { label: '全部', value: '' }, + { label: '以收货为准', value: '1' }, + { label: '以发货为准', value: '2' }, ], ui: { widget: 'select', diff --git a/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts index 159310a7..0bb34a43 100644 --- a/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts @@ -1,8 +1,8 @@ /* * @Author: your name * @Date: 2021-12-14 20:39:34 - * @LastEditTime: 2021-12-14 20:41:43 - * @LastEditors: your name + * @LastEditTime: 2021-12-14 20:43:18 + * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\onecar-publish\publish-success\publish-success.component.ts */ @@ -26,6 +26,6 @@ export class PublishSuccessComponent { } view() { - this.router.navigate(['/supply-management/list'], { queryParams: { type: this.type } }); + this.router.navigate(['/supply-management/index'], { queryParams: { type: this.type } }); } } diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 6230a56a..66ece886 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -75,13 +75,10 @@ export class SupplyManagementVehicleComponent implements OnInit { serviceType: { title: '服务类型', type: 'string', - enum: [ - { label: '抢单', value: 1 }, - { label: '指派', value: 2 }, - ], + default: '', ui: { - widget: 'select', - + widget: 'dict-select', + params: { dictKey: 'ServiceType' }, } as SFSelectWidgetSchema, }, goodsName: { @@ -124,14 +121,9 @@ export class SupplyManagementVehicleComponent implements OnInit { auditStatus: { title: '审核状态', type: 'string', - enum: [ - { label: '待审核', value: 1 }, - { label: '审核通过', value: 2 }, - { label: '不通过', value: 3 }, - { label: '已取消', value: 4 }, - ], ui: { - widget: 'select', + widget: 'dict-select', + params: { dictKey: 'GoodsResourceAuditStatus' }, visibleIf: { _$expand: (value: boolean) => value, },