Commit a9a09c4b authored by XieZhiXiong's avatar XieZhiXiong

fixbug

parent b604b630
......@@ -5,7 +5,7 @@ import BasicInfo from '../../components/BasicInfo';
import AuditProcess from '../../components/AuditProcess';
interface MemberBasicInfoProps {
MemberStore?: IMemberModule;
MemberStore: IMemberModule;
};
const MemberBasicInfo: React.FC<MemberBasicInfoProps> = ({
......@@ -21,8 +21,16 @@ const MemberBasicInfo: React.FC<MemberBasicInfoProps> = ({
}}
>
<AuditProcess
outerVerifyCurrent={memberMaintainInfo?.currentOuterStep}
innerVerifyCurrent={memberMaintainInfo?.currentInnerStep}
outerVerifyCurrent={
memberMaintainInfo && memberMaintainInfo.currentOuterStep > 0 ?
memberMaintainInfo.currentOuterStep - 1 :
0
}
innerVerifyCurrent={
memberMaintainInfo && memberMaintainInfo.currentInnerStep > 0 ?
memberMaintainInfo.currentInnerStep -1 :
0
}
outerVerifySteps={memberMaintainInfo?.outerVerifySteps}
innerVerifySteps={memberMaintainInfo?.innerVerifySteps}
/>
......
......@@ -310,10 +310,18 @@ const AuditPr1: React.FC<QueryProps> = props => {
}}
>
<AuditProcess
outerVerifyCurrent={basicInfo?.currentOuterStep}
innerVerifyCurrent={basicInfo?.currentInnerStep}
outerVerifySteps={basicInfo?.outerVerifySteps}
innerVerifySteps={basicInfo?.innerVerifySteps}
outerVerifyCurrent={
basicInfo && basicInfo.currentOuterStep > 0 ?
basicInfo.currentOuterStep - 1 :
0
}
innerVerifyCurrent={
basicInfo && basicInfo.currentInnerStep > 0 ?
basicInfo.currentInnerStep -1 :
0
}
/>
</div>
......
......@@ -310,10 +310,18 @@ const AuditPr2: React.FC<QueryProps> = props => {
}}
>
<AuditProcess
outerVerifyCurrent={basicInfo?.currentOuterStep}
innerVerifyCurrent={basicInfo?.currentInnerStep}
outerVerifySteps={basicInfo?.outerVerifySteps}
innerVerifySteps={basicInfo?.innerVerifySteps}
outerVerifyCurrent={
basicInfo && basicInfo.currentOuterStep > 0 ?
basicInfo.currentOuterStep - 1 :
0
}
innerVerifyCurrent={
basicInfo && basicInfo.currentInnerStep > 0 ?
basicInfo.currentInnerStep -1 :
0
}
/>
</div>
......
......@@ -315,10 +315,18 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
}}
>
<AuditProcess
outerVerifyCurrent={basicInfo?.currentOuterStep}
innerVerifyCurrent={basicInfo?.currentInnerStep}
outerVerifySteps={basicInfo?.outerVerifySteps}
innerVerifySteps={basicInfo?.innerVerifySteps}
outerVerifyCurrent={
basicInfo && basicInfo.currentOuterStep > 0 ?
basicInfo.currentOuterStep - 1 :
0
}
innerVerifyCurrent={
basicInfo && basicInfo.currentInnerStep > 0 ?
basicInfo.currentInnerStep -1 :
0
}
/>
</div>
......
......@@ -327,10 +327,18 @@ const AuditPrSubmit: React.FC<QueryProps> = props => {
}}
>
<AuditProcess
outerVerifyCurrent={basicInfo?.currentOuterStep}
innerVerifyCurrent={basicInfo?.currentInnerStep}
outerVerifySteps={basicInfo?.outerVerifySteps}
innerVerifySteps={basicInfo?.innerVerifySteps}
outerVerifyCurrent={
basicInfo && basicInfo.currentOuterStep > 0 ?
basicInfo.currentOuterStep - 1 :
0
}
innerVerifyCurrent={
basicInfo && basicInfo.currentInnerStep > 0 ?
basicInfo.currentInnerStep -1 :
0
}
/>
</div>
......
......@@ -49,15 +49,15 @@ export const auditSchema: ISchema = {
allowClear: true,
},
},
status: {
type: 'string',
default: undefined,
enum: [],
'x-component-props': {
placeholder: '会员状态(全部)',
allowClear: true,
},
},
// status: {
// type: 'string',
// default: undefined,
// enum: [],
// 'x-component-props': {
// placeholder: '会员状态(全部)',
// allowClear: true,
// },
// },
roleId: {
type: 'string',
default: undefined,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment