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
d5bfa0a2
Commit
d5bfa0a2
authored
Sep 22, 2020
by
Bill
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev
parents
2dd0902c
c684ef58
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
17 deletions
+29
-17
constant.tsx
src/pages/member/constant.tsx
+10
-9
index.tsx
src/pages/member/memberMaintain/index.tsx
+15
-4
index.ts
src/pages/member/memberPr1/schema/index.ts
+1
-1
index.ts
src/pages/member/memberPr2/schema/index.ts
+1
-1
index.ts
src/pages/member/memberPrConfirm/schema/index.ts
+1
-1
index.ts
src/pages/member/memberPrSubmit/schema/index.ts
+1
-1
No files found.
src/pages/member/constant.tsx
View file @
d5bfa0a2
...
@@ -54,17 +54,17 @@ export const MEMBER_OUTER_STATUS_TYPE = {
...
@@ -54,17 +54,17 @@ export const MEMBER_OUTER_STATUS_TYPE = {
// 会员内部状态 Tag badge map
// 会员内部状态 Tag badge map
export
const
MEMBER_INNER_STATUS_BADGE_COLOR
=
{
export
const
MEMBER_INNER_STATUS_BADGE_COLOR
=
{
[
MEMBER_INNER_STATUS_REGISTERED
]:
'#42526E'
,
[
MEMBER_INNER_STATUS_REGISTERED
]:
'#42526E'
,
[
MEMBER_INNER_STATUS_UNCOMMITTED
]:
'#
3F7ED2
'
,
[
MEMBER_INNER_STATUS_UNCOMMITTED
]:
'#
669EDE
'
,
[
MEMBER_INNER_STATUS_UNREVIEWED_1
]:
'#FF
991F
'
,
[
MEMBER_INNER_STATUS_UNREVIEWED_1
]:
'#FF
C400
'
,
[
MEMBER_INNER_STATUS_UNREVIEWED_2
]:
'#FF
991F
'
,
[
MEMBER_INNER_STATUS_UNREVIEWED_2
]:
'#FF
C400
'
,
[
MEMBER_INNER_STATUS_FAILED
]:
'#E
63F3B
'
,
[
MEMBER_INNER_STATUS_FAILED
]:
'#E
F6260
'
,
[
MEMBER_INNER_STATUS_SUCCESS
]:
'#
00B37A
'
,
[
MEMBER_INNER_STATUS_SUCCESS
]:
'#
41CC9E
'
,
};
};
// 会员外部状态 Tag badge map
// 会员外部状态 Tag badge map
export
const
MEMBER_OUTER_STATUS_BADGE_COLOR
=
{
export
const
MEMBER_OUTER_STATUS_BADGE_COLOR
=
{
[
MEMBER_OUTER_STATUS_UNCOMMITTED
]:
'#
3F7ED2
'
,
[
MEMBER_OUTER_STATUS_UNCOMMITTED
]:
'#
669EDE
'
,
[
MEMBER_OUTER_STATUS_UNREVIEWED
]:
'#FF
991F
'
,
[
MEMBER_OUTER_STATUS_UNREVIEWED
]:
'#FF
C400
'
,
[
MEMBER_OUTER_STATUS_FAILED
]:
'#E
63F3B
'
,
[
MEMBER_OUTER_STATUS_FAILED
]:
'#E
F6260
'
,
[
MEMBER_OUTER_STATUS_SUCCESS
]:
'#
00B37A
'
,
[
MEMBER_OUTER_STATUS_SUCCESS
]:
'#
41CC9E
'
,
};
};
\ No newline at end of file
src/pages/member/memberMaintain/index.tsx
View file @
d5bfa0a2
...
@@ -28,6 +28,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
...
@@ -28,6 +28,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
useAsyncInitSelect
}
from
'@/formSchema/effects/useAsyncInitSelect'
;
import
{
useAsyncInitSelect
}
from
'@/formSchema/effects/useAsyncInitSelect'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
{
PublicApi
}
from
'@/services/api'
;
import
moment
from
'moment'
;
import
{
import
{
MEMBER_STATUS_NORMAL
,
MEMBER_STATUS_NORMAL
,
MEMBER_INNER_STATUS_SUCCESS
,
MEMBER_INNER_STATUS_SUCCESS
,
...
@@ -52,8 +53,18 @@ const memberMaintain: React.FC<[]> = () => {
...
@@ -52,8 +53,18 @@ const memberMaintain: React.FC<[]> = () => {
const
[
visibleModal
,
setVisibleModal
]
=
useState
(
false
);
const
[
visibleModal
,
setVisibleModal
]
=
useState
(
false
);
const
fetchData
=
async
(
params
:
any
)
=>
{
const
fetchData
=
async
(
params
:
any
)
=>
{
let
res
=
await
PublicApi
.
getMemberMaintenancePage
(
params
);
console
.
log
(
'params'
,
params
)
return
res
.
data
;
const
{
startDate
,
endDate
}
=
params
;
const
payload
=
params
;
const
res
=
await
PublicApi
.
getMemberMaintenancePage
({
...
params
,
startDate
:
startDate
?
+
startDate
:
null
,
endDate
:
endDate
?
+
endDate
:
null
,
});
if
(
res
.
code
===
1000
)
{
return
res
.
data
;
}
return
[];
};
};
const
handleDelete
=
(
memberId
:
number
,
validateId
:
number
)
=>
{
const
handleDelete
=
(
memberId
:
number
,
validateId
:
number
)
=>
{
...
@@ -233,7 +244,7 @@ const memberMaintain: React.FC<[]> = () => {
...
@@ -233,7 +244,7 @@ const memberMaintain: React.FC<[]> = () => {
memberTypes
=
[],
memberTypes
=
[],
memberRoles
=
[],
memberRoles
=
[],
memberLevels
=
[],
memberLevels
=
[],
source
s
=
[],
source
=
[],
}
=
data
;
}
=
data
;
const
newColumns
=
columns
.
slice
();
const
newColumns
=
columns
.
slice
();
...
@@ -261,7 +272,7 @@ const memberMaintain: React.FC<[]> = () => {
...
@@ -261,7 +272,7 @@ const memberMaintain: React.FC<[]> = () => {
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
memberTypeId
:
memberTypes
.
map
(
item
=>
({
label
:
item
.
memberTypeName
,
value
:
item
.
memberTypeId
})),
roleId
:
memberRoles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
roleId
:
memberRoles
.
map
(
item
=>
({
label
:
item
.
roleName
,
value
:
item
.
roleId
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
level
:
memberLevels
.
map
(
item
=>
({
label
:
item
.
levelTag
,
value
:
item
.
level
})),
source
:
source
s
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
source
:
source
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
innerStatus
:
innerStatus
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
innerStatus
:
innerStatus
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
outerStatus
:
outerStatus
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
outerStatus
:
outerStatus
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
status
:
status
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
status
:
status
.
map
(
item
=>
({
label
:
item
.
text
,
value
:
item
.
id
})),
...
...
src/pages/member/memberPr1/schema/index.ts
View file @
d5bfa0a2
...
@@ -133,10 +133,10 @@ export const auditModalSchema: ISchema = {
...
@@ -133,10 +133,10 @@ export const auditModalSchema: ISchema = {
reason
:
{
reason
:
{
type
:
'string'
,
type
:
'string'
,
title
:
'审核不通过原因'
,
title
:
'审核不通过原因'
,
required
:
true
,
'x-component'
:
'textarea'
,
'x-component'
:
'textarea'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
'在此输入你的内容,最长120个字符,60个汉字'
,
placeholder
:
'在此输入你的内容,最长120个字符,60个汉字'
,
maxLength
:
60
,
rows
:
5
,
rows
:
5
,
},
},
'x-rules'
:
[
'x-rules'
:
[
...
...
src/pages/member/memberPr2/schema/index.ts
View file @
d5bfa0a2
...
@@ -133,10 +133,10 @@ export const auditModalSchema: ISchema = {
...
@@ -133,10 +133,10 @@ export const auditModalSchema: ISchema = {
reason
:
{
reason
:
{
type
:
'string'
,
type
:
'string'
,
title
:
'审核不通过原因'
,
title
:
'审核不通过原因'
,
required
:
true
,
'x-component'
:
'textarea'
,
'x-component'
:
'textarea'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
'在此输入你的内容,最长120个字符,60个汉字'
,
placeholder
:
'在此输入你的内容,最长120个字符,60个汉字'
,
maxLength
:
60
,
rows
:
5
,
rows
:
5
,
},
},
'x-rules'
:
[
'x-rules'
:
[
...
...
src/pages/member/memberPrConfirm/schema/index.ts
View file @
d5bfa0a2
...
@@ -140,10 +140,10 @@ export const auditModalSchema: ISchema = {
...
@@ -140,10 +140,10 @@ export const auditModalSchema: ISchema = {
reason
:
{
reason
:
{
type
:
'string'
,
type
:
'string'
,
title
:
'审核不通过原因'
,
title
:
'审核不通过原因'
,
required
:
true
,
'x-component'
:
'textarea'
,
'x-component'
:
'textarea'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
'在此输入你的内容,最长120个字符,60个汉字'
,
placeholder
:
'在此输入你的内容,最长120个字符,60个汉字'
,
maxLength
:
60
,
rows
:
5
,
rows
:
5
,
},
},
'x-rules'
:
[
'x-rules'
:
[
...
...
src/pages/member/memberPrSubmit/schema/index.ts
View file @
d5bfa0a2
...
@@ -133,10 +133,10 @@ export const auditModalSchema: ISchema = {
...
@@ -133,10 +133,10 @@ export const auditModalSchema: ISchema = {
reason
:
{
reason
:
{
type
:
'string'
,
type
:
'string'
,
title
:
'审核不通过原因'
,
title
:
'审核不通过原因'
,
required
:
true
,
'x-component'
:
'textarea'
,
'x-component'
:
'textarea'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
'在此输入你的内容,最长120个字符,60个汉字'
,
placeholder
:
'在此输入你的内容,最长120个字符,60个汉字'
,
maxLength
:
60
,
rows
:
5
,
rows
:
5
,
},
},
'x-rules'
:
[
'x-rules'
:
[
...
...
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