Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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
shenshaokai
jinfa-admin
Commits
f1a774c3
Commit
f1a774c3
authored
Sep 09, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixbug、对接批量操作
parent
995ecadb
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
151 additions
and
85 deletions
+151
-85
CustomAddArray.tsx
src/components/NiceForm/components/CustomAddArray.tsx
+10
-5
index.tsx
src/pages/member/memberPr1/index.tsx
+35
-20
index.tsx
src/pages/member/memberPr2/index.tsx
+35
-20
index.tsx
src/pages/member/memberPrConfirm/index.tsx
+35
-20
index.tsx
src/pages/member/memberPrSubmit/index.tsx
+35
-20
request.ts
src/utils/request.ts
+1
-0
No files found.
src/components/NiceForm/components/CustomAddArray.tsx
View file @
f1a774c3
...
@@ -33,15 +33,20 @@ const CustomAddArray = (props) => {
...
@@ -33,15 +33,20 @@ const CustomAddArray = (props) => {
const
onAdd
=
()
=>
mutators
.
push
(
schema
.
items
.
getEmptyValue
())
const
onAdd
=
()
=>
mutators
.
push
(
schema
.
items
.
getEmptyValue
())
const
onRemove
=
index
=>
mutators
.
remove
(
index
)
const
onRemove
=
index
=>
mutators
.
remove
(
index
)
return
<
div
>
return
(
{
toArr
(
value
).
map
((
item
,
index
,
arr
)
=>
{
<
div
>
return
<
RowStyleLayout
{
...
componentProps
}
key=
{
index
}
>
{
toArr
(
value
).
map
((
item
,
index
,
arr
)
=>
(
<
RowStyleLayout
{
...
componentProps
}
key=
{
index
}
>
<
SchemaField
path=
{
FormPath
.
parse
(
path
).
concat
(
index
)
}
onlyRenderProperties
/>
<
SchemaField
path=
{
FormPath
.
parse
(
path
).
concat
(
index
)
}
onlyRenderProperties
/>
<
Button
onClick=
{
onAdd
.
bind
(
null
,
index
)
}
type=
'primary'
>
+
</
Button
>
<
Button
onClick=
{
onAdd
.
bind
(
null
,
index
)
}
type=
'primary'
>
+
</
Button
>
{
index
!==
0
&&
<
Button
onClick=
{
onRemove
.
bind
(
null
,
index
)
}
>
-
</
Button
>
}
<
Button
onClick=
{
onRemove
.
bind
(
null
,
index
)
}
>
-
</
Button
>
</
RowStyleLayout
>
</
RowStyleLayout
>
})
}
))
}
{
(
!
value
||
!
value
.
length
)
&&
(
<
Button
onClick=
{
onAdd
}
type=
'primary'
>
+
</
Button
>
)
}
</
div
>
</
div
>
)
}
}
CustomAddArray
.
isFieldComponent
=
true
CustomAddArray
.
isFieldComponent
=
true
...
...
src/pages/member/memberPr1/index.tsx
View file @
f1a774c3
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
history
}
from
'umi'
;
import
{
Card
,
Space
,
Button
,
Badge
,
Popconfirm
}
from
'antd'
;
import
{
Card
,
Space
,
Button
,
Badge
,
Modal
,
message
}
from
'antd'
;
import
{
ClockCircleOutlined
}
from
'@ant-design/icons'
;
import
{
ClockCircleOutlined
,
QuestionCircleOutlined
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
{
StandardTable
}
from
'god'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
{
createFormActions
}
from
'@formily/antd'
;
...
@@ -20,6 +20,8 @@ import {
...
@@ -20,6 +20,8 @@ import {
import
{
coverColFiltersItem
}
from
'../utils'
;
import
{
coverColFiltersItem
}
from
'../utils'
;
import
StatusTag
from
'../components/StatusTag'
;
import
StatusTag
from
'../components/StatusTag'
;
const
{
confirm
}
=
Modal
;
const
formActions
=
createFormActions
();
const
formActions
=
createFormActions
();
const
MemberPr1
:
React
.
FC
<
{}
>
=
props
=>
{
const
MemberPr1
:
React
.
FC
<
{}
>
=
props
=>
{
...
@@ -120,13 +122,9 @@ const MemberPr1: React.FC<{}> = props => {
...
@@ -120,13 +122,9 @@ const MemberPr1: React.FC<{}> = props => {
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
defaultColumns
);
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
defaultColumns
);
const
rowSelection
=
{
const
rowSelection
=
{
onChange
:
(
selectedRowKeys
:
any
,
selectedRows
:
any
)
=>
{
onChange
:
(
keys
:
any
,
rows
:
{}[])
=>
{
let
result
=
selectedRows
.
map
(
v
=>
({
setSelectedRowKeys
(
keys
);
memberId
:
v
.
memberId
,
setSelectList
(
rows
);
validateId
:
v
.
validateId
,
}));
setSelectedRowKeys
(
selectedRowKeys
);
setSelectList
(
result
);
},
},
selectedRowKeys
:
selectedRowKeys
,
selectedRowKeys
:
selectedRowKeys
,
};
};
...
@@ -137,7 +135,32 @@ const MemberPr1: React.FC<{}> = props => {
...
@@ -137,7 +135,32 @@ const MemberPr1: React.FC<{}> = props => {
};
};
const
handleBatch
=
()
=>
{
const
handleBatch
=
()
=>
{
console
.
log
(
'批量'
)
if
(
!
selectedList
.
length
)
{
message
.
warning
(
'未选择任何会员'
);
return
;
}
confirm
({
title
:
'提示'
,
icon
:
<
QuestionCircleOutlined
/>,
content
:
'确定要审核通过选中的会员吗?'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberValidateStep1Batch
(
members
)
.
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
ref
.
current
.
reload
();
setSelectedRowKeys
([]);
resolve
();
}
reject
();
})
.
catch
(()
=>
{
reject
();
});
});
},
});
};
};
// 初始化高级筛选选项
// 初始化高级筛选选项
...
@@ -190,17 +213,9 @@ const MemberPr1: React.FC<{}> = props => {
...
@@ -190,17 +213,9 @@ const MemberPr1: React.FC<{}> = props => {
const
controllerBtns
=
(
const
controllerBtns
=
(
<
Space
>
<
Space
>
<
Popconfirm
<
Button
onClick=
{
handleBatch
}
>
title=
"是否继续操作 ?"
批量审核通过
placement=
"bottom"
onConfirm=
{
handleBatch
}
okText=
"是"
cancelText=
"否"
>
<
Button
>
批量提交审核
</
Button
>
</
Button
>
</
Popconfirm
>
</
Space
>
</
Space
>
);
);
...
...
src/pages/member/memberPr2/index.tsx
View file @
f1a774c3
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
history
}
from
'umi'
;
import
{
Card
,
Space
,
Button
,
Badge
,
Popconfirm
}
from
'antd'
;
import
{
Card
,
Space
,
Button
,
Badge
,
Modal
,
message
}
from
'antd'
;
import
{
ClockCircleOutlined
}
from
'@ant-design/icons'
;
import
{
ClockCircleOutlined
,
QuestionCircleOutlined
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
{
StandardTable
}
from
'god'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
{
createFormActions
}
from
'@formily/antd'
;
...
@@ -20,6 +20,8 @@ import {
...
@@ -20,6 +20,8 @@ import {
import
{
coverColFiltersItem
}
from
'../utils'
;
import
{
coverColFiltersItem
}
from
'../utils'
;
import
StatusTag
from
'../components/StatusTag'
;
import
StatusTag
from
'../components/StatusTag'
;
const
{
confirm
}
=
Modal
;
const
formActions
=
createFormActions
();
const
formActions
=
createFormActions
();
const
MemberPr2
:
React
.
FC
<
{}
>
=
props
=>
{
const
MemberPr2
:
React
.
FC
<
{}
>
=
props
=>
{
...
@@ -120,13 +122,9 @@ const MemberPr2: React.FC<{}> = props => {
...
@@ -120,13 +122,9 @@ const MemberPr2: React.FC<{}> = props => {
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
defaultColumns
);
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
defaultColumns
);
const
rowSelection
=
{
const
rowSelection
=
{
onChange
:
(
selectedRowKeys
:
any
,
selectedRows
:
any
)
=>
{
onChange
:
(
keys
:
any
,
rows
:
{}[])
=>
{
let
result
=
selectedRows
.
map
(
v
=>
({
setSelectedRowKeys
(
keys
);
memberId
:
v
.
memberId
,
setSelectList
(
rows
);
validateId
:
v
.
validateId
,
}));
setSelectedRowKeys
(
selectedRowKeys
);
setSelectList
(
result
);
},
},
selectedRowKeys
:
selectedRowKeys
,
selectedRowKeys
:
selectedRowKeys
,
};
};
...
@@ -137,7 +135,32 @@ const MemberPr2: React.FC<{}> = props => {
...
@@ -137,7 +135,32 @@ const MemberPr2: React.FC<{}> = props => {
};
};
const
handleBatch
=
()
=>
{
const
handleBatch
=
()
=>
{
console
.
log
(
'批量'
)
if
(
!
selectedList
.
length
)
{
message
.
warning
(
'未选择任何会员'
);
return
;
}
confirm
({
title
:
'提示'
,
icon
:
<
QuestionCircleOutlined
/>,
content
:
'确定要审核通过选中的会员吗?'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberValidateStep2Batch
(
members
)
.
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
ref
.
current
.
reload
();
setSelectedRowKeys
([]);
resolve
();
}
reject
();
})
.
catch
(()
=>
{
reject
();
});
});
},
});
};
};
// 初始化高级筛选选项
// 初始化高级筛选选项
...
@@ -190,17 +213,9 @@ const MemberPr2: React.FC<{}> = props => {
...
@@ -190,17 +213,9 @@ const MemberPr2: React.FC<{}> = props => {
const
controllerBtns
=
(
const
controllerBtns
=
(
<
Space
>
<
Space
>
<
Popconfirm
<
Button
onClick=
{
handleBatch
}
>
title=
"是否继续操作 ?"
批量审核通过
placement=
"bottom"
onConfirm=
{
handleBatch
}
okText=
"是"
cancelText=
"否"
>
<
Button
>
批量提交审核
</
Button
>
</
Button
>
</
Popconfirm
>
</
Space
>
</
Space
>
);
);
...
...
src/pages/member/memberPrConfirm/index.tsx
View file @
f1a774c3
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
history
}
from
'umi'
;
import
{
Card
,
Space
,
Button
,
Badge
,
Popconfirm
}
from
'antd'
;
import
{
Card
,
Space
,
Button
,
Badge
,
Modal
,
message
}
from
'antd'
;
import
{
ClockCircleOutlined
}
from
'@ant-design/icons'
;
import
{
ClockCircleOutlined
,
QuestionCircleOutlined
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
{
StandardTable
}
from
'god'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
{
createFormActions
}
from
'@formily/antd'
;
...
@@ -20,6 +20,8 @@ import {
...
@@ -20,6 +20,8 @@ import {
import
{
coverColFiltersItem
}
from
'../utils'
;
import
{
coverColFiltersItem
}
from
'../utils'
;
import
StatusTag
from
'../components/StatusTag'
;
import
StatusTag
from
'../components/StatusTag'
;
const
{
confirm
}
=
Modal
;
const
formActions
=
createFormActions
();
const
formActions
=
createFormActions
();
const
MemberPrConfirm
:
React
.
FC
<
{}
>
=
props
=>
{
const
MemberPrConfirm
:
React
.
FC
<
{}
>
=
props
=>
{
...
@@ -120,13 +122,9 @@ const MemberPrConfirm: React.FC<{}> = props => {
...
@@ -120,13 +122,9 @@ const MemberPrConfirm: React.FC<{}> = props => {
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
defaultColumns
);
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
defaultColumns
);
const
rowSelection
=
{
const
rowSelection
=
{
onChange
:
(
selectedRowKeys
:
any
,
selectedRows
:
any
)
=>
{
onChange
:
(
keys
:
any
,
rows
:
{}[])
=>
{
let
result
=
selectedRows
.
map
(
v
=>
({
setSelectedRowKeys
(
keys
);
memberId
:
v
.
memberId
,
setSelectList
(
rows
);
validateId
:
v
.
validateId
,
}));
setSelectedRowKeys
(
selectedRowKeys
);
setSelectList
(
result
);
},
},
selectedRowKeys
:
selectedRowKeys
,
selectedRowKeys
:
selectedRowKeys
,
};
};
...
@@ -137,7 +135,32 @@ const MemberPrConfirm: React.FC<{}> = props => {
...
@@ -137,7 +135,32 @@ const MemberPrConfirm: React.FC<{}> = props => {
};
};
const
handleBatch
=
()
=>
{
const
handleBatch
=
()
=>
{
console
.
log
(
'批量'
)
if
(
!
selectedList
.
length
)
{
message
.
warning
(
'未选择任何会员'
);
return
;
}
confirm
({
title
:
'提示'
,
icon
:
<
QuestionCircleOutlined
/>,
content
:
'确定要审核通过选中的会员吗?'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberValidateConfirmBatch
(
members
)
.
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
ref
.
current
.
reload
();
setSelectedRowKeys
([]);
resolve
();
}
reject
();
})
.
catch
(()
=>
{
reject
();
});
});
},
});
};
};
// 初始化高级筛选选项
// 初始化高级筛选选项
...
@@ -190,17 +213,9 @@ const MemberPrConfirm: React.FC<{}> = props => {
...
@@ -190,17 +213,9 @@ const MemberPrConfirm: React.FC<{}> = props => {
const
controllerBtns
=
(
const
controllerBtns
=
(
<
Space
>
<
Space
>
<
Popconfirm
<
Button
onClick=
{
handleBatch
}
>
title=
"是否继续操作 ?"
批量确认审核通过
placement=
"bottom"
onConfirm=
{
handleBatch
}
okText=
"是"
cancelText=
"否"
>
<
Button
>
批量提交审核
</
Button
>
</
Button
>
</
Popconfirm
>
</
Space
>
</
Space
>
);
);
...
...
src/pages/member/memberPrSubmit/index.tsx
View file @
f1a774c3
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
{
history
}
from
'umi'
;
import
{
history
}
from
'umi'
;
import
{
Card
,
Space
,
Button
,
Badge
,
Popconfirm
}
from
'antd'
;
import
{
Card
,
Space
,
Button
,
Badge
,
Modal
,
message
}
from
'antd'
;
import
{
ClockCircleOutlined
}
from
'@ant-design/icons'
;
import
{
ClockCircleOutlined
,
QuestionCircleOutlined
}
from
'@ant-design/icons'
;
import
{
StandardTable
}
from
'god'
;
import
{
StandardTable
}
from
'god'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
createFormActions
}
from
'@formily/antd'
;
import
{
createFormActions
}
from
'@formily/antd'
;
...
@@ -20,6 +20,8 @@ import {
...
@@ -20,6 +20,8 @@ import {
import
{
coverColFiltersItem
}
from
'../utils'
;
import
{
coverColFiltersItem
}
from
'../utils'
;
import
StatusTag
from
'../components/StatusTag'
;
import
StatusTag
from
'../components/StatusTag'
;
const
{
confirm
}
=
Modal
;
const
formActions
=
createFormActions
();
const
formActions
=
createFormActions
();
const
MemberPrSubmit
:
React
.
FC
<
{}
>
=
props
=>
{
const
MemberPrSubmit
:
React
.
FC
<
{}
>
=
props
=>
{
...
@@ -120,13 +122,9 @@ const MemberPrSubmit: React.FC<{}> = props => {
...
@@ -120,13 +122,9 @@ const MemberPrSubmit: React.FC<{}> = props => {
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
defaultColumns
);
const
[
columns
,
setColumns
]
=
useState
<
any
[]
>
(
defaultColumns
);
const
rowSelection
=
{
const
rowSelection
=
{
onChange
:
(
selectedRowKeys
:
any
,
selectedRows
:
any
)
=>
{
onChange
:
(
keys
:
any
,
rows
:
{}[])
=>
{
let
result
=
selectedRows
.
map
(
v
=>
({
setSelectedRowKeys
(
keys
);
memberId
:
v
.
memberId
,
setSelectList
(
rows
);
validateId
:
v
.
validateId
,
}));
setSelectedRowKeys
(
selectedRowKeys
);
setSelectList
(
result
);
},
},
selectedRowKeys
:
selectedRowKeys
,
selectedRowKeys
:
selectedRowKeys
,
};
};
...
@@ -137,7 +135,32 @@ const MemberPrSubmit: React.FC<{}> = props => {
...
@@ -137,7 +135,32 @@ const MemberPrSubmit: React.FC<{}> = props => {
};
};
const
handleBatch
=
()
=>
{
const
handleBatch
=
()
=>
{
console
.
log
(
'批量'
)
if
(
!
selectedList
.
length
)
{
message
.
warning
(
'未选择任何会员'
);
return
;
}
confirm
({
title
:
'提示'
,
icon
:
<
QuestionCircleOutlined
/>,
content
:
'确定要审核通过选中的会员吗?'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberValidateCommitBatch
(
members
)
.
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
ref
.
current
.
reload
();
setSelectedRowKeys
([]);
resolve
();
}
reject
();
})
.
catch
(()
=>
{
reject
();
});
});
},
});
};
};
// 初始化高级筛选选项
// 初始化高级筛选选项
...
@@ -190,17 +213,9 @@ const MemberPrSubmit: React.FC<{}> = props => {
...
@@ -190,17 +213,9 @@ const MemberPrSubmit: React.FC<{}> = props => {
const
controllerBtns
=
(
const
controllerBtns
=
(
<
Space
>
<
Space
>
<
Popconfirm
<
Button
onClick=
{
handleBatch
}
>
title=
"是否继续操作 ?"
批量审核通过
placement=
"bottom"
onConfirm=
{
handleBatch
}
okText=
"是"
cancelText=
"否"
>
<
Button
>
批量提交审核
</
Button
>
</
Button
>
</
Popconfirm
>
</
Space
>
</
Space
>
);
);
...
...
src/utils/request.ts
View file @
f1a774c3
...
@@ -111,6 +111,7 @@ class ApiRequest {
...
@@ -111,6 +111,7 @@ class ApiRequest {
options
.
ctlType
===
'message'
&&
message
.
success
(
res
.
message
)
options
.
ctlType
===
'message'
&&
message
.
success
(
res
.
message
)
resolve
(
res
)
resolve
(
res
)
}
else
{
}
else
{
resolve
(
res
)
message
.
error
(
res
.
message
)
message
.
error
(
res
.
message
)
}
}
...
...
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