diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultByZb.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultByZb.tsx index 9f1bc57..ac364e9 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultByZb.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultByZb.tsx @@ -84,15 +84,17 @@ const SupplierEvaluateResultByZb: React.FC = () => { return indicatorDetail.taskIndicatorVo.map(indicator => { return { baseIndicator: indicator.baseIndicator, - descIndicator: indicator.indicatorDesc, + // 注意:ScoreEvaluationTable组件内部期望接收indicatorDesc字段 + indicatorDesc: indicator.indicatorDesc, score: indicator.score, indicatorNdList: indicator.subIndicator?.map(subItem => { return { subIndicator: subItem.subIndicator, - score: subItem.subScore, + score: subItem.score, + scoreNum: subItem.score || '', + subScore: subItem.subScore, isStar: subItem.starIndicator, id: subItem.id, - actualScore: subItem.scoreNum || '', remark: subItem.remark || '' }; }) || [] diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx index 9bca1f0..4a2c3e9 100644 --- a/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx +++ b/src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx @@ -263,8 +263,8 @@ const SupplierEvaluateResultScoreByList: React.FC = () => { }, { title: intl.formatMessage({ id: 'supplierEvaluateResult.column.score' }), - dataIndex: 'score', - key: 'score', + dataIndex: 'suScore', + key: 'suScore', align: 'center' as const, width: 100, },