From eb015bf42ea05665bc7aa74c3a55c3a0249ac253 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 16:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic-table/basic-table.component.ts | 6 +- .../components/bulk/bulk.component.ts | 2 + .../receipts-audit.component.ts | 60 ++++++------------- .../components/risk/risk.component.ts | 16 ++--- 4 files changed, 31 insertions(+), 53 deletions(-) diff --git a/src/app/routes/commom/components/basic-table/basic-table.component.ts b/src/app/routes/commom/components/basic-table/basic-table.component.ts index ab7c5e86..dfe8a25d 100644 --- a/src/app/routes/commom/components/basic-table/basic-table.component.ts +++ b/src/app/routes/commom/components/basic-table/basic-table.component.ts @@ -1,8 +1,8 @@ import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core'; import { SFComponent, SFSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { fromEvent, Subscription } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; -import { SearchDrawerService } from 'src/app/shared/components/search-drawer/search-drawer.service'; @Component({ template: '' @@ -40,14 +40,14 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy { } else { const drawer = this.searchDrawerService.create(this.sfValue, this.schema); this.drawer.push( - drawer.initEvent.subscribe(sf => { + drawer.initEvent.subscribe((sf: SFComponent) => { if (sf) { this.sf = sf; } }) ); this.drawer.push( - drawer.closeEvent.subscribe(res => { + drawer.closeEvent.subscribe((res: Record) => { this.sfValue = res; if (res) { this.search(); 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 3c16edf1..5db9b5ff 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -103,6 +103,8 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements } }); } + console.log(requestOptions); + this.loading = true; return requestOptions; }; diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index 31987466..57c825d0 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -53,14 +53,14 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i if (this.resourceStatus) { a.auditStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sfValue || {}); delete params._$expand; return { ...a, ...params, createTime: { - start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '' + start: this.sfValue?.createTime?.[0] || '', + end: this.sfValue?.createTime?.[1] || '' } }; } @@ -69,15 +69,15 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i if (this.resourceStatus) { a.auditStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sfValue || {}); delete params._$expand; - if (this.sf) { + if (this.sfValue) { Object.assign(requestOptions.body, { ...a, ...params, createTime: { - start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '' + start: this.sfValue?.createTime?.[0] || '', + end: this.sfValue?.createTime?.[1] || '' } }); } @@ -170,9 +170,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, onSearch: (q: any) => { let str = q.replace(/^\s+|\s+$/g, ''); if (str) { @@ -195,54 +192,42 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i ui: { widget: 'select', placeholder: '请先选择货主', - visibleIf: { - _$expand: (value: boolean) => value - } + } as SFSelectWidgetSchema }, loadingPlace: { type: 'string', title: '装货地', ui: { - visibleIf: { - _$expand: (value: boolean) => value - } + } }, dischargePlace: { type: 'string', title: '卸货地', ui: { - visibleIf: { - _$expand: (value: boolean) => value - } + } }, driverName: { title: '承运司机', type: 'string', ui: { - visibleIf: { - _$expand: (value: boolean) => value - } + } }, carNo: { title: '车牌号', type: 'string', ui: { - visibleIf: { - _$expand: (value: boolean) => value - } + } }, carCaptainName: { title: '车队长', type: 'string', ui: { - visibleIf: { - _$expand: (value: boolean) => value - } + } }, paymentStatus: { @@ -252,9 +237,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i widget: 'dict-select', params: { dictKey: 'overall:payment:status' }, containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + } as SFSelectWidgetSchema }, enterpriseInfoId: { @@ -264,9 +247,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i widget: 'select', placeholder: '请选择', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, @@ -278,9 +258,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i widget: 'dict-select', params: { dictKey: 'service:type' }, containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + } as SFSelectWidgetSchema }, billStatus: { @@ -291,9 +269,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i widget: 'dict-select', params: { dictKey: 'bill:status' }, containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + } as SFSelectWidgetSchema }, loadingDocuments: { @@ -310,9 +286,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i widget: 'select', placeholder: '请选择', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - } + } } }, 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 3e15ac53..c47cb875 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -51,14 +51,14 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements if (this.resourceStatus) { a.representationsStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sfValue || {}); delete params._$expand; return { ...a, ...params, createTime: { - start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '' + start: this.sfValue?.createTime?.[0] || '', + end: this.sfValue?.createTime?.[1] || '' } }; } @@ -69,18 +69,20 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements a.representationsStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sfValue || {}); delete params._$expand; - if (this.sf) { + if (this.sfValue) { Object.assign(requestOptions.body, { ...a, ...params, createTime: { - start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '' + start: this.sfValue?.createTime?.[0] || '', + end: this.sfValue?.createTime?.[1] || '' } }); } + console.log(requestOptions); + this.loading = true; return requestOptions; };