From 7b7d01b6891b4ce699c529fbedac68bac4592c5f Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Wed, 6 Apr 2022 20:32:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?4.6=20=E5=A2=9E=E5=8A=A0=E5=BC=80=E6=A0=87?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ProjectDocumentation.tsx | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx index 29107d0..9936e79 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx @@ -57,6 +57,8 @@ const ProjectDocumentation: React.FC = () => { render: (_: any, record: any) => { //标段信息 let sectionFirst = record?.sectionFirst; + //获取字段名称 + let openingName = openingTimeText(record?.bidMethodDict, record?.examinationMethodDict); return ( <> @@ -74,6 +76,9 @@ const ProjectDocumentation: React.FC = () => {

{sectionFirst.bidSectName}

{createSection(record)} +
+ {openingName}时间：{isEmpty(sectionFirst.sectionOpenTime) ? '-' : sectionFirst.sectionOpenTime} +
) } @@ -236,7 +241,36 @@ const ProjectDocumentation: React.FC = () => { ) } - + /** + * 开标时间，评审开始时间字段显示 + * @param bidMethod + * @param examinationMethod + */ + const openingTimeText = (bidMethod: string, examinationMethod: string | null) => { + const bid = '开标'; + const bid_pre = '资审开标'; + const comparison = '开启'; + const comparison_pre = '资审开启'; + const negotiation = '谈判开始'; + const review = '评审开始'; + if (bidMethod == 'procurement_mode_1' || bidMethod == 'procurement_mode_2') { + if (examinationMethod == 'examination_method_1') { //预审 + return bid_pre; + } else { + return bid; + } + } else if (bidMethod == 'procurement_mode_5' || bidMethod == 'procurement_mode_6') { + return negotiation; + } else if (bidMethod == 'procurement_mode_3') { + if (examinationMethod == 'examination_method_1') { //预审 + return comparison_pre; + } else { + return comparison; + } + } else { + return review; + } + }; /** * 项目跟进 From 432c76fed90f4f676b279f02655ae0c88fe3ec67 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Sun, 10 Apr 2022 19:50:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?4.10=20=E9=A1=B9=E7=9B=AE=E7=BB=8F=E7=90=86?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=85=A8=E9=83=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BC=80=E6=A0=87=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ProjectDocumentation.tsx | 6 +++--- .../components/ProjectSectionInfo.tsx | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx index 9936e79..a1bd77b 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectDocumentation.tsx @@ -75,7 +75,7 @@ const ProjectDocumentation: React.FC = () => {

{sectionFirst.bidSectName}

- {createSection(record)} + {createSection(record, openingName)}
{openingName}时间：{isEmpty(sectionFirst.sectionOpenTime) ? '-' : sectionFirst.sectionOpenTime}
@@ -159,7 +159,7 @@ const ProjectDocumentation: React.FC = () => { * @param record * @returns */ - const createSection = (record: any) => { + const createSection = (record: any, openingName: string) => { //标段信息 let sectionFirst = record?.sectionFirst; //是否异常 @@ -227,7 +227,7 @@ const ProjectDocumentation: React.FC = () => { sectionFirst.sectionCount > 1 && ( + )} trigger="hover" overlayStyle={{ width: "45%" }} diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectSectionInfo.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectSectionInfo.tsx index 80e7a6f..811f35b 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectSectionInfo.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ProjectSectionInfo.tsx @@ -8,14 +8,15 @@ import { getBusinessModuleName, getSectionBybidMethodDict, getTagColor } from ". interface ProjectSectionInfoItem { projectId: string, - bidMethodDict: string + bidMethodDict: string, + openingName: string, } //进度条长度 const progressWidth = { width: '180px' } const ProjectSectionInfo: React.FC = (props) => { - const { projectId, bidMethodDict } = props; + const { projectId, bidMethodDict, openingName } = props; const [listData, setListData] = useState([]); const [loading, setLoading] = useState(false); //获取字典 @@ -48,6 +49,9 @@ const ProjectSectionInfo: React.FC = (props) => { {createSection(record)} +
+ {openingName}时间：{isEmpty(record.sectionOpenTime) ? '-' : record.sectionOpenTime} +
) @@ -108,7 +112,7 @@ const ProjectSectionInfo: React.FC = (props) => { archiveStatus ? 已归档 - + : {getBusinessModuleName(dictData, bidMethodDict, sectionFirst?.businessModule)} @@ -120,7 +124,7 @@ const ProjectSectionInfo: React.FC = (props) => { 异常 } - 报名人数：{isEmpty(sectionFirst.applyCount) ? "0" : sectionFirst.applyCount} + 报名人数：{isEmpty(sectionFirst.applyCount) ? "0" : sectionFirst.applyCount} ) }