diff --git a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx index 66838f1..5cf0162 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualReview/supplierAnnualReview.tsx @@ -262,8 +262,8 @@ const SupplierAnnualReview: React.FC = () => { - {/* 只有待审核状态的可以打分 */} - {record.status !== '0' && record.reviewStatus === '0' && ( + {/* 只有待审核状态的可以打分 status 0 未开始 1 进行中 2 已结束 , reviewStatus 0未提交 1 已提交 */} + {record.status === '1' && record.reviewStatus === '0' && ( diff --git a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx index 9cd77bd..417656f 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.tsx @@ -20,7 +20,7 @@ const { Option } = Select; // 搜索参数类型 interface AnnualTemplateSearchParams { templateName?: string; - deptId?: string; + orgId?: string; categoryId?: string; dateRange?: string[]; [key: string]: any; @@ -70,8 +70,8 @@ const SupplierAnnualTemplateManage: React.FC = () => { if (params.templateName) { requestParams.templateName = params.templateName; } - if (params.deptId) { - requestParams.deptId = params.deptId; + if (params.orgId) { + requestParams.orgId = params.orgId; } if (params.categoryId) { requestParams.categoryId = params.categoryId; @@ -376,7 +376,7 @@ const SupplierAnnualTemplateManage: React.FC = () => { /> diff --git a/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManage.tsx b/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManage.tsx index 83d257e..188d5bc 100644 --- a/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManage.tsx +++ b/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManage.tsx @@ -337,7 +337,7 @@ const SupplierTemplateManage: React.FC = () => { />