Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
40be5232
Commit
40be5232
authored
Apr 21, 2022
by
lxd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 问题修复
parent
5a1335dc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
12 deletions
+19
-12
index.jsx
src/pages/ReconciliationQuery/index.jsx
+9
-5
data.js
src/pages/SettlementSheet/data.js
+1
-1
index.jsx
src/pages/SettlementSheet/index.jsx
+9
-6
No files found.
src/pages/ReconciliationQuery/index.jsx
View file @
40be5232
...
...
@@ -91,6 +91,14 @@ const ReconciliationQuery = () => {
setloading
(
false
);
}
};
const
queryData
=
async
params
=>
{
const
{
current
,
pageSize
}
=
params
;
setpages
({
current
,
pageSize
});
setselectedRowKeys
([]);
setselectedRows
([]);
const
data
=
await
query
({
...
params
});
return
data
;
};
const
gather
=
{
onDownload
,
...
...
@@ -134,11 +142,7 @@ const ReconciliationQuery = () => {
<
PageHeaderWrapper
>
<
ProTable
actionRef=
{
actionRef
}
request=
{
params
=>
{
const
{
current
,
pageSize
}
=
params
;
setpages
({
current
,
pageSize
});
return
query
({
...
params
});
}
}
request=
{
params
=>
queryData
(
params
)
}
columns=
{
columns
(
pages
)
}
rowKey=
{
r
=>
r
.
id
}
search=
{
{
...
...
src/pages/SettlementSheet/data.js
View file @
40be5232
...
...
@@ -4,7 +4,7 @@ import { Button } from 'antd';
export
const
dateStateEnum
=
{
1
:
{
text
:
'
一周
'
,
maxlength
:
8
},
2
:
{
text
:
'
半个月
'
,
maxlength
:
4
},
3
:
{
text
:
'
半
个月
'
,
maxlength
:
2
},
3
:
{
text
:
'
一
个月
'
,
maxlength
:
2
},
};
export
const
orderStateNum
=
{
...
...
src/pages/SettlementSheet/index.jsx
View file @
40be5232
...
...
@@ -74,7 +74,6 @@ const SettlementSheet = () => {
notification
.
error
({
message
:
'
账单周期不连续
'
});
return
false
;
};
const
onSelectChange
=
(
selectedRowKeys
,
selectedRows
)
=>
{
if
(
selectedRowsList
.
length
>
selectedRows
.
length
)
{
setselectedRowKeys
(
selectedRowKeys
);
...
...
@@ -99,6 +98,14 @@ const SettlementSheet = () => {
setloading
(
false
);
}
};
const
queryData
=
async
params
=>
{
const
{
current
,
pageSize
}
=
params
;
setpages
({
current
,
pageSize
});
setselectedRowKeys
([]);
setselectedRows
([]);
const
data
=
await
query
({
...
params
});
return
data
;
};
const
onToolBarRender
=
toolBarRender
(
paymentOrder
);
...
...
@@ -140,11 +147,7 @@ const SettlementSheet = () => {
<
PageHeaderWrapper
>
<
ProTable
actionRef=
{
actionRef
}
request=
{
params
=>
{
const
{
current
,
pageSize
}
=
params
;
setpages
({
current
,
pageSize
});
return
query
({
...
params
});
}
}
request=
{
params
=>
queryData
(
params
)
}
columns=
{
columns
(
pages
)
}
rowKey=
{
r
=>
r
.
settleBatchNo
}
search=
{
{
...
...
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