From 15fafe787c30d7caca59dc303dfcd903cb45db6e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 19 Jan 2022 10:30:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/risk/risk.component.ts | 9 +++-- .../abnormal-appear.component.ts | 38 +++---------------- .../components/bulk/bulk.component.ts | 7 +++- .../components/vehicle/vehicle.component.ts | 6 ++- 4 files changed, 20 insertions(+), 40 deletions(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 0721e959..e26fce92 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -166,8 +166,8 @@ export class OrderManagementRiskComponent implements OnInit { type: 'string', ui: { widget: 'dict-select', - params: { dictKey: 'goodresourceType' }, - containAllLable: true, + params: { dictKey: 'freight:type' }, + containsAllLable: true, visibleIf: { _$expand: (value: boolean) => value } @@ -179,7 +179,7 @@ export class OrderManagementRiskComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'BulkFreightUnitPriceType' }, - containAllLable: true, + containsAllLable: true, visibleIf: { _$expand: (value: boolean) => value } @@ -191,10 +191,10 @@ export class OrderManagementRiskComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, - allowClear: true, asyncData: () => this.shipperservice.getNetworkFreightForwarder(), }, }, @@ -205,6 +205,7 @@ export class OrderManagementRiskComponent implements OnInit { widget: 'date', mode: 'range', format: 'yyyy-MM-dd', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value } diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts index b4330333..26ea6eb0 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts @@ -118,6 +118,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit { serverSearch: true, searchDebounceTime: 300, searchLoadingText: '搜索中...', + allowClear: true, onSearch: (q: any) => { console.log(q) if (!!q) { @@ -139,6 +140,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit { title: '所属项目', ui: { widget: 'select', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, @@ -146,53 +148,23 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit { this.shipperSrv.getEnterpriseProject() } as SFSelectWidgetSchema, }, - driverId: { + driverName: { title: '承运司机', type: 'string', ui: { - widget: 'select', - serverSearch: true, - searchDebounceTime: 300, - searchLoadingText: '搜索中...', - onSearch: (q: any) => { - if (!!q) { - return this.service - .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 }) - .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum)))) - .toPromise(); - } else { - return of([]); - } - }, visibleIf: { _$expand: (value: boolean) => value } - } as SFSelectWidgetSchema + } }, carNo: { title: '车牌号', type: 'string', ui: { - widget: 'select', - serverSearch: true, - searchDebounceTime: 300, - searchLoadingText: '搜索中...', - onSearch: (q: any) => { - if (!!q) { - return this.service - .request(this.service.$api_get_getCarLicenseListByCarNo, { - carNo: q - }) - .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum)))) - .toPromise(); - } else { - return of([]); - } - }, visibleIf: { _$expand: (value: boolean) => value } - } as SFSelectWidgetSchema + } }, reportingTime: { title: '上报时间', 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 441db41f..5082fc0d 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -92,6 +92,7 @@ tabs = { serverSearch: true, searchDebounceTime: 300, searchLoadingText: '搜索中...', + allowClear: true, onSearch: (q: any) => { console.log(q) if (!!q) { @@ -155,8 +156,8 @@ tabs = { type: 'string', ui: { widget: 'dict-select', - params: { dictKey: 'payment:status' }, - containAllLable:true, + params: { dictKey: 'overall:payment:status' }, + containsAllLable: true, visibleIf: { _$expand: (value: boolean) => value, }, @@ -185,6 +186,7 @@ tabs = { ], ui: { widget: 'select', + allowClear: true, placeholder: '请选择', visibleIf: { _$expand: (value: boolean) => value, @@ -211,6 +213,7 @@ tabs = { widget: 'date', mode: 'range', format: 'yyyy-MM-dd', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, 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 b4695ad7..787421ef 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -90,6 +90,7 @@ export class WaybillManagementVehicleComponent implements OnInit { serverSearch: true, searchDebounceTime: 300, searchLoadingText: '搜索中...', + allowClear: true, onSearch: (q: any) => { console.log(q) if (!!q) { @@ -129,6 +130,7 @@ export class WaybillManagementVehicleComponent implements OnInit { visibleIf: { _$expand: (value: boolean) => value }, + allowClear: true, asyncData: () => this.shipperservice.getEnterpriseProject() } as SFSelectWidgetSchema }, @@ -165,7 +167,7 @@ export class WaybillManagementVehicleComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'overall:payment:status' }, - containAllLable: true, + containsAllLable: true, visibleIf: { _$expand: (value: boolean) => value } @@ -195,6 +197,7 @@ export class WaybillManagementVehicleComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value } @@ -220,6 +223,7 @@ export class WaybillManagementVehicleComponent implements OnInit { widget: 'date', mode: 'range', format: 'yyyy-MM-dd', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value }