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 6c2eca4c..ed4d1d0a 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -81,10 +81,16 @@ tabs = { if(this.resourceStatus) { a.billStatus = this.resourceStatus; } - return { + const params: any = Object.assign({}, this.sf?.value || {}); + delete params._$expand; + return { ...a, - ...this.sf?.value, - }; + ...params, + createTime: { + start: this.sf?.value?.createTime?.[0] || '', + end: this.sf?.value?.createTime?.[1] || '', + }, + }; } get selectedRows() { return this.st?.list.filter((item) => item.checked) || []; 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 c09e0002..1abe9d9f 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -102,14 +102,6 @@ resourceStatus: any; end: this.sf?.value?.createTime?.[1] || '', }, }; - // const a:any = {}; - // if(this.resourceStatus) { - // a.billStatus = this.resourceStatus; - // } - // return { - // ...a, - // ...this.sf?.value, - // }; } get selectedRows() { return this.st?.list.filter((item) => item.checked) || [];