Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
陈智峰
jinfa-platform
Commits
9b49aaa2
Commit
9b49aaa2
authored
Dec 16, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:处理高级筛选重置后无法清空数字和时间范围值
parent
47051a02
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
DateRangePickerUnix.tsx
src/components/NiceForm/components/DateRangePickerUnix.tsx
+7
-1
index.tsx
.../payandSettle/amountAccountManage/checkWithdraw/index.tsx
+11
-3
No files found.
src/components/NiceForm/components/DateRangePickerUnix.tsx
View file @
9b49aaa2
...
...
@@ -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
(
<
RangePicker
...
...
@@ -26,7 +32,7 @@ const DateRangePickerUnix = (props) => {
style=
{
{
minWidth
:
160
}
}
placeholder=
{
placeholder
}
onChange=
{
handleChange
}
format=
"YYYY-MM-DD HH:mm:ss"
value=
{
v
}
{
...
rest
}
/>
)
...
...
src/pages/payandSettle/amountAccountManage/checkWithdraw/index.tsx
View file @
9b49aaa2
...
...
@@ -87,14 +87,14 @@ const CheckWithdraw: React.FC<{}> = () => {
}
const
clickUp
=
(
r
:
any
)
=>
{
let
params
=
{
let
params
=
{
tradeCode
:
r
.
tradeCode
,
id
:
r
.
memberAssetAccount
.
id
,
tradeId
:
r
.
id
,
amount
:
r
.
tradeMoney
,
preview
:
r
.
preview
,
status
:
r
.
status
,
}
}
history
.
push
(
`/memberCenter/payandSettle/amountAccountManage/checkWithdraw/detail?detailinfo=
${
btoa
(
JSON
.
stringify
(
params
))}
`
)
}
...
...
@@ -128,6 +128,14 @@ const CheckWithdraw: React.FC<{}> = () => {
</
Space
>
);
const
processWithdrawRowSelection
=
{
getCheckboxProps
:
record
=>
({
disabled
:
record
.
status
!==
1
,
name
:
record
.
name
,
}),
...
withdrawRowSelection
}
return
(
<
PageHeaderWrapper
>
<
Card
>
...
...
@@ -135,7 +143,7 @@ const CheckWithdraw: React.FC<{}> = () => {
columns=
{
columns
}
currentRef=
{
ref
}
tableProps=
{
{
rowKey
:
"id"
}
}
rowSelection=
{
w
ithdrawRowSelection
}
rowSelection=
{
processW
ithdrawRowSelection
}
fetchTableData=
{
(
params
:
any
)
=>
fetchData
(
params
)
}
controlRender=
{
<
NiceForm
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment