From 432c76fed90f4f676b279f02655ae0c88fe3ec67 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Sun, 10 Apr 2022 19:50:46 +0800
Subject: [PATCH] =?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 = () => {
                         <div>
                           <h4 style={{ marginBottom: '0px' }}>{sectionFirst.bidSectName}</h4>
                         </div>
-                        {createSection(record)}
+                        {createSection(record, openingName)}
                         <div>
                           <text style={{ marginBottom: '0px' }}>{openingName}时间：{isEmpty(sectionFirst.sectionOpenTime) ? '-' : sectionFirst.sectionOpenTime}</text>
                         </div>
@@ -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 && (
             <Popover
               content={(
-                <ProjectSectionInfo projectId={record.id} bidMethodDict={record.bidMethodDict} />
+                <ProjectSectionInfo projectId={record.id} bidMethodDict={record.bidMethodDict} openingName={openingName} />
               )}
               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<ProjectSectionInfoItem> = (props) => {
-    const { projectId, bidMethodDict } = props;
+    const { projectId, bidMethodDict, openingName } = props;
     const [listData, setListData] = useState<any[]>([]);
     const [loading, setLoading] = useState<boolean>(false);
     //获取字典
@@ -48,6 +49,9 @@ const ProjectSectionInfo: React.FC<ProjectSectionInfoItem> = (props) => {
                         </Col>
                         <Col span={14}>
                             {createSection(record)}
+                            <div>
+                                <text style={{ marginBottom: '0px' }}>{openingName}时间：{isEmpty(record.sectionOpenTime) ? '-' : record.sectionOpenTime}</text>
+                            </div>
                         </Col>
                     </Row>
                 )
@@ -108,7 +112,7 @@ const ProjectSectionInfo: React.FC<ProjectSectionInfoItem> = (props) => {
                     archiveStatus
                         ? <Tag color="#52c41a">
                             已归档
-                          </Tag>
+                        </Tag>
                         : <Tag color={getTagColor(sectionFirst?.businessModule)}>
                             {getBusinessModuleName(dictData, bidMethodDict, sectionFirst?.businessModule)}
                         </Tag>
@@ -120,7 +124,7 @@ const ProjectSectionInfo: React.FC<ProjectSectionInfoItem> = (props) => {
                         异常
                     </Tag>
                 }
-                    报名人数：{isEmpty(sectionFirst.applyCount) ? "0" : sectionFirst.applyCount}
+                报名人数：{isEmpty(sectionFirst.applyCount) ? "0" : sectionFirst.applyCount}
             </div>
         )
     }