Skip to content

J
jinfa-platform
Commit b551a37e authored by Bill's avatar Bill
Browse files
Options

Merge branch 'fix-v2-220418' into 'v2-220418'

fix: 修复步骤条展示不对的问题 See merge request linkseeks-design/pro-platform!510
parents 8e171cc9 c5320c8d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
src/pages/commodity/material/common/useGetDetailCommon.tsx
View file @ b551a37e
...@@ -127,11 +127,16 @@ function useGetDetailCommon<T extends GetProductGoodsGetGoodsProcessDetailRespon ...@@ -127,11 +127,16 @@ function useGetDetailCommon<T extends GetProductGoodsGetGoodsProcessDetailRespon
roleName: string, roleName: string,
status: 'finish' | 'wait', status: 'finish' | 'wait',
}[] = initialValue?.simpleProcessDefVO ? }[] = initialValue?.simpleProcessDefVO ?
initialValue?.simpleProcessDefVO?.tasks?.map(item => ({ initialValue?.simpleProcessDefVO?.tasks?.map((item, index) => ({
step: item.taskStep, step: item.taskStep,
stepName: item.taskName, stepName: item.taskName,
roleName: item.roleName, roleName: item.roleName,
status: initialValue?.simpleProcessDefVO?.currentStep >= item.taskStep ? 'finish' : 'wait', status: (
(initialValue?.simpleProcessDefVO?.currentStep > item.taskStep)
|| (index === initialValue?.simpleProcessDefVO?.tasks.length - 1 && initialValue?.simpleProcessDefVO?.currentStep === item.taskStep)
)
? 'finish'
: 'wait',
})) : })) :
[] []
const innerVerifyCurrent = findLastIndexFlowState(initialValue?.simpleProcessDefVO.tasks) const innerVerifyCurrent = findLastIndexFlowState(initialValue?.simpleProcessDefVO.tasks)
......
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