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

src/pages/Calibration/BidPublicityResult/index.tsx

@@ -53,7 +53,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
 
-  let name1 = "中标";
+  let name1 = "中标候选人";
   let name2 = "评标";
   let name3 = "开标";
   let name4 = "标段";
@@ -63,35 +63,35 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   let defId = getDefId();
   if (proDict == "procurement_mode_1" || proDict == "procurement_mode_2") {
     TpPackageName = "招标";
-    name1 = "中标";
+    name1 = "中标候选人";
     name2 = "评标";
     name3 = "开标";
     name4 = "标段";
     name5 = '定标';
   } else if (proDict == "procurement_mode_3") {
     TpPackageName = "比选";
-    name1 = "中选";
+    name1 = "中选候选人";
     name2 = "评审";
     name3 = "评审开始"
     name4 = "采购包";
     name5 = '评审结果';
   } else if (proDict == "procurement_mode_5" || proDict == "procurement_mode_6" || proDict == "procurement_mode_9") {
     TpPackageName = "谈判";
-    name1 = "中选";
+    name1 = "中选候选人";
     name2 = "评审";
     name3 = "评审开始";
     name4 = "采购包";
     name5 = '评审结果';
   } else if (proDict == "procurement_mode_4") {
     TpPackageName = "招募";
-    name1 = "中选";
+    name1 = "招募结果";
     name2 = "评审";
     name3 = "评审开始"
     name4 = "包件";
     name5 = '评审结果';
   } else if (proDict == "procurement_mode_7") {
     TpPackageName = "询价";
-    name1 = "中选";
+    name1 = "中选候选人";
     name2 = "评审";
     name3 = "评审开始";
     name4 = "采购包";
@@ -289,7 +289,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           message.warn(`没有可关联的${name4}！`)
         } else {
           setPkId("");
-          setUpdateChange(`新建${name1}候选人公示`)
+          setUpdateChange(`${proDict == "procurement_mode_4" ? '新增' : '新建'}${name1}公示`)
           setType("new");
           setUpdateVisible(true);
         }
@@ -300,14 +300,14 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   }
   /*编辑招标公示*/
   const toEdit = (props: any) => {
-    setUpdateChange(`编辑${name1}候选人公示`)
+    setUpdateChange(`编辑${name1}公示`)
     setPkId(props.id);
     setType("edit");
     setUpdateVisible(true);
   }
   /*查看招标公示*/
   const toRead = (props: any) => {
-    setUpdateChange(`查看${name1}候选人公示`)
+    setUpdateChange(`查看${name1}公示`)
     setType("read");
     setPkId(props.id);
     setUpdateVisible(true);
@@ -447,7 +447,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([])}>新建{name1}候选人公示</Button>,
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>{proDict == "procurement_mode_4" ? '新增' : '新建'}{name1}公示</Button>,
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"2"} onClick={() => {
               handleRemoveMore()
             }}>批量删除</Button>,

src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx

@@ -68,14 +68,7 @@ const ViewBlacklistFormModal: React.FC<ViewBlacklistFormModalProps> = (props) =>
         return a;
       }
     },
-    {
+    { title: '黑名单等级', dataIndex: 'lvName', },
-      title: '黑名单等级', dataIndex: 'lv', render: (_, record) => {
-        if (record.isBlack == "1") {
-          return (isEmpty(record.lv) || record.lv == "1") ? '一级' : '二级';
-        }
-        return '';
-      }
-    },
     { title: '黑名单开始时间', dataIndex: 'startTime', },
     { title: '黑名单结束时间', dataIndex: 'endTime', },
     { title: '黑名单期限', dataIndex: 'term', },

src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx

@@ -32,10 +32,7 @@ const ViewInvoiceFormModal: React.FC<ViewInvoiceFormModalProps> = (props) => {
       dataIndex: 'ouName',
     }, {
       title: '黑名单等级',
-      dataIndex: 'reserved5',
+      dataIndex: 'lvName',
-      render: (_: any, record: any) => {
-        return (isEmpty(record.reserved5) || record.reserved5 == "1") ? '一级' : '二级';
-      }
     }, {
       title: '黑名单开始时间',
       dataIndex: 'startTime',

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

@@ -477,9 +477,10 @@ const ClarifyTheList: React.FC<{}> = () => {
     }
     function afterSave() {
         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) {
                     //招标文件获取开始时间
                     let docStartTimes = res.data.map((item: any) => item.docStartTime);

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

@@ -107,9 +107,10 @@ 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,
     });
 }

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,7 +511,8 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   /**
    * 再次发布
    * */
-  const handleReleaseAgain = async (record: any) => {
+  const handleReleaseAgain = (record: any) => {
+    const releaseAgain = async () => {
       setPageloading(true);
       await releaseNoticeAgain(record.id).then(res => {
         if (res.code == 200) {
@@ -519,6 +523,20 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         }
         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,
     });
 }
 /**

src/services/bidev.js

@@ -18,7 +18,7 @@ export async function zmmultiOpenBizassessroom(params) {
 
 export async function resetVerificationCode(params) {
   return request(`/api/biz-service-ebtp-process/v1/bizassessroom/update/captcha/${params.id}`,
-  {method: 'put'});
+  {method: 'post'});
 }
 
 export async function fetchJuryList(params) {