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
a9a09c4b
Commit
a9a09c4b
authored
Nov 27, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixbug
parent
b604b630
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
60 additions
and
20 deletions
+60
-20
basicInfo.tsx
src/pages/member/memberMaintain/detailed/basicInfo.tsx
+11
-3
auditPr1.tsx
src/pages/member/memberPr1/auditPr1.tsx
+10
-2
auditPr2.tsx
src/pages/member/memberPr2/auditPr2.tsx
+10
-2
auditPrComfirm.tsx
src/pages/member/memberPrConfirm/auditPrComfirm.tsx
+10
-2
auditPrSubmit.tsx
src/pages/member/memberPrSubmit/auditPrSubmit.tsx
+10
-2
auditSchema.ts
src/pages/member/schema/auditSchema.ts
+9
-9
No files found.
src/pages/member/memberMaintain/detailed/basicInfo.tsx
View file @
a9a09c4b
...
@@ -5,7 +5,7 @@ import BasicInfo from '../../components/BasicInfo';
...
@@ -5,7 +5,7 @@ import BasicInfo from '../../components/BasicInfo';
import
AuditProcess
from
'../../components/AuditProcess'
;
import
AuditProcess
from
'../../components/AuditProcess'
;
interface
MemberBasicInfoProps
{
interface
MemberBasicInfoProps
{
MemberStore
?
:
IMemberModule
;
MemberStore
:
IMemberModule
;
};
};
const
MemberBasicInfo
:
React
.
FC
<
MemberBasicInfoProps
>
=
({
const
MemberBasicInfo
:
React
.
FC
<
MemberBasicInfoProps
>
=
({
...
@@ -21,8 +21,16 @@ const MemberBasicInfo: React.FC<MemberBasicInfoProps> = ({
...
@@ -21,8 +21,16 @@ const MemberBasicInfo: React.FC<MemberBasicInfoProps> = ({
}
}
}
}
>
>
<
AuditProcess
<
AuditProcess
outerVerifyCurrent=
{
memberMaintainInfo
?.
currentOuterStep
}
outerVerifyCurrent=
{
innerVerifyCurrent=
{
memberMaintainInfo
?.
currentInnerStep
}
memberMaintainInfo
&&
memberMaintainInfo
.
currentOuterStep
>
0
?
memberMaintainInfo
.
currentOuterStep
-
1
:
0
}
innerVerifyCurrent=
{
memberMaintainInfo
&&
memberMaintainInfo
.
currentInnerStep
>
0
?
memberMaintainInfo
.
currentInnerStep
-
1
:
0
}
outerVerifySteps=
{
memberMaintainInfo
?.
outerVerifySteps
}
outerVerifySteps=
{
memberMaintainInfo
?.
outerVerifySteps
}
innerVerifySteps=
{
memberMaintainInfo
?.
innerVerifySteps
}
innerVerifySteps=
{
memberMaintainInfo
?.
innerVerifySteps
}
/>
/>
...
...
src/pages/member/memberPr1/auditPr1.tsx
View file @
a9a09c4b
...
@@ -310,10 +310,18 @@ const AuditPr1: React.FC<QueryProps> = props => {
...
@@ -310,10 +310,18 @@ const AuditPr1: React.FC<QueryProps> = props => {
}
}
}
}
>
>
<
AuditProcess
<
AuditProcess
outerVerifyCurrent=
{
basicInfo
?.
currentOuterStep
}
innerVerifyCurrent=
{
basicInfo
?.
currentInnerStep
}
outerVerifySteps=
{
basicInfo
?.
outerVerifySteps
}
outerVerifySteps=
{
basicInfo
?.
outerVerifySteps
}
innerVerifySteps=
{
basicInfo
?.
innerVerifySteps
}
innerVerifySteps=
{
basicInfo
?.
innerVerifySteps
}
outerVerifyCurrent=
{
basicInfo
&&
basicInfo
.
currentOuterStep
>
0
?
basicInfo
.
currentOuterStep
-
1
:
0
}
innerVerifyCurrent=
{
basicInfo
&&
basicInfo
.
currentInnerStep
>
0
?
basicInfo
.
currentInnerStep
-
1
:
0
}
/>
/>
</
div
>
</
div
>
...
...
src/pages/member/memberPr2/auditPr2.tsx
View file @
a9a09c4b
...
@@ -310,10 +310,18 @@ const AuditPr2: React.FC<QueryProps> = props => {
...
@@ -310,10 +310,18 @@ const AuditPr2: React.FC<QueryProps> = props => {
}
}
}
}
>
>
<
AuditProcess
<
AuditProcess
outerVerifyCurrent=
{
basicInfo
?.
currentOuterStep
}
innerVerifyCurrent=
{
basicInfo
?.
currentInnerStep
}
outerVerifySteps=
{
basicInfo
?.
outerVerifySteps
}
outerVerifySteps=
{
basicInfo
?.
outerVerifySteps
}
innerVerifySteps=
{
basicInfo
?.
innerVerifySteps
}
innerVerifySteps=
{
basicInfo
?.
innerVerifySteps
}
outerVerifyCurrent=
{
basicInfo
&&
basicInfo
.
currentOuterStep
>
0
?
basicInfo
.
currentOuterStep
-
1
:
0
}
innerVerifyCurrent=
{
basicInfo
&&
basicInfo
.
currentInnerStep
>
0
?
basicInfo
.
currentInnerStep
-
1
:
0
}
/>
/>
</
div
>
</
div
>
...
...
src/pages/member/memberPrConfirm/auditPrComfirm.tsx
View file @
a9a09c4b
...
@@ -315,10 +315,18 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
...
@@ -315,10 +315,18 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
}
}
}
}
>
>
<
AuditProcess
<
AuditProcess
outerVerifyCurrent=
{
basicInfo
?.
currentOuterStep
}
innerVerifyCurrent=
{
basicInfo
?.
currentInnerStep
}
outerVerifySteps=
{
basicInfo
?.
outerVerifySteps
}
outerVerifySteps=
{
basicInfo
?.
outerVerifySteps
}
innerVerifySteps=
{
basicInfo
?.
innerVerifySteps
}
innerVerifySteps=
{
basicInfo
?.
innerVerifySteps
}
outerVerifyCurrent=
{
basicInfo
&&
basicInfo
.
currentOuterStep
>
0
?
basicInfo
.
currentOuterStep
-
1
:
0
}
innerVerifyCurrent=
{
basicInfo
&&
basicInfo
.
currentInnerStep
>
0
?
basicInfo
.
currentInnerStep
-
1
:
0
}
/>
/>
</
div
>
</
div
>
...
...
src/pages/member/memberPrSubmit/auditPrSubmit.tsx
View file @
a9a09c4b
...
@@ -327,10 +327,18 @@ const AuditPrSubmit: React.FC<QueryProps> = props => {
...
@@ -327,10 +327,18 @@ const AuditPrSubmit: React.FC<QueryProps> = props => {
}
}
}
}
>
>
<
AuditProcess
<
AuditProcess
outerVerifyCurrent=
{
basicInfo
?.
currentOuterStep
}
innerVerifyCurrent=
{
basicInfo
?.
currentInnerStep
}
outerVerifySteps=
{
basicInfo
?.
outerVerifySteps
}
outerVerifySteps=
{
basicInfo
?.
outerVerifySteps
}
innerVerifySteps=
{
basicInfo
?.
innerVerifySteps
}
innerVerifySteps=
{
basicInfo
?.
innerVerifySteps
}
outerVerifyCurrent=
{
basicInfo
&&
basicInfo
.
currentOuterStep
>
0
?
basicInfo
.
currentOuterStep
-
1
:
0
}
innerVerifyCurrent=
{
basicInfo
&&
basicInfo
.
currentInnerStep
>
0
?
basicInfo
.
currentInnerStep
-
1
:
0
}
/>
/>
</
div
>
</
div
>
...
...
src/pages/member/schema/auditSchema.ts
View file @
a9a09c4b
...
@@ -49,15 +49,15 @@ export const auditSchema: ISchema = {
...
@@ -49,15 +49,15 @@ export const auditSchema: ISchema = {
allowClear
:
true
,
allowClear
:
true
,
},
},
},
},
status
:
{
//
status: {
type
:
'string'
,
//
type: 'string',
default
:
undefined
,
//
default: undefined,
enum
:
[],
//
enum: [],
'x-component-props'
:
{
//
'x-component-props': {
placeholder
:
'会员状态(全部)'
,
//
placeholder: '会员状态(全部)',
allowClear
:
true
,
//
allowClear: true,
},
//
},
},
//
},
roleId
:
{
roleId
:
{
type
:
'string'
,
type
:
'string'
,
default
:
undefined
,
default
:
undefined
,
...
...
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