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
94a2d86f
Commit
94a2d86f
authored
Apr 28, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复会员角色下拉框不展示的问题
parent
e722d7f0
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
13 deletions
+13
-13
index.tsx
src/pages/member/memberMaintain/index.tsx
+2
-2
index.tsx
src/pages/member/memberPr1/index.tsx
+3
-3
index.tsx
src/pages/member/memberPr2/index.tsx
+3
-3
index.tsx
src/pages/member/memberPrConfirm/index.tsx
+2
-2
index.tsx
src/pages/member/memberPrSubmit/index.tsx
+3
-3
No files found.
src/pages/member/memberMaintain/index.tsx
View file @
94a2d86f
...
...
@@ -254,7 +254,7 @@ const memberMaintain: React.FC<[]> = () => {
outerStatus
=
[],
status
=
[],
memberTypes
=
[],
MemberManage
Roles
=
[],
member
Roles
=
[],
memberLevels
=
[],
source
=
[],
}
=
data
;
...
...
@@ -282,7 +282,7 @@ const memberMaintain: React.FC<[]> = () => {
return
{
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
roleId
:
MemberManage
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
member
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
innerStatus
:
innerStatus
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
...
...
src/pages/member/memberPr1/index.tsx
View file @
94a2d86f
...
...
@@ -157,7 +157,7 @@ const MemberPr1: React.FC<{}> = props => {
cancelText
:
'取消'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
<
void
>
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberValidateStep1Batch
(
members
)
.
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
@@ -184,7 +184,7 @@ const MemberPr1: React.FC<{}> = props => {
const
{
memberTypes
=
[],
status
=
[],
MemberManage
Roles
=
[],
member
Roles
=
[],
memberLevels
=
[],
source
=
[],
}
=
data
;
...
...
@@ -196,7 +196,7 @@ const MemberPr1: React.FC<{}> = props => {
return
{
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
status
:
status
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
roleId
:
MemberManage
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
member
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
};
...
...
src/pages/member/memberPr2/index.tsx
View file @
94a2d86f
...
...
@@ -157,7 +157,7 @@ const MemberPr2: React.FC<{}> = props => {
cancelText
:
'取消'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
<
void
>
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberValidateStep2Batch
(
members
)
.
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
@@ -184,7 +184,7 @@ const MemberPr2: React.FC<{}> = props => {
const
{
memberTypes
=
[],
status
=
[],
MemberManage
Roles
=
[],
member
Roles
=
[],
memberLevels
=
[],
source
=
[],
}
=
data
;
...
...
@@ -196,7 +196,7 @@ const MemberPr2: React.FC<{}> = props => {
return
{
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
status
:
status
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
roleId
:
MemberManage
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
member
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
};
...
...
src/pages/member/memberPrConfirm/index.tsx
View file @
94a2d86f
...
...
@@ -193,7 +193,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
innerStatus
=
[],
memberTypes
=
[],
status
=
[],
MemberManage
Roles
=
[],
member
Roles
=
[],
memberLevels
=
[],
source
=
[],
}
=
data
;
...
...
@@ -212,7 +212,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
return
{
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
status
:
status
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
roleId
:
MemberManage
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
member
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
innerStatus
:
innerStatus
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})).
filter
(
item
=>
item
.
value
!==
0
),
...
...
src/pages/member/memberPrSubmit/index.tsx
View file @
94a2d86f
...
...
@@ -159,7 +159,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
cancelText
:
'取消'
,
onOk
()
{
const
members
=
selectedList
.
map
(
item
=>
({
memberId
:
item
.
memberId
,
validateId
:
item
.
validateId
}));
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
<
void
>
((
resolve
,
reject
)
=>
{
PublicApi
.
postMemberValidateCommitBatch
(
members
)
.
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
...
...
@@ -186,7 +186,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
const
{
memberTypes
=
[],
memberStatus
=
[],
MemberManage
Roles
=
[],
member
Roles
=
[],
memberLevels
=
[],
source
=
[],
status
=
[],
...
...
@@ -206,7 +206,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
return
{
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
status
:
status
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
roleId
:
MemberManage
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
member
Roles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
};
...
...
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