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' })} {/* 只有待审核状态的可以打分 */} - {record.reviewStatus === AnnualReviewStatus.WAITING && ( + {record.status !== "0" && record.reviewStatus === "0" && ( - {record.status === '1' && ( // 只有待评分状态才显示打分按钮 + {record.status === '1' && record.reviewStatus !== '1' && ( // 只有待评分状态才显示打分按钮