Commit 9b49aaa2 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:处理高级筛选重置后无法清空数字和时间范围值

parent 47051a02
...@@ -19,6 +19,12 @@ const DateRangePickerUnix = (props) => { ...@@ -19,6 +19,12 @@ const DateRangePickerUnix = (props) => {
} }
} }
let v = []
if(value.length) {
let startTime = moment(Number(value[0])).format('YYYY-MM-DD HH:mm:ss')
let endTime = moment(Number(value[1])).format('YYYY-MM-DD HH:mm:ss')
v = [moment(startTime, 'YYYY-MM-DD HH:mm:ss'), moment(endTime, 'YYYY-MM-DD HH:mm:ss')]
}
return ( return (
<RangePicker <RangePicker
...@@ -26,7 +32,7 @@ const DateRangePickerUnix = (props) => { ...@@ -26,7 +32,7 @@ const DateRangePickerUnix = (props) => {
style={{minWidth: 160}} style={{minWidth: 160}}
placeholder={placeholder} placeholder={placeholder}
onChange={handleChange} onChange={handleChange}
format="YYYY-MM-DD HH:mm:ss" value={v}
{...rest} {...rest}
/> />
) )
......
...@@ -87,14 +87,14 @@ const CheckWithdraw: React.FC<{}> = () => { ...@@ -87,14 +87,14 @@ const CheckWithdraw: React.FC<{}> = () => {
} }
const clickUp = (r: any) => { const clickUp = (r: any) => {
let params = { let params = {
tradeCode: r.tradeCode, tradeCode: r.tradeCode,
id: r.memberAssetAccount.id, id: r.memberAssetAccount.id,
tradeId: r.id, tradeId: r.id,
amount: r.tradeMoney, amount: r.tradeMoney,
preview: r.preview, preview: r.preview,
status: r.status, status: r.status,
} }
history.push(`/memberCenter/payandSettle/amountAccountManage/checkWithdraw/detail?detailinfo=${btoa(JSON.stringify(params))}`) history.push(`/memberCenter/payandSettle/amountAccountManage/checkWithdraw/detail?detailinfo=${btoa(JSON.stringify(params))}`)
} }
...@@ -128,6 +128,14 @@ const CheckWithdraw: React.FC<{}> = () => { ...@@ -128,6 +128,14 @@ const CheckWithdraw: React.FC<{}> = () => {
</Space> </Space>
); );
const processWithdrawRowSelection = {
getCheckboxProps: record => ({
disabled: record.status !== 1,
name: record.name,
}),
...withdrawRowSelection
}
return ( return (
<PageHeaderWrapper> <PageHeaderWrapper>
<Card> <Card>
...@@ -135,7 +143,7 @@ const CheckWithdraw: React.FC<{}> = () => { ...@@ -135,7 +143,7 @@ const CheckWithdraw: React.FC<{}> = () => {
columns={columns} columns={columns}
currentRef={ref} currentRef={ref}
tableProps={{ rowKey: "id" }} tableProps={{ rowKey: "id" }}
rowSelection={withdrawRowSelection} rowSelection={processWithdrawRowSelection}
fetchTableData={(params: any) => fetchData(params)} fetchTableData={(params: any) => fetchData(params)}
controlRender={ controlRender={
<NiceForm <NiceForm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment