From 0fcd5972754a468e44ecf4d60863d154bad0c647 Mon Sep 17 00:00:00 2001 From: linxd <544554903@qq.com> Date: Wed, 16 Jul 2025 15:10:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EvaluateTemplateTable.less | 2 +- .../EvaluateTemplateTable.tsx | 33 ++++++++++++++----- src/hooks/useUser.ts | 2 +- src/pages/register/supplier/DomesticForm.tsx | 6 ++-- src/pages/register/supplier/ForeignForm.tsx | 6 ++-- .../supplierAnnualTemplateManage.less | 9 +++-- .../supplierAnnualTemplateManageAdd.tsx | 1 - .../supplierAnnualTemplateManageDetail.tsx | 2 +- .../supplierTemplateManage.less | 3 ++ .../supplierTemplateManageAdd.tsx | 2 +- .../supplierTemplateManageDetail.tsx | 5 ++- 11 files changed, 49 insertions(+), 22 deletions(-) diff --git a/src/components/EvaluateTemplateTable/EvaluateTemplateTable.less b/src/components/EvaluateTemplateTable/EvaluateTemplateTable.less index e60b080..16302da 100644 --- a/src/components/EvaluateTemplateTable/EvaluateTemplateTable.less +++ b/src/components/EvaluateTemplateTable/EvaluateTemplateTable.less @@ -1,5 +1,5 @@ .evaluate-template-table { - margin-top: 16px; + // margin-top: 16px; .action-buttons { display: flex; diff --git a/src/components/EvaluateTemplateTable/EvaluateTemplateTable.tsx b/src/components/EvaluateTemplateTable/EvaluateTemplateTable.tsx index a9364e0..b722582 100644 --- a/src/components/EvaluateTemplateTable/EvaluateTemplateTable.tsx +++ b/src/components/EvaluateTemplateTable/EvaluateTemplateTable.tsx @@ -611,8 +611,16 @@ const EvaluateTemplateTable: React.FC = ({ const filterColumns = (col: any) => { if (isDetail) { - // 如果是详情，过滤掉操作列 - if (col.key === 'level1Action') { + // 如果是详情，过滤掉操作列 过滤掉是否可编辑列 + if ( + [ + 'level1Action', + 'indicatorStEditST', + 'baseIndicatorEditST', + 'descIndicatorEditST', + 'scoreEditST', + ].includes(col.key) + ) { return false; } } @@ -685,7 +693,6 @@ const EvaluateTemplateTable: React.FC = ({ dataIndex: 'index', align: 'center', key: 'index', - width: 50, render: (_: any, record: TableRowItem, index: number) => { return <>{index + 1}; }, @@ -695,7 +702,7 @@ const EvaluateTemplateTable: React.FC = ({ dataIndex: 'indicatorType', align: 'center', key: 'indicatorType', - width: 120, + ellipsis: true, // 自动加省略号 render: (text: string, record: TableRowItem) => { return renderWithRowSpan(text, record, (cellContent) => { if (isDetail) { @@ -733,6 +740,7 @@ const EvaluateTemplateTable: React.FC = ({ align: 'center', dataIndex: 'baseIndicator', key: 'baseIndicator', + ellipsis: true, // 自动加省略号 width: 150, render: (text: string, record: TableRowItem) => { return renderWithRowSpan(text, record, (cellContent) => { @@ -756,6 +764,7 @@ const EvaluateTemplateTable: React.FC = ({ // (0.是、1.否 int类型) title: '是否可编辑', align: 'center', + ellipsis: true, // 自动加省略号 dataIndex: 'baseIndicatorEditST', key: 'baseIndicatorEditST', width: 50, @@ -780,7 +789,7 @@ const EvaluateTemplateTable: React.FC = ({ align: 'center', dataIndex: 'descIndicator', key: 'descIndicator', - width: 200, + width: 100, render: (text: string, record: TableRowItem) => { return renderWithRowSpan(text, record, (cellContent) => { if (isDetail) { @@ -803,6 +812,7 @@ const EvaluateTemplateTable: React.FC = ({ // (0.是、1.否 int类型) title: '是否可编辑', align: 'center', + ellipsis: true, // 自动加省略号 dataIndex: 'descIndicatorEditST', key: 'descIndicatorEditST', width: 50, @@ -829,7 +839,8 @@ const EvaluateTemplateTable: React.FC = ({ align: 'center', dataIndex: 'stScore', key: 'stScore', - width: 80, + width: 100, + ellipsis: true, // 自动加省略号 render: (text: string, record: TableRowItem) => { return renderWithRowSpan(text, record, (cellContent) => { if (isDetail) { @@ -852,6 +863,7 @@ const EvaluateTemplateTable: React.FC = ({ // (0.是、1.否 int类型) title: '是否可编辑', align: 'center', + ellipsis: true, // 自动加省略号 dataIndex: 'scoreEditST', key: 'scoreEditST', width: 50, @@ -928,6 +940,7 @@ const EvaluateTemplateTable: React.FC = ({ align: 'center', dataIndex: 'indicatorStEditST', key: 'indicatorStEditST', + ellipsis: true, // 自动加省略号 width: 50, render: (text: string, record: TableRowItem) => { return renderWithRowSpan(text, record, (cellContent) => { @@ -956,7 +969,8 @@ const EvaluateTemplateTable: React.FC = ({ dataIndex: 'subIndicator', key: 'subIndicator', align: 'center', - width: 200, + ellipsis: true, // 自动加省略号 + width: 150, render: (text: string, record: TableRowItem) => { if (isDetail) { return text || '-'; @@ -977,8 +991,9 @@ const EvaluateTemplateTable: React.FC = ({ title: intl.formatMessage({ id: 'supplierTemplateManage.evaluateTable.score' }), dataIndex: 'ndScore', key: 'ndScore', - width: 80, + ellipsis: true, // 自动加省略号 align: 'center', + width: 100, render: (text: string, record: TableRowItem) => { if (isDetail) { return text || '-'; @@ -1025,6 +1040,8 @@ const EvaluateTemplateTable: React.FC = ({ dataIndex: 'descScore', align: 'center', key: 'descScore', + ellipsis: true, // 自动加省略号 + width: 150, render: (text: string, record: TableRowItem) => { if (isDetail) { return text || '-'; diff --git a/src/hooks/useUser.ts b/src/hooks/useUser.ts index c865142..4021442 100644 --- a/src/hooks/useUser.ts +++ b/src/hooks/useUser.ts @@ -3,7 +3,7 @@ import { useState } from "react"; // 获取用户信息 这里没用dva, 因为包装组件写法复杂(当前框架),尤其是有form表单组件时 export const useUser = () => { const [user, setUser] = useState({ - role: 'admin1', // 模拟用户权限 + role: 'admin', // 模拟用户权限 userId: '1234567890', }); const getUserInfo = ()=>{ diff --git a/src/pages/register/supplier/DomesticForm.tsx b/src/pages/register/supplier/DomesticForm.tsx index c752d65..e74d977 100644 --- a/src/pages/register/supplier/DomesticForm.tsx +++ b/src/pages/register/supplier/DomesticForm.tsx @@ -194,11 +194,11 @@ const DomesticForm: React.FC = ({ ({ label: item.dicName, value: item.code, diff --git a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.less b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.less index 5822d9c..21d8a54 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.less +++ b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManage.less @@ -11,6 +11,9 @@ :global(.ant-card-head) { background-color: #fafafa; } + :global(.ant-card-body) { + padding: 0; + } } .formActions { @@ -48,13 +51,15 @@ .detail-card { margin-bottom: 16px; + :global(.ant-card-body) { + padding: 0; + } } .indicator-table { - margin-top: 16px; + // margin-top: 16px; } .status-tag { margin-right: 0; } - \ No newline at end of file diff --git a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageAdd.tsx b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageAdd.tsx index b25d6f7..fd84a27 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageAdd.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageAdd.tsx @@ -446,7 +446,6 @@ const SupplierAnnualTemplateManageAdd: React.FC = ({ breadcrumb, disp diff --git a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageDetail.tsx b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageDetail.tsx index cfe2106..ec093bc 100644 --- a/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageDetail.tsx +++ b/src/pages/supplierAnnualManage/supplierAnnualTemplateManage/supplierAnnualTemplateManageDetail.tsx @@ -133,7 +133,7 @@ const SupplierAnnualTemplateManageDetail: React.FC = () => { {templateDetail ? ( <> - + {templateDetail.templateName} diff --git a/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManage.less b/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManage.less index f13a99f..5e2180f 100644 --- a/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManage.less +++ b/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManage.less @@ -12,6 +12,9 @@ :global(.ant-card-head) { background-color: #fafafa; } + :global(.ant-card-body) { + padding: 0; + } } .template-indicator-card { diff --git a/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageAdd.tsx b/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageAdd.tsx index d8a7779..1f8359b 100644 --- a/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageAdd.tsx +++ b/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageAdd.tsx @@ -427,7 +427,7 @@ const SupplierTemplateManageAdd: React.FC = ({ breadcrumb, dispatch } diff --git a/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageDetail.tsx b/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageDetail.tsx index ae9e890..6bd14d7 100644 --- a/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageDetail.tsx +++ b/src/pages/supplierEvaluateManage/supplierTemplateManage/supplierTemplateManageDetail.tsx @@ -5,6 +5,7 @@ import { ArrowLeftOutlined } from '@ant-design/icons'; import { getTemplateDetail } from '@/servers/api/supplierEvaluate'; import { TemplateStatusText, CategoryLimitationTypeText } from '@/dicts/supplierTemplateDict'; import EvaluateTemplateTable from '@/components/EvaluateTemplateTable'; +import styles from './supplierTemplateManage.less'; const { Title } = Typography; @@ -84,8 +85,9 @@ const SupplierTemplateManageDetail: React.FC = () => { - + { {templateData.length > 0 ? (