diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts index a2b54e1b..ea8e8968 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts @@ -151,8 +151,8 @@ export class PaymentRecordComponent implements OnInit { title: '车队长收款', enum: [ { label: '全部', value: '' }, - { label: '否', value: 0 }, - { label: '是', value: 1 } + { label: '否', value: '0' }, + { label: '是', value: '1' } ], ui: { widget: 'select', diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index 480824f2..52015766 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -29,6 +29,14 @@ export class RechargeRecordComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); + if (this.sf.value.createTime) { + Object.assign(requestOptions.body, { + createTime: { + start: this.sf.value.createTime?.[0] || '', + end: this.sf.value.createTime?.[1] || '' + } + }); + } } return requestOptions; }; @@ -79,7 +87,7 @@ export class RechargeRecordComponent implements OnInit { } exportList() { - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPageByOperator,); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPageByOperator); } private initSF(): SFSchema { @@ -117,9 +125,10 @@ export class RechargeRecordComponent implements OnInit { title: '充值时间', type: 'string', ui: { - widget: 'date', - mode: 'range', - format: 'yyyy-MM-dd' + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + placeholder: '请选择', + nzShowTime: true } as SFDateWidgetSchema }, roleName: { diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html index 603a6634..98ac1a5e 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html @@ -29,8 +29,7 @@ [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}" [compact]="true" [button]="'none'"> -
+
diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 907c9ad5..b0f78c2a 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -177,15 +177,15 @@ export class WithdrawalsRecordComponent { placeholder: '请输入' } }, - refundStatus: { - type: 'string', - title: '提现状态', - ui: { - widget: 'dict-select', - params: { dictKey: 'refund:apply:status' }, - placeholder: '请选择' - } - }, + // refundStatus: { + // type: 'string', + // title: '提现状态', + // ui: { + // widget: 'dict-select', + // params: { dictKey: 'refund:apply:status' }, + // placeholder: '请选择' + // } + // }, createTime: { title: '提现时间', type: 'string', @@ -201,9 +201,6 @@ export class WithdrawalsRecordComponent { title: '账户名称', ui: { placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } } }, accountType: {