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
project
jinfa-admin
Commits
638832e9
Commit
638832e9
authored
Sep 15, 2020
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-system
into dev
parents
d1ba86ed
9bc47c0f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
9 deletions
+33
-9
index.tsx
src/pages/member/memberMaintain/detailed/index.tsx
+4
-4
index.tsx
src/pages/member/memberMaintain/index.tsx
+1
-1
auditPrComfirm.tsx
src/pages/member/memberPrConfirm/auditPrComfirm.tsx
+19
-2
index.ts
src/pages/member/memberPrConfirm/schema/index.ts
+9
-2
No files found.
src/pages/member/memberMaintain/detailed/index.tsx
View file @
638832e9
...
...
@@ -60,10 +60,10 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
};
useEffect
(()
=>
{
const
{
match
}
=
props
;
const
url
=
match
.
url
===
'/'
?
''
:
match
.
url
;
// 手动重定向到基础信息页,防止查询字符串被弄掉
history
.
replace
(
`
${
url
}
/basicInfo?id=
${
id
}
&validateId=
${
validateId
}
`
);
//
const { match } = props;
//
const url = match.url === '/' ? '' : match.url;
//
//
手动重定向到基础信息页,防止查询字符串被弄掉
//
history.replace(`${url}/basicInfo?id=${id}&validateId=${validateId}`);
getBasicInfo
();
},
[]);
...
...
src/pages/member/memberMaintain/index.tsx
View file @
638832e9
...
...
@@ -87,7 +87,7 @@ const memberMaintain: React.FC<[]> = () => {
key
:
'name'
,
render
:
(
text
:
any
,
record
:
any
)
=>
(
<
EyePreview
url=
{
`/memberAbility/manage/maintainDetail
?id=${record.memberId}&validateId=${record.validateId}&preview=1
`
}
url=
{
`/memberAbility/manage/maintainDetail
/basicInfo?id=${record.memberId}&validateId=${record.validateId}
`
}
>
{
text
}
</
EyePreview
>
...
...
src/pages/member/memberPrConfirm/auditPrComfirm.tsx
View file @
638832e9
...
...
@@ -19,8 +19,9 @@ import TabTree, { createTreeActions } from '@/components/TabTree';
import
CheckboxTree
from
'@/components/CheckBoxTree'
;
import
MellowCard
from
'@/components/MellowCard'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
{
createFormActions
,
FormEffectHooks
}
from
'@formily/antd'
;
import
{
createFormActions
,
FormEffectHooks
,
FormPath
}
from
'@formily/antd'
;
import
{
useTreeTabs
,
FormState
}
from
'@/hooks/useTreeTabs'
;
import
{
MEMBER_INNER_STATUS_SUCCESS
}
from
'@/constants'
;
import
{
MEMBER_STATUS_TAG_MAP
,
MEMBER_INNER_STATUS_BADGE_COLOR
,
...
...
@@ -74,6 +75,22 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
return
;
}
setBasicInfo
(
res
.
data
);
// 内部状态为 审核通过 才能选择 审核通过选项
if
(
res
.
data
.
innerStatus
!==
MEMBER_INNER_STATUS_SUCCESS
)
{
modalFormActions
.
setFieldState
(
'agree'
,
(
state
:
any
)
=>
{
const
newMenu
=
state
.
props
.
enum
.
map
(
(
item
:
{
label
:
string
,
value
:
any
})
=>
({
...
item
,
disabled
:
item
.
value
===
1
,
})
);
FormPath
.
setIn
(
state
,
'props.enum'
,
newMenu
);
FormPath
.
setIn
(
state
,
'value'
,
0
);
});
}
}).
finally
(()
=>
{
setInfoLoading
(
false
);
});
...
...
@@ -293,7 +310,7 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
<
StatusTag
type=
{
MEMBER_OUTER_STATUS_TYPE
[
basicInfo
?.
outerStatus
]
}
title=
{
basicInfo
?.
outerStatusName
}
/>
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"内部状态"
>
<
Badge
color=
{
MEMBER_INNER_STATUS_BADGE_COLOR
[
basicInfo
?.
innerStatus
]
}
text=
{
basicInfo
?.
innerStatusName
}
/>
<
Badge
color=
{
MEMBER_INNER_STATUS_BADGE_COLOR
[
basicInfo
?.
innerStatus
]
||
'#999999'
}
text=
{
basicInfo
?.
innerStatusName
}
/>
</
Descriptions
.
Item
>
</
Descriptions
>
</
PageHeader
>
...
...
src/pages/member/memberPrConfirm/schema/index.ts
View file @
638832e9
...
...
@@ -124,8 +124,15 @@ export const auditModalSchema: ISchema = {
type
:
'string'
,
default
:
1
,
enum
:
[
{
label
:
'审核通过'
,
value
:
1
},
{
label
:
'审核不通过'
,
value
:
0
},
{
label
:
'审核通过'
,
value
:
1
,
disabled
:
false
,
},
{
label
:
'审核不通过'
,
value
:
0
,
},
],
'x-component'
:
'radio'
,
'x-component-props'
:
{},
...
...
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