From de06ba4e41a5f52ff26755d6caefd88ef6e5465b Mon Sep 17 00:00:00 2001
From: linxd <544554903@qq.com>
Date: Tue, 15 Jul 2025 11:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BB=B7=E6=89=93?=
 =?UTF-8?q?=E5=88=86=E5=88=97=E8=A1=A8=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=9A=E5=B9=B4=E5=AE=A1=E5=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dicts/supplierAnnualReviewDict.ts         |  4 +--
 .../supplierAnnualReview.tsx                  |  8 +++++-
 .../supplierAnnualScore.tsx                   | 26 +++++++++----------
 .../supplierEvaluateScore.tsx                 | 14 +++++-----
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/dicts/supplierAnnualReviewDict.ts b/src/dicts/supplierAnnualReviewDict.ts
index 4fb74a2..512f3ef 100644
--- a/src/dicts/supplierAnnualReviewDict.ts
+++ b/src/dicts/supplierAnnualReviewDict.ts
@@ -2,7 +2,7 @@
 
 // 审查状态常量
 export const AnnualReviewStatus = {
-  WAITING: '0',   // 待审核
+  WAITING: '0',   // 未开始
   ONGOING: '1',   // 审核中
   COMPLETED: '2', // 已完成
   EXPIRED: '3',   // 已过期
@@ -10,7 +10,7 @@ export const AnnualReviewStatus = {
 
 // 审查状态文本
 export const AnnualReviewStatusText = {
-  [AnnualReviewStatus.WAITING]: '待审核',
+  [AnnualReviewStatus.WAITING]: '未开始',
   [AnnualReviewStatus.ONGOING]: '审核中',
   [AnnualReviewStatus.COMPLETED]: '已完成',
   [AnnualReviewStatus.EXPIRED]: '已过期',
diff --git a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx
index 13314b6..766f255 100644
--- a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx
+++ b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx
@@ -217,6 +217,12 @@ const SupplierAnnualReview: React.FC = () => {
       key: 'statusName',
       width: 100
     },
+    {
+      title: "提交状态",
+      dataIndex: 'reviewStatusName',
+      key: 'reviewStatusName',
+      width: 100
+    },
     {
       title: intl.formatMessage({ id: 'supplierAnnualReview.common.operation' }),
       key: 'action',
@@ -232,7 +238,7 @@ const SupplierAnnualReview: React.FC = () => {
             {intl.formatMessage({ id: 'supplierAnnualReview.common.view' })}
           </Button>
           {/* 只有待审核状态的可以打分 */}
-          {record.reviewStatus === AnnualReviewStatus.WAITING && (
+          {record.status !== "0" && record.reviewStatus === "0" && (
             <Button
               type="link"
               onClick={() => handleScore(record)}
diff --git a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScore.tsx b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScore.tsx
index 8803ace..9859587 100644
--- a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScore.tsx
+++ b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualScore.tsx
@@ -33,7 +33,7 @@ const { TextArea } = Input;
 // 评分项接口定义
 interface ScoreFormItem {
   id: string;
-  name: string;
+  itemName: string;
   description: string;
   examineResult: string;
   remark: string;
@@ -59,12 +59,12 @@ const SupplierAnnualReviewScore: React.FC = () => {
         setReviewDetail(res.data);
 
         // 使用接口返回的评分项数据
-        if (res.data.scoreItems && res.data.scoreItems.length > 0) {
-          setScoreItems(res.data.scoreItems);
+        if (res.data.taskIndicatorVo && res.data.taskIndicatorVo.length > 0) {
+          setScoreItems(res.data.taskIndicatorVo);
 
           // 初始化表单
           const initialValues: any = {};
-          res.data.scoreItems.forEach((item: ScoreFormItem) => {
+          res.data.taskIndicatorVo.forEach((item: ScoreFormItem) => {
             initialValues[`examineResult_${item.id}`] = item.examineResult || '';
             initialValues[`remark_${item.id}`] = item.remark || '';
           });
@@ -109,7 +109,7 @@ const SupplierAnnualReviewScore: React.FC = () => {
       const formValues = form.getFieldsValue();
       const scoreVoList = scoreItems.map((item) => ({
         id: item.id,
-        name: item.name,
+        name: item.itemName,
         description: item.description,
         examineResult: formValues[`examineResult_${item.id}`],
         remark: formValues[`remark_${item.id}`] || '',
@@ -191,12 +191,12 @@ const SupplierAnnualReviewScore: React.FC = () => {
                     {reviewDetail.deptName || '-'}
                   </Descriptions.Item>
                   <Descriptions.Item label={intl.formatMessage({ id: 'supplierAnnualReview.list.reviewer' })}>
-                    {reviewDetail.userName || '-'}
+                    {reviewDetail.reviewerName || '-'}
                   </Descriptions.Item>
                   <Descriptions.Item label={intl.formatMessage({ id: 'supplierAnnualReview.list.startTime' })}>{reviewDetail.startTime}</Descriptions.Item>
                   <Descriptions.Item label={intl.formatMessage({ id: 'supplierAnnualReview.list.endTime' })}>{reviewDetail.endTime}</Descriptions.Item>
                   <Descriptions.Item label={intl.formatMessage({ id: 'supplierAnnualReview.list.status' })}>
-                    {getStatusTag(reviewDetail.reviewStatus, reviewDetail.reviewStatusName)}
+                    {reviewDetail.reviewStatusName || '-'}
                   </Descriptions.Item>
                 </Descriptions>
               </Card>
@@ -215,14 +215,14 @@ const SupplierAnnualReviewScore: React.FC = () => {
                       columns={[
                         {
                           title: intl.formatMessage({ id: 'supplierAnnualReview.score.scoreItem' }),
-                          dataIndex: 'name',
+                          dataIndex: 'itemName',
                           width: '15%',
                         },
-                        {
-                          title: intl.formatMessage({ id: 'supplierAnnualReview.score.scoreItemDesc' }),
-                          dataIndex: 'description',
-                          width: '25%',
-                        },
+                        // {
+                        //   title: intl.formatMessage({ id: 'supplierAnnualReview.score.scoreItemDesc' }),
+                        //   dataIndex: 'description',
+                        //   width: '25%',
+                        // },
                         {
                           title: intl.formatMessage({ id: 'supplierAnnualReview.detail.examineResult' }),
                           dataIndex: 'examineResult',
diff --git a/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx b/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx
index bee620f..cd37977 100644
--- a/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx
+++ b/src/pages/supplierEvaluateManage/supplierEvaluateScore/supplierEvaluateScore.tsx
@@ -273,8 +273,8 @@ status：状态
     },
     {
       title: intl.formatMessage({ id: 'supplierEvaluateScore.column.tenantName' }),
-      dataIndex: 'tenantName',
-      key: 'tenantName',
+      dataIndex: 'deptName',
+      key: 'deptName',
     },
     {
       title: intl.formatMessage({ id: 'supplierEvaluateScore.column.startTime' }),
@@ -293,13 +293,13 @@ status：状态
     },
     {
       title: intl.formatMessage({ id: 'supplierEvaluateScore.column.submissionStatus' }),
-      dataIndex: 'submissionStatus',
-      key: 'submissionStatus',
+      dataIndex: 'reviewStatusName',
+      key: 'reviewStatusName',
     },
     {
       title: intl.formatMessage({ id: 'supplierEvaluateScore.column.submissionTime' }),
-      dataIndex: 'submissionTime',
-      key: 'submissionTime',
+      dataIndex: 'reviewTime',
+      key: 'reviewTime',
     },
     {
       title: intl.formatMessage({ id: 'supplierEvaluateScore.column.action' }),
@@ -309,7 +309,7 @@ status：状态
           <Button type="link" onClick={() => goToScoring(record, 'supplier', 'view')}>
             {intl.formatMessage({ id: 'supplierEvaluateScore.button.view' })}
           </Button>
-          {record.status === '1' && ( // 只有待评分状态才显示打分按钮
+          {record.status === '1' && record.reviewStatus !== '1' && ( // 只有待评分状态才显示打分按钮
             <Button type="link" onClick={() => goToScoring(record, 'supplier', 'score')}>
               {intl.formatMessage({ id: 'supplierEvaluateScore.button.score' })}
             </Button>