diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx index 2d7f48d..f54b13a 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx @@ -19,6 +19,7 @@ import { btnAuthority } from "@/utils/authority"; import { getApprProcessList } from "@/utils/SeleApprovalProcess/service" import SeleApprovalProcess from "@/utils/SeleApprovalProcess" import { isEmpty } from "@/utils/CommonUtils" +import { checkObjectId } from "@/utils/DownloadUtils" /* * 招标公告开始 @@ -165,7 +166,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn2 = ( <> - @@ -175,7 +176,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -185,7 +186,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -195,7 +196,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn5 = ( <> - @@ -207,7 +208,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { - @@ -285,7 +286,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn2 = ( <> - @@ -295,7 +296,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -305,7 +306,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -315,7 +316,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn5 = ( <> - @@ -325,7 +326,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - 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) => { - @@ -175,7 +176,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => { - @@ -197,7 +198,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => { > 提交审批 - = (props) => { - @@ -238,7 +239,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => { - diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx index e6c5b2f..73e3c99 100644 --- a/src/pages/Calibration/BidPublicityResult/index.tsx +++ b/src/pages/Calibration/BidPublicityResult/index.tsx @@ -19,6 +19,7 @@ import { getApprProcessList } from "@/utils/SeleApprovalProcess/service" import SeleApprovalProcess from "@/utils/SeleApprovalProcess" import { releaseNoticeOffline } from "@/pages/Bid/BiddingAnnouncement/service" import { isEmpty } from "@/utils/CommonUtils" +import { checkObjectId } from "@/utils/DownloadUtils" /* * 招标公示开始 @@ -164,7 +165,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { let btn2 = ( <> - @@ -174,7 +175,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { <>    - @@ -184,7 +185,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { <>       - @@ -194,7 +195,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { let btn5 = ( <> - @@ -221,7 +222,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {    - 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 = (props) - + {checkObjectId(record.id) && } ); } 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 = (props) => { toView(record)}> 查看 - toCheckApproval(record)}> + toCheckApproval(record)} hidden={!checkObjectId(record.id)}> 查看审批流程 @@ -215,7 +216,7 @@ const MoreEvaluation: React.FC = (props) => { toView(record)}> 查看 - toCheckApproval(record)}> + toCheckApproval(record)} hidden={!checkObjectId(record.id)}> 查看审批流程 @@ -226,7 +227,7 @@ const MoreEvaluation: React.FC = (props) => { toView(record)}> 查看 - toCheckApproval(record)}> + toCheckApproval(record)} hidden={!checkObjectId(record.id)}> 查看审批流程 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 ac4f4b6..76090cd 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx @@ -1,5 +1,6 @@ import { btnAuthority } from '@/utils/authority'; import { isEmpty } from '@/utils/CommonUtils'; +import { checkObjectId } from '@/utils/DownloadUtils'; import SeleApprovalProcess from '@/utils/SeleApprovalProcess'; import { getApprProcessList } from '@/utils/SeleApprovalProcess/service'; import { getDicData, getProId } from '@/utils/session'; @@ -371,7 +372,7 @@ const ExceptionHandling: React.FC = (props) => { - @@ -394,7 +395,7 @@ const ExceptionHandling: React.FC = (props) => { - = (props) => { - = (props) => { - - = (props) => { - diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx index a1f2874..093d20f 100644 --- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx +++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx @@ -20,6 +20,7 @@ import { btnAuthority } from "@/utils/authority"; import { getApprProcessList } from "@/utils/SeleApprovalProcess/service" import SeleApprovalProcess from "@/utils/SeleApprovalProcess" import { isEmpty } from "@/utils/CommonUtils" +import { checkObjectId } from "@/utils/DownloadUtils" /* * 资审公告开始 @@ -134,7 +135,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn2 = ( <> - @@ -144,7 +145,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -154,7 +155,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -164,7 +165,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn5 = ( <> - @@ -176,7 +177,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { - @@ -254,7 +255,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn2 = ( <> - @@ -264,7 +265,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -274,7 +275,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -284,7 +285,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn5 = ( <> - @@ -294,7 +295,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx index 599212c..baa8fc1 100644 --- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx +++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx @@ -20,6 +20,7 @@ import { btnAuthority } from "@/utils/authority"; import { getApprProcessList } from "@/utils/SeleApprovalProcess/service" import SeleApprovalProcess from "@/utils/SeleApprovalProcess" import { isEmpty } from "@/utils/CommonUtils" +import { checkObjectId } from "@/utils/DownloadUtils" /* * 招标公告开始 @@ -126,7 +127,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn2 = ( <> - @@ -136,7 +137,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -146,7 +147,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -156,7 +157,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn5 = ( <> - @@ -170,7 +171,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { - @@ -269,7 +270,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn2 = ( <> - @@ -279,7 +280,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -289,7 +290,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - @@ -299,7 +300,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { let btn5 = ( <> - @@ -311,7 +312,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { <> - diff --git a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx index 13f6242..6961ba1 100644 --- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx +++ b/src/pages/ZZhaoMu/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 { isEmpty } from "@/utils/CommonUtils" +import { checkObjectId } from "@/utils/DownloadUtils" /* * 招标公示开始 @@ -118,7 +119,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { let btn2 = ( <> - @@ -128,7 +129,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { <>    - @@ -138,7 +139,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { <>       - @@ -148,7 +149,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { let btn5 = ( <> - @@ -158,7 +159,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { <>    - 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); }