From 34525199e87ac79a146cbaee56176c44157f97d5 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 19 May 2022 08:58:29 +0800
Subject: [PATCH] =?UTF-8?q?5.19=20=E5=A4=9A=E8=BD=AE=E6=8B=9B=E5=8B=9F?=
 =?UTF-8?q?=E5=89=B2=E6=8E=A5=E9=A1=B9=E7=9B=AE=E9=9A=90=E8=97=8F=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BiddingAnnouncementList.tsx    |  21 ++-
 .../components/BiddingInvitationList.tsx      |  11 +-
 .../Calibration/BidPublicityResult/index.tsx  |  11 +-
 .../BiddingDocumentsDecrypt/index.tsx         |   5 +-
 .../components/MoreEvaluation.tsx             |   7 +-
 .../ExceptionHandling/ExceptionHandling.tsx   | 135 +++++++-------
 .../BiddingAnnouncementList.tsx               | 175 +++++++++---------
 .../BiddingAnnouncementList.tsx               |  27 +--
 .../Calibration/BidPublicityResult/index.tsx  |  11 +-
 src/utils/DownloadUtils.ts                    |   4 +-
 10 files changed, 208 insertions(+), 199 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
index fc23162..76c0b95 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
@@ -18,6 +18,7 @@ import { history } from "umi";
 import { btnAuthority } from "@/utils/authority";
 import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
+import { checkObjectId } from "@/utils/DownloadUtils"
 
 /*
 * 招标公告开始
@@ -163,7 +164,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         let btn2 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -172,7 +173,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -181,7 +182,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
@@ -190,7 +191,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         let btn5 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Button type="text" onClick={() => toChange(record)}>变更</Button>
@@ -201,7 +202,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleReleaseOffline(record)}>线下发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -277,7 +278,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         let btn2 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -286,7 +287,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button type="text" hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -295,7 +296,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
@@ -304,7 +305,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         let btn5 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -313,7 +314,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
index 59482e0..2d6153a 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
@@ -19,6 +19,7 @@ import { getProId, getProMethod, getSessionProjectData } from '@/utils/session';
 import { btnAuthority } from '@/utils/authority';
 import { getApprProcessList } from '@/utils/SeleApprovalProcess/service';
 import SeleApprovalProcess from '@/utils/SeleApprovalProcess';
+import { checkObjectId } from '@/utils/DownloadUtils';
 
 /*
  * 招标公告开始
@@ -157,7 +158,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             <Button type="text" onClick={() => toRead(record)}>
               查看
             </Button>
-            <Button type="text" key="9" hidden={!record.approvalInstanceId} onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
           </>
@@ -175,7 +176,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             <Button type="text" onClick={() => toRead(record)}>
               查看
             </Button>
-            <Button type="text" key="9" hidden={!record.approvalInstanceId} onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
           </>
@@ -197,7 +198,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             >
               提交审批
             </Button>
-            <Button type="text" key="9" hidden={!record.approvalInstanceId} onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
             <Popconfirm
@@ -220,7 +221,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             <Button type="text" onClick={() => toRead(record)}>
               查看
             </Button>
-            <Button type="text" key="9" hidden={!record.approvalInstanceId} onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
           </>
@@ -238,7 +239,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             <Button type="text" onClick={() => toRead(record)}>
               查看
             </Button>
-            <Button type="text" key="9" hidden={!record.approvalInstanceId} onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
           </>
diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx
index 9e89a66..78f4193 100644
--- a/src/pages/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/Calibration/BidPublicityResult/index.tsx
@@ -18,6 +18,7 @@ import { btnAuthority } from "@/utils/authority";
 import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
 import { releaseNoticeOffline } from "@/pages/Bid/BiddingAnnouncement/service"
+import { checkObjectId } from "@/utils/DownloadUtils"
 
 /*
 * 招标公示开始
@@ -162,7 +163,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
         let btn2 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -171,7 +172,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>&nbsp;&nbsp;
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -180,7 +181,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>&nbsp;&nbsp;
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>&nbsp;&nbsp;
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
@@ -189,7 +190,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
         let btn5 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Popconfirm
@@ -215,7 +216,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>&nbsp;&nbsp;
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleReleaseOffline(record)}>线下发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
diff --git a/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx b/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx
index e6b48da..1331da3 100644
--- a/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx
+++ b/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx
@@ -24,6 +24,7 @@ import moment from "moment";
 import "@/assets/xsy_style.less";
 import { btnAuthority } from "@/utils/authority";
 import { numberToChinese } from '@/utils/CommonUtils';
+import { checkObjectId } from '@/utils/DownloadUtils';
 
 interface BiddingDocumentsDecryptProps {
 
@@ -397,8 +398,8 @@ const BiddingDocumentsDecrypt: React.FC<BiddingDocumentsDecryptProps> = (props)
                         <Button disabled={disabled} type="text"
                           onClick={() => download(record?.filePath, headType ? record?.companyName + "第" + item.turnSort + "轮" + responseType + "文件" : record?.companyName + responseType + "文件", record, item?.id)}
                           icon={<DownloadOutlined />}>下载</Button>
-                        <Button disabled={disabled} type="text" onClick={() => OpenWindow(record, item?.id)}
-                          icon={<DownloadOutlined />}>查看</Button>
+                        {checkObjectId(record.id) && <Button disabled={disabled} type="text" onClick={() => OpenWindow(record, item?.id)}
+                          icon={<DownloadOutlined />}>查看</Button>}
                       </>
                     );
                   }
diff --git a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx
index 592939a..9b5c4cb 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx
@@ -1,4 +1,5 @@
 import { btnAuthority } from '@/utils/authority';
+import { checkObjectId } from '@/utils/DownloadUtils';
 import { getProMethod } from '@/utils/session';
 import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
 import { Button, Drawer, message, Popconfirm } from 'antd';
@@ -197,7 +198,7 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
               <a key="1" onClick={() => toView(record)}>
                 查看
               </a>
-              <a key="2" onClick={() => toCheckApproval(record)}>
+              <a key="2" onClick={() => toCheckApproval(record)} hidden={!checkObjectId(record.id)}>
                 查看审批流程
               </a>
             </>
@@ -215,7 +216,7 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
               <a key="1" onClick={() => toView(record)}>
                 查看
               </a>
-              <a key="2" onClick={() => toCheckApproval(record)}>
+              <a key="2" onClick={() => toCheckApproval(record)} hidden={!checkObjectId(record.id)}>
                 查看审批流程
               </a>
             </>
@@ -226,7 +227,7 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
               <a key="1" onClick={() => toView(record)}>
                 查看
               </a>
-              <a key="2" onClick={() => toCheckApproval(record)}>
+              <a key="2" onClick={() => toCheckApproval(record)} hidden={!checkObjectId(record.id)}>
                 查看审批流程
               </a>
             </>
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
index 0417a9f..71b3b76 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
@@ -1,4 +1,5 @@
 import { btnAuthority } from '@/utils/authority';
+import { checkObjectId } from '@/utils/DownloadUtils';
 import SeleApprovalProcess from '@/utils/SeleApprovalProcess';
 import { getApprProcessList } from '@/utils/SeleApprovalProcess/service';
 import { getDicData, getProId } from '@/utils/session';
@@ -67,17 +68,17 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
     methodDict == 'procurement_mode_1' || methodDict == 'procurement_mode_2'
       ? '标段'
       : methodDict == 'procurement_mode_4'
-      ? '包件'
-      : '采购包';
+        ? '包件'
+        : '采购包';
   useEffect(() => {
-    if(drawerVisible) {
+    if (drawerVisible) {
       //初始化字典
       const data: any = getDicData();
       setDictData(JSON.parse(data));
       //存储项目数据
       setProjectData(values);
     }
-  }, [values?.id,drawerVisible]);
+  }, [values?.id, drawerVisible]);
 
   const getSectionList = async (param: any, id: any) => {
     let params = {
@@ -193,15 +194,15 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
   };
   //公告提交审批
   const toApproval = async (param: any) => {
-    if(param.sendMessageId == null) {
+    if (param.sendMessageId == null) {
       message.info("请先编辑失败公告")
     } else {
       setLoading(true);
       //获取流程列表
       getApprProcessList(param.sendMessageId).then(res => {
-        if(res?.code == 200) {
+        if (res?.code == 200) {
           const data = res?.data
-          if(data?.approval == true) {//打开选择流程界面
+          if (data?.approval == true) {//打开选择流程界面
             setRecordData(param)
             setApprovalData(data?.list)
             setApprovalVisible(true)
@@ -237,7 +238,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
   const toApprovalFor = async (record: any) => {
     setLoading(true)
     await getApprovalFor(record.sendMessageId).then(res => {
-      if(res?.code == 200 || res?.success == true) {
+      if (res?.code == 200 || res?.success == true) {
         const data = res?.data;
         let durl = /http:\/\/([^\/]+)\//i;
         let d = data?.traceDetailUrl?.replace(durl, '/');
@@ -309,10 +310,10 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
         //按钮逻辑判断
         record.status == 0 && record.sendMessageStatus == 7 ? ( //草稿-无需发布
           <>
-            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               编辑
             </Button>
-            <Button type="text" key="4" onClick={() => toTakeEffect(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="4" onClick={() => toTakeEffect(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               生效
             </Button>
             <Popconfirm
@@ -321,7 +322,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
               okText="确定"
               cancelText="取消"
             >
-              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
                 删除
               </Button>
             </Popconfirm>
@@ -334,10 +335,10 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
           (record.sendMessageStatus == 0 ||
             record.sendMessageStatus == 1) ? ( //草稿-公告未编辑-公告已编辑
           <>
-            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               编辑
             </Button>
-            <Button type="text" key="5" onClick={() => toEditNotice(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="5" onClick={() => toEditNotice(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               编辑失败公告
             </Button>
             <Popconfirm
@@ -346,7 +347,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
               okText="确定"
               cancelText="取消"
             >
-              <Button type="text" key="8" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+              <Button type="text" key="8" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
                 失败公告提交审批
               </Button>
             </Popconfirm>
@@ -356,20 +357,20 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
               okText="确定"
               cancelText="取消"
             >
-              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
                 删除
               </Button>
             </Popconfirm>
           </>
         ) : record.status == 0 && record.sendMessageStatus == 2 ? ( //草稿-公告已提交
           <>
-            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               编辑
             </Button>
             <Button type="text" key="6" onClick={() => toViewNotice(record)}>
               查看失败公告
             </Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Popconfirm
@@ -378,20 +379,20 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
               okText="确定"
               cancelText="取消"
             >
-              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
                 删除
               </Button>
             </Popconfirm>
           </>
         ) : record.status == 0 && record.sendMessageStatus == 3 ? ( //草稿-公告已审批通过
           <>
-            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               编辑
             </Button>
             <Button type="text" key="6" onClick={() => toViewNotice(record)}>
               查看失败公告
             </Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Popconfirm
@@ -400,7 +401,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
               okText="确定"
               cancelText="取消"
             >
-              <Button type="text" key="7" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+              <Button type="text" key="7" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
                 发布失败公告
               </Button>
             </Popconfirm>
@@ -410,44 +411,44 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
               okText="确定"
               cancelText="取消"
             >
-              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
                 删除
               </Button>
             </Popconfirm>
           </>
         ) : record.status == 0 && record.sendMessageStatus == 4 ? ( //草稿-审批不通过
-        <>
-          <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
-            编辑
-          </Button>
-          <Button type="text" key="5" onClick={() => toEditNotice(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
-            编辑失败公告
-          </Button>
-          <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+          <>
+            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
+              编辑
+            </Button>
+            <Button type="text" key="5" onClick={() => toEditNotice(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
+              编辑失败公告
+            </Button>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
-          </Button>
-          <Popconfirm
-            title="确定要提交审批吗？"
-            onConfirm={() => toApproval(record)}
-            okText="确定"
-            cancelText="取消"
-          >
-            <Button type="text" key="8" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
-              失败公告提交审批
             </Button>
-          </Popconfirm>
-          <Popconfirm
-            title="确定要删除吗？"
-            onConfirm={() => toDelete(record)}
-            okText="确定"
-            cancelText="取消"
-          >
-            <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
-              删除
-            </Button>
-          </Popconfirm>
-        </>
-      ) : record.status == 0 && record.sendMessageStatus == 5 ? ( //草稿-公告已发布
+            <Popconfirm
+              title="确定要提交审批吗？"
+              onConfirm={() => toApproval(record)}
+              okText="确定"
+              cancelText="取消"
+            >
+              <Button type="text" key="8" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
+                失败公告提交审批
+              </Button>
+            </Popconfirm>
+            <Popconfirm
+              title="确定要删除吗？"
+              onConfirm={() => toDelete(record)}
+              okText="确定"
+              cancelText="取消"
+            >
+              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
+                删除
+              </Button>
+            </Popconfirm>
+          </>
+        ) : record.status == 0 && record.sendMessageStatus == 5 ? ( //草稿-公告已发布
           <>
             <Button type="text" key="2" onClick={() => toView(record)}>
               查看
@@ -455,10 +456,10 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
             <Button type="text" key="6" onClick={() => toViewNotice(record)}>
               查看失败公告
             </Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
-            <Button type="text" key="4" onClick={() => toTakeEffect(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="4" onClick={() => toTakeEffect(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               生效
             </Button>
           </>
@@ -470,7 +471,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
             <Button type="text" key="6" onClick={() => toViewNotice(record)}>
               查看失败公告
             </Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Popconfirm
@@ -479,7 +480,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
               okText="确定"
               cancelText="取消"
             >
-              <Button type="text" key="7" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+              <Button type="text" key="7" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
                 发布失败公告
               </Button>
             </Popconfirm>
@@ -489,7 +490,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
               okText="确定"
               cancelText="取消"
             >
-              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
                 删除
               </Button>
             </Popconfirm>
@@ -502,7 +503,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
             <Button type="text" key="6" onClick={() => toViewNotice(record)}>
               查看失败公告
             </Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -538,7 +539,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
           style={{ marginBottom: 12, zIndex: 99 }}
           onClick={() => toAdd()}
           loading={addLoading}
-          hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}
+          hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}
         >
           创建异常处理
         </Button>
@@ -560,7 +561,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
                 total: res.data.total,
                 current: res.data.current,
               };
-            }) : {data: [],success: false}
+            }) : { data: [], success: false }
           }
           rowKey="id"
           pagination={{
@@ -634,13 +635,13 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
         projectData={values}
       />}
       {approvalVisible ? (
-          <SeleApprovalProcess modalVisible={approvalVisible} onCancel={() => {
-            setApprovalVisible(false)
-            setApprovalData([])
-            setRecordData({})
-            actionRef.current?.reload?.();
-          }} data={approvalData} annoId={recordData?.sendMessageId} />
-        ) : null}
+        <SeleApprovalProcess modalVisible={approvalVisible} onCancel={() => {
+          setApprovalVisible(false)
+          setApprovalData([])
+          setRecordData({})
+          actionRef.current?.reload?.();
+        }} data={approvalData} annoId={recordData?.sendMessageId} />
+      ) : null}
     </Drawer>
   );
 };
diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index 07d3987..0665e42 100644
--- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
+++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
@@ -1,7 +1,7 @@
-import {UnorderedListOutlined} from "@ant-design/icons"
-import ProTable, {ActionType, ProColumns} from "@ant-design/pro-table"
-import {Button, Card, Divider, Drawer, message, Modal, Spin, Table} from "antd"
-import React, {useEffect, useRef, useState} from "react"
+import { UnorderedListOutlined } from "@ant-design/icons"
+import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table"
+import { Button, Card, Divider, Drawer, message, Modal, Spin, Table } from "antd"
+import React, { useEffect, useRef, useState } from "react"
 import BiddingAnnouncement from "./components/BiddingAnnouncement"
 import BiddingAnnouncement4Change from "./components/BiddingAnnouncement4Change"
 import {
@@ -14,11 +14,12 @@ import {
   GetNoticeUsablePackage, releaseNoticeOffline, getApprovalFor
 } from "./service"
 
-import {getProId, getProMethod} from "@/utils/session";
-import {checkConflict} from "@/pages/Bid/BiddingAnnouncement/service";
-import {btnAuthority} from "@/utils/authority";
+import { getProId, getProMethod } from "@/utils/session";
+import { checkConflict } from "@/pages/Bid/BiddingAnnouncement/service";
+import { btnAuthority } from "@/utils/authority";
 import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
+import { checkObjectId } from "@/utils/DownloadUtils"
 
 /*
 * 资审公告开始
@@ -124,53 +125,53 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
       render: (_: any, record: any) => {
         let btn1 = (
           <>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
         let btn2 = (
           <>
-            <Button  type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" onClick={() => toRead(record)}>查看</Button>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
         );
         let btn3 = (
           <>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
         );
         let btn4 = (
           <>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
         let btn5 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
-            <Button  type="text" onClick={() => toChange(record)}>变更</Button>
+            <Button type="text" onClick={() => toChange(record)}>变更</Button>
           </>
         );
         let btn6 = (
           <>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleReleaseOffline(record)}>线下发布</Button>
-            <Button  type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleReleaseOffline(record)}>线下发布</Button>
+            <Button type="text" onClick={() => toRead(record)}>查看</Button>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -201,12 +202,12 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
 
     },
   ];
-  const ChangeNoticeListcolumns:any = [
+  const ChangeNoticeListcolumns: any = [
     {
       title: '公告标题',
       dataIndex: 'annoTitle',
       align: 'left',
-      valueType:"text"
+      valueType: "text"
     },
     {
       title: '起草时间',
@@ -222,13 +223,13 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
       key: "status",
       align: 'left',
       valueEnum: {
-        1: {text: '起草', status: '一'},
-        2: {text: '已提交', status: ''},
-        3: {text: '已审批', status: ''},
-        4: {text: '已拒绝', status: ''},
-        5: {text: '已发布', status: ''},
-        6: {text: '发布失败', status: ''},
-        9: {text: '异常处理', status: ''},
+        1: { text: '起草', status: '一' },
+        2: { text: '已提交', status: '' },
+        3: { text: '已审批', status: '' },
+        4: { text: '已拒绝', status: '' },
+        5: { text: '已发布', status: '' },
+        6: { text: '发布失败', status: '' },
+        9: { text: '异常处理', status: '' },
       },
     },
     {
@@ -238,51 +239,51 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
       render: (_: any, record: any) => {
         let btn1 = (
           <>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
         let btn2 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
         );
         let btn3 = (
           <>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
         );
         let btn4 = (
           <>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
         let btn5 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
         );
         let btn6 = (
           <>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
-            <Button  type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
+            <Button type="text" onClick={() => toRead(record)}>查看</Button>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -328,7 +329,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         "pageSize": dataSourceNum,
         "source": 11,
         "tpId": tpId,
-        "roomType":"1",
+        "roomType": "1",
       }).then(res => {
         if (res.code == 200) {
           setdataSource(res.data.records);
@@ -346,7 +347,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         "pageSize": 100,
         "source": 11,
         "tpId": tpId,
-        "roomType":"1",
+        "roomType": "1",
       }).then(res => {
         if (res.message == "success" && res.data != null) {
           setChangeNoticeListdataSource(res.data.records);
@@ -365,7 +366,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
 
   /*新增资审公告*/
   const toEditAdd = async (props: any) => {
-    await checkConflict(tpId).then(resp=>{
+    await checkConflict(tpId).then(resp => {
       if (resp?.code == 200) {
         if (!resp?.data) {
           GetNoticeUsablePackage(tpId).then(res => {
@@ -479,7 +480,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         }
       }
       setRefresh(Math.random() + 1);
-    }).finally(()=>setPageloading(false));
+    }).finally(() => setPageloading(false));
   };
   /**
    * 再次发布
@@ -526,9 +527,9 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
     setPageloading(true);
     //获取流程列表
     getApprProcessList(record.id).then(res => {
-      if(res?.code == 200) {
+      if (res?.code == 200) {
         const data = res?.data
-        if(data?.approval == true) {//打开选择流程界面
+        if (data?.approval == true) {//打开选择流程界面
           setRecordData(record)
           setApprovalData(data?.list)
           setApprovalVisible(true)
@@ -549,10 +550,10 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
     })
   };
 
-   //公告审批单&变更公告审批单
-   const toApprovalFor = async (record: any) => {
+  //公告审批单&变更公告审批单
+  const toApprovalFor = async (record: any) => {
     await getApprovalFor(record.id).then(res => {
-      if(res?.code == 200 || res?.success == true) {
+      if (res?.code == 200 || res?.success == true) {
         const data = res?.data;
         let durl = /http:\/\/([^\/]+)\//i;
         let d = data?.traceDetailUrl?.replace(durl, '/');
@@ -564,13 +565,13 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
 
 
   return (
-    <div style={{padding: '0px 24px'}}>
+    <div style={{ padding: '0px 24px' }}>
       <ProTable
         size={"small"}
         loading={pageloading}
         toolBarRender={() => [
-          <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="primary" onClick={() => toEditAdd([])}>新增资审公告</Button>,
-          <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} onClick={() => {
+          <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="primary" onClick={() => toEditAdd([])}>新增资审公告</Button>,
+          <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} onClick={() => {
             handleRemoveMore()
           }}>批量删除</Button>,
         ]}
@@ -605,47 +606,47 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           centered
           closable={false}
           // bodyStyle={{margin:0,padding:0}}
-          footer={[ <Button onClick={()=>setChangeNoticeListVisible(false)}>关闭 </Button>]}
+          footer={[<Button onClick={() => setChangeNoticeListVisible(false)}>关闭 </Button>]}
         >
           <ProTable
             toolBarRender={() => [
-              <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="primary"  onClick={() => creatChangeNotice()}>新增变更公告</Button>,
+              <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="primary" onClick={() => creatChangeNotice()}>新增变更公告</Button>,
             ]}
             size={"small"}
             search={false}
             options={false}
             columns={ChangeNoticeListcolumns}
             dataSource={ChangeNoticeListdataSource}
-            pagination={{hideOnSinglePage: true, pageSize: 50}}
+            pagination={{ hideOnSinglePage: true, pageSize: 50 }}
             loading={pageloading}
           />
         </Modal>
       ) : null}
-        {updateVisible ? (
-          <BiddingAnnouncement key={Math.random()} SX={() => setRefresh(Math.random() + 1)} titleName={updateChange}
-                               pkId={pkId} type={type} tpId={tpId}
-                               onCancel={() => setUpdateVisible(false)} modalVisible={updateVisible} FpkId={FpkId}
-                               ChangeSX={() => GetList(FpkId)}/>
-        ) : null}
-        {updateVisible4Change ? (
-          <BiddingAnnouncement4Change key={Math.random()} SX={() => setRefresh(Math.random() + 1)}
-                                      titleName={updateChange} pkId={pkId} type={type} tpId={tpId}
-                                      onCancel={() => setUpdateVisible4Change(false)}
-                                      modalVisible={updateVisible4Change} FpkId={FpkId}
-                                      ChangeSX={() => GetList(FpkId)}/>
-        ) : null}
-        {approvalVisible ? (
-          <SeleApprovalProcess modalVisible={approvalVisible} onCancel={() => {
-            setApprovalVisible(false)
-            setApprovalData([])
-            setRecordData({})
-            if (type == "change" || type == "changeNew") {
-              GetList(FpkId);
-            } else {
-              setRefresh(Math.random() + 1)
-            }
-          }} data={approvalData} annoId={recordData?.id} />
-        ) : null}
+      {updateVisible ? (
+        <BiddingAnnouncement key={Math.random()} SX={() => setRefresh(Math.random() + 1)} titleName={updateChange}
+          pkId={pkId} type={type} tpId={tpId}
+          onCancel={() => setUpdateVisible(false)} modalVisible={updateVisible} FpkId={FpkId}
+          ChangeSX={() => GetList(FpkId)} />
+      ) : null}
+      {updateVisible4Change ? (
+        <BiddingAnnouncement4Change key={Math.random()} SX={() => setRefresh(Math.random() + 1)}
+          titleName={updateChange} pkId={pkId} type={type} tpId={tpId}
+          onCancel={() => setUpdateVisible4Change(false)}
+          modalVisible={updateVisible4Change} FpkId={FpkId}
+          ChangeSX={() => GetList(FpkId)} />
+      ) : null}
+      {approvalVisible ? (
+        <SeleApprovalProcess modalVisible={approvalVisible} onCancel={() => {
+          setApprovalVisible(false)
+          setApprovalData([])
+          setRecordData({})
+          if (type == "change" || type == "changeNew") {
+            GetList(FpkId);
+          } else {
+            setRefresh(Math.random() + 1)
+          }
+        }} data={approvalData} annoId={recordData?.id} />
+      ) : null}
     </div>
   )
 }
diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index 865bc6c..d42b558 100644
--- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
+++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
@@ -19,6 +19,7 @@ import { checkConflict } from "@/pages/Bid/BiddingAnnouncement/service";
 import { btnAuthority } from "@/utils/authority";
 import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
+import { checkObjectId } from "@/utils/DownloadUtils"
 
 /*
 * 招标公告开始
@@ -123,7 +124,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         let btn2 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -132,7 +133,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -141,7 +142,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Button type="text" onClick={() => handleRemove(record)}>删除</Button>
@@ -150,7 +151,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         let btn5 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Button type="text" onClick={() => toChange(record)}>变更</Button>
@@ -163,7 +164,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleReleaseOffline(record)}>线下发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -260,7 +261,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         let btn2 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -269,7 +270,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -278,7 +279,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
@@ -287,7 +288,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         let btn5 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -296,7 +297,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -527,13 +528,13 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   /**
    * 发起审批
    * */
-   const handleApproval = async (record: any) => {
+  const handleApproval = async (record: any) => {
     setPageloading(true);
     //获取流程列表
     getApprProcessList(record.id).then(res => {
-      if(res?.code == 200) {
+      if (res?.code == 200) {
         const data = res?.data
-        if(data?.approval == true) {//打开选择流程界面
+        if (data?.approval == true) {//打开选择流程界面
           setRecordData(record)
           setApprovalData(data?.list)
           setApprovalVisible(true)
diff --git a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
index bd30a51..5f07f13 100644
--- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
@@ -17,6 +17,7 @@ import { getProId } from "@/utils/session";
 import { btnAuthority } from "@/utils/authority";
 import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
+import { checkObjectId } from "@/utils/DownloadUtils"
 
 /*
 * 招标公示开始
@@ -116,7 +117,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
         let btn2 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -125,7 +126,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>&nbsp;&nbsp;
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -134,7 +135,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>&nbsp;&nbsp;
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>&nbsp;&nbsp;
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
             <Button type="text" onClick={() => handleRemove(record)}>删除</Button>
@@ -143,7 +144,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
         let btn5 = (
           <>
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
@@ -152,7 +153,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleRelease(record)}>发布</Button>&nbsp;&nbsp;
             <Button type="text" onClick={() => toRead(record)}>查看</Button>
-            <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
+            <Button type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
           </>
diff --git a/src/utils/DownloadUtils.ts b/src/utils/DownloadUtils.ts
index 005e379..895e044 100644
--- a/src/utils/DownloadUtils.ts
+++ b/src/utils/DownloadUtils.ts
@@ -2,7 +2,7 @@
  * @Author: zhoujianlong 
  * @Date: 2022-03-03 09:06:36 
  * @Last Modified by: zhoujianlong
- * @Last Modified time: 2022-03-17 16:40:43
+ * @Last Modified time: 2022-05-18 17:23:26
  */
 
 import { getDownloadSecretKey, getFilelist, getFilelistBySecond } from "@/services/download_";
@@ -60,7 +60,7 @@ export interface FilelistProps {
  * @param objectId 
  * @returns 
  */
-const checkObjectId = (objectId: string) => {
+export const checkObjectId = (objectId: string) => {
    const pattern = /[a-zA-Z]+/;
    return objectId.length == 19 && !pattern.test(objectId);
 }