From 47bf5342bed8601df3670d748d99b0f110aa6228 Mon Sep 17 00:00:00 2001 From: linxd <544554903@qq.com> Date: Tue, 15 Jul 2025 11:13:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=A8=A1=E5=BC=8F=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EvaluateTemplateTable/EvaluateTemplateTable.tsx | 9 +++++++-- .../components/Detail/IndicatorModal.tsx | 4 ++-- .../supplierTemplateManage/supplierTemplateManageAdd.tsx | 1 - 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/EvaluateTemplateTable/EvaluateTemplateTable.tsx b/src/components/EvaluateTemplateTable/EvaluateTemplateTable.tsx index 30b45a7..2c192b3 100644 --- a/src/components/EvaluateTemplateTable/EvaluateTemplateTable.tsx +++ b/src/components/EvaluateTemplateTable/EvaluateTemplateTable.tsx @@ -615,7 +615,10 @@ const EvaluateTemplateTable: React.FC = ({ const filterColumns = (col: any) => { if (isDetail) { - return false; + // 如果是详情,过滤掉操作列 + if (col.key === 'level1Action') { + return false; + } } if (getUserRole() != 'admin') { if ( @@ -633,7 +636,9 @@ const EvaluateTemplateTable: React.FC = ({ }; const filterColumnsSecond = (col: any) => { if (isDetail) { - return false; + if (col.key === 'level2Action') { + return false; + } } if (getUserRole() != 'admin') { if ( diff --git a/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/IndicatorModal.tsx b/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/IndicatorModal.tsx index bf2022f..0492d85 100644 --- a/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/IndicatorModal.tsx +++ b/src/pages/supplierEvaluateManage/supplierTaskManage/components/Detail/IndicatorModal.tsx @@ -48,7 +48,7 @@ const IndicatorModal: React.FC = ({ // 筛选出当前评价人员负责的指标 if (res.data.indicatorStList && indicators.length > 0) { // 扁平化处理模板数据,提取出所有二级指标 - const allIndicators = []; + const allIndicators: (IndicatorItem & { id: string })[] = []; for (const stItem of res.data.indicatorStList) { if (stItem.indicatorNdList) { for (const ndItem of stItem.indicatorNdList) { @@ -59,7 +59,7 @@ const IndicatorModal: React.FC = ({ descIndicator: stItem.descIndicator, stScore: stItem.score, indicatorType: stItem.indicatorType, - id: ndItem.id, + id: ndItem.id || '', score: ndItem.score, }); } diff --git a/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageAdd.tsx b/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageAdd.tsx index a28be90..b26aae7 100644 --- a/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageAdd.tsx +++ b/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageAdd.tsx @@ -234,7 +234,6 @@ const SupplierTemplateManageAdd: React.FC = ({ breadcrumb, dispatch } if (isEdit && templateDetail) { dataToSubmit.id = templateDetail.id; } - debugger setLoading(true); try { // 调用API接口