Merge branch '20220520-常态化招募项目再次发布无法发布最新公告' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220413-zjl-公共服务平台

src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx

@@ -1,4 +1,4 @@
-import { UnorderedListOutlined } from "@ant-design/icons"
+import { ExclamationCircleOutlined, UnorderedListOutlined } from "@ant-design/icons"
 import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table"
 import { Button, Card, Divider, Drawer, message, Modal, Spin, Table, Tabs } from "antd"
 import React, { useEffect, useRef, useState } from "react"
@@ -60,6 +60,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
   const { TabPane } = Tabs;
+  const { confirm } = Modal;
   const columns: ProColumns<DataItem>[] = [
     {
       title: '公告名称',
@@ -302,6 +303,8 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
               查看审批流程
             </Button>
             <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
+            {getProMethod() == "procurement_mode_4" ?
+              <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleReleaseAgain(record)}>再次发布</Button> : null}
           </>
         );
         let btn6 = (
@@ -508,17 +511,32 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   /**
    * 再次发布
    * */
-  const handleReleaseAgain = async (record: any) => {
-    setPageloading(true);
-    await releaseNoticeAgain(record.id).then(res => {
-      if (res.code == 200) {
-        message.success('发布成功');
-        if (type == "change" || type == "changeNew") {
-          GetList(FpkId);
+  const handleReleaseAgain = (record: any) => {
+    const releaseAgain = async () => {
+      setPageloading(true);
+      await releaseNoticeAgain(record.id).then(res => {
+        if (res.code == 200) {
+          message.success('发布成功');
+          if (type == "change" || type == "changeNew") {
+            GetList(FpkId);
+          }
         }
-      }
-      setRefresh(Math.random() + 1)
-    }).finally(() => setPageloading(false));
+        setRefresh(Math.random() + 1)
+      }).finally(() => setPageloading(false));
+    }
+    if (record?.hasChangeAnno) {//存在处于已发布状态的变更公告
+      confirm({
+        title: '有已发布的变更公告，是否再次发布原公告？',
+        icon: <ExclamationCircleOutlined />,
+        centered: true,
+        okText: '发布',
+        onOk() {
+          releaseAgain();
+        },
+      });
+    } else {
+      releaseAgain();
+    }
   };
 
   /**

src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx

@@ -226,7 +226,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
         if (res.data.length == 0) {
           message.warn("没有可关联的包件！")
         } else {
-          setUpdateChange('新建中选候选人公示')
+          setUpdateChange('新增招募结果公示')
           setType("new");
           setUpdateVisible(true);
         }
@@ -238,14 +238,14 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   }
   /*编辑招标公示*/
   const toEdit = (props: any) => {
-    setUpdateChange('编辑中选候选人公示')
+    setUpdateChange('编辑招募结果公示')
     setPkId(props.id);
     setType("edit");
     setUpdateVisible(true);
   }
   /*查看招标公示*/
   const toRead = (props: any) => {
-    setUpdateChange('查看中选候选人公示')
+    setUpdateChange('查看招募结果公示')
     setType("read");
     setPkId(props.id);
     setUpdateVisible(true);
@@ -365,7 +365,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           size={"small"}
           loading={pageloading}
           toolBarRender={() => [
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>新建中选候选人公示</Button>,
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>新增招募结果公示</Button>,
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"2"} onClick={() => { handleRemoveMore() }}>批量删除</Button>,
           ]}
           search={false}

src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx

@@ -477,9 +477,10 @@ const ClarifyTheList: React.FC<{}> = () => {
                 return;
             }
             let packageIds = isNotEmpty(form.getFieldValue('packageId')) ? String(form.getFieldValue('packageId')).split(',') : [];
+            let params = { roomType };
             if (isNotEmpty(packageIds) && packageIds.length !== 0) {
                 //获取公告信息 判断文件的获取和截止时间与应答截止时间的关系
-                getClarifyAnnoList(packageIds).then(res => {
+                getClarifyAnnoList(packageIds, params).then(res => {
                     if (res.code == 200) {
                         getRoomList({ sectionIdList: packageIds }).then((res2) => {
                             if (res2.code == 200) {

src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts

@@ -107,10 +107,11 @@ export function getSections(projectId: any, roomType: any) {
  * 根据标段id查询公告
  * @param data 
  */
-export function getClarifyAnnoList(data: any) {
+export function getClarifyAnnoList(data: any, params: any) {
     return request('/api/biz-service-ebtp-bid/v1/anno/clarifyAnnoList', {
         method: 'post',
-        data: data
+        data: data,
+        params: params,
     });
 }
 /**