From d256f55ff1dc2c0d8e19f0c80eb56f9e846de997 Mon Sep 17 00:00:00 2001
From: linxd <544554903@qq.com>
Date: Tue, 15 Jul 2025 14:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E6=89=93=E5=88=86=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=9B=9E=E6=98=BE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScoreEvaluationTable.tsx                  |  2 +-
 .../supplierEvaluateScoreDetail.tsx           | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/ScoreEvaluationTable/ScoreEvaluationTable.tsx b/src/components/ScoreEvaluationTable/ScoreEvaluationTable.tsx
index d64d59c..a8b09c7 100644
--- a/src/components/ScoreEvaluationTable/ScoreEvaluationTable.tsx
+++ b/src/components/ScoreEvaluationTable/ScoreEvaluationTable.tsx
@@ -89,7 +89,7 @@ const ScoreEvaluationTable: React.FC<ScoreEvaluationTableProps> = ({
             descIndicator: stItem.indicatorDesc || '',
             stScore: stItem.score || '0',
             subIndicator: '',
-            ndScore: '0',
+            ndScore: stItem.score || '0',
             score: stItem.actualScore || '',
             remark: stItem.remark || '',
           });
diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScoreDetail.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScoreDetail.tsx
index 5fcc110..07f8591 100644
--- a/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScoreDetail.tsx
+++ b/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScoreDetail.tsx
@@ -79,9 +79,13 @@ const SupplierEvaluateScoreDetail: React.FC = () => {
               return {
                 id: subItem.id,
                 subIndicator: subItem.subIndicator,
-                score: subItem.subScore,
+                // 注意：组件内部使用subScore作为二级指标分值，但在表格中显示为ndScore
+                subScore: subItem.subScore,
                 isStar: subItem.starIndicator,
-                actualScore: subItem.scoreNum || '',
+                // 修正：使用scoreNum作为实际评分值，这是组件期望的字段
+                scoreNum: subItem.score || '',
+                // 保留score字段以兼容组件内部逻辑
+                score: subItem.score || '',
                 remark: subItem.remark || '',
               };
             })
@@ -144,7 +148,10 @@ const SupplierEvaluateScoreDetail: React.FC = () => {
 
     // 验证所有二级指标是否都已评分
     const hasEmptyScore = scoreData.some((item) =>
-      item.indicatorNdList.some((subItem: any) => !subItem.scoreNum && subItem.scoreNum !== 0),
+      item.indicatorNdList.some((subItem: any) => {
+        // 使用scoreNum字段检查是否已评分
+        return !subItem.scoreNum && subItem.scoreNum !== 0;
+      }),
     );
 
     if (hasEmptyScore) {
@@ -163,13 +170,14 @@ const SupplierEvaluateScoreDetail: React.FC = () => {
         setSubmitting(true);
         try {
           // 构建提交数据
-            const submitData: SupplierEvaluateScore.ScoreSaveRequest = {
+          const submitData: SupplierEvaluateScore.ScoreSaveRequest = {
             id: record.id,
             scoreVoList: scoreData.flatMap((item) => {
               return item.indicatorNdList.map((subItem: any) => ({
                 id: subItem.id,
-                remark: subItem.remark || item.remark || '',
-                score: String(subItem.scoreNum || item.score || ''),
+                remark: subItem.remark || '',
+                // 优先使用scoreNum字段，这是组件中实际评分值
+                score: String(subItem.scoreNum || ''),
               }));
             }),
           };