Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev

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 || ''
           };
         }) || []

src/pages/supplierEvaluateManage/supplierEvaluateResult/supplierEvaluateResultScoreByList.tsx

@@ -263,8 +263,8 @@ const SupplierEvaluateResultScoreByList: React.FC = () => {
     },
     {
       title: intl.formatMessage({ id: 'supplierEvaluateResult.column.score' }),
-      dataIndex: 'score',
+      dataIndex: 'suScore',
-      key: 'score',
+      key: 'suScore',
       align: 'center' as const,
       width: 100,
     },