From 8ad07c0ecdc177400f8a1dae7b1443d0c6461138 Mon Sep 17 00:00:00 2001
From: jlzhangyx5 <jl-zhangyx5@chinaunicom.cn>
Date: Thu, 12 Jun 2025 16:31:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=91=8A=E7=BB=93=E6=9E=84=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Promenu/index.tsx              |  5 +--
 .../components/BiddingAnnouncementList.tsx    | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/components/Promenu/index.tsx b/src/components/Promenu/index.tsx
index e4cc2d2..df22467 100644
--- a/src/components/Promenu/index.tsx
+++ b/src/components/Promenu/index.tsx
@@ -66,10 +66,7 @@ const Promenu: React.FC<{}> = () => {
   const open = Boolean(anchorEl);
 
   useEffect(() => {
-    //TODO zyx假数据-start
-    menuList({ defId: 'bid_qualification', projectId: '1920644626460389376' }).then(res => {
-    // menuList({ defId: defId, projectId: projectId }).then(res => {
-    //TODO zyx假数据-end
+    menuList({ defId: defId, projectId: projectId }).then(res => {
       if (res.code === 200) {
         let data = res.data;
         setData(data);
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
index 6b4f94b..4f049cc 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
@@ -596,6 +596,38 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
       setPageloading(false);
     })
   };
+  //招标公告结构化
+  const addAnnoStruc = async (annoId: any, editStatus: boolean) => {
+    spinSet(true);
+    let pass = false;
+    await checkConflict(tpId).then(resp => {
+      if (resp?.code == 200) {
+        if (!resp?.data) {
+          pass = true;
+        } else {
+          message.error("对不起，当前存在相关的采购实施计划，不能创建新的公告!");
+        }
+      }
+    });
+    /*校验是否有标包可以使用*/
+    pass && await GetNoticeUsablePackage(tpId).then(res => {
+      if (res.code == 200) {
+        if (res.data.length == 0) {
+          message.warn("没有可关联的" + name4)
+        } else {
+          history.push({
+            pathname: '/biddingAnnouncement/BiddingAnnoStructureForm',
+            state: {
+              projectId: tpId,
+              annoId: annoId ? annoId : undefined,
+              editStatus: editStatus
+            }
+          });
+        }
+      }
+    })
+    spinSet(false);
+  }
   //公告审批单&变更公告审批单
   const toApprovalFor = async (record: any) => {
     await getApprovalFor(record.id).then(res => {
@@ -618,6 +650,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           loading={pageloading}
           toolBarRender={() => [
             (defId === 'bid_qualification') &&
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase']) } type="primary" onClick={() => addAnnoStruc(null, false)}>新增结构化公告</Button>,
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="primary" onClick={() => history.push('/ProjectLayout/NoticeFileStruct')}>采购实施计划</Button>,
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="primary" onClick={() => toEditAdd([])}>新增{proName}公告</Button>,
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} onClick={() => {