From bb1553f2e527072110dc24b19e3bca8407b9ed2f Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Tue, 10 Jan 2023 13:53:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.10=20=E5=AE=A1=E6=89=B9=E5=8D=95=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=9C=B0=E5=9D=80=E5=A2=9E=E5=8A=A0=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BiddingAnnouncementList.tsx | 2 +- .../components/BiddingInvitationList.tsx | 38 +++++++++---------- .../Calibration/BidPublicityResult/index.tsx | 2 +- .../components/MoreEvaluation.tsx | 2 +- .../ExceptionHandling/ExceptionHandling.tsx | 2 +- .../BiddingAnnouncementList.tsx | 2 +- .../BiddingAnnouncementList.tsx | 2 +- .../Calibration/BidPublicityResult/index.tsx | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx index f54b13a..56c474d 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx @@ -598,7 +598,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/'); + let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); window.open(d); } }) diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx index fda9c20..755cbbe 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx @@ -132,10 +132,10 @@ const BiddingInvitationList: React.FC<{}> = (props) => { > 编辑 - @@ -168,9 +168,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => { 查看 @@ -193,9 +193,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => { 查看 @@ -214,9 +214,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => { 编辑 @@ -252,9 +252,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => { 查看 @@ -277,9 +277,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => { 查看 @@ -473,20 +473,20 @@ const BiddingInvitationList: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/'); + let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); window.open(d); } }); }; /*编辑原因说明*/ - const toEditReasonMemo = (props: any,type: any) => { + const toEditReasonMemo = (props: any, type: any) => { setPkId(props.id); setType(type); setMemoVisible(true); }; const Proref = useRef(); - + return (
@@ -564,15 +564,15 @@ const BiddingInvitationList: React.FC<{}> = (props) => { }} data={approvalData} annoId={recordData?.id} /> ) : null} {memoVisible ? ( - { setMemoVisible(false) }} /> - ) : null} + ) : null}
); }; diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx index 73e3c99..19647fa 100644 --- a/src/pages/Calibration/BidPublicityResult/index.tsx +++ b/src/pages/Calibration/BidPublicityResult/index.tsx @@ -432,7 +432,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/'); + let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); window.open(d); } }).finally(() => { diff --git a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx index 827a846..6458dea 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx @@ -124,7 +124,7 @@ const MoreEvaluation: React.FC = (props) => { if (res?.code == 200 && res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/'); + let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); window.open(d); } }).finally(() => { 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 76090cd..a413ddb 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx @@ -242,7 +242,7 @@ const ExceptionHandling: React.FC = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/'); + let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); window.open(d); } }).finally(() => { diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx index 093d20f..03ef25f 100644 --- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx +++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx @@ -569,7 +569,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/'); + let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); window.open(d); } }) diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx index baa8fc1..0d39c29 100644 --- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx +++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx @@ -592,7 +592,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/'); + let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); window.open(d); } }) diff --git a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx index 6961ba1..5ef92e6 100644 --- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx +++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx @@ -351,7 +351,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/'); + let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); window.open(d); } }) From 94c72ac75ae15b8ad420124af8a7ff7e5abbeafa Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Thu, 12 Jan 2023 19:56:21 +0800 Subject: [PATCH 2/2] 1.12 --- .../BiddingAnnouncement/components/BiddingAnnouncementList.tsx | 2 +- .../BiddingAnnouncement/components/BiddingInvitationList.tsx | 2 +- src/pages/Calibration/BidPublicityResult/index.tsx | 2 +- .../HomePageSectionList/components/MoreEvaluation.tsx | 2 +- .../components/ExceptionHandling/ExceptionHandling.tsx | 2 +- .../ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx | 2 +- .../ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx | 2 +- src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx index 56c474d..f54b13a 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx @@ -598,7 +598,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); + let d = data?.traceDetailUrl?.replace(durl, '/'); window.open(d); } }) diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx index 755cbbe..4616439 100644 --- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx +++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx @@ -473,7 +473,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); + let d = data?.traceDetailUrl?.replace(durl, '/'); window.open(d); } }); diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx index 19647fa..73e3c99 100644 --- a/src/pages/Calibration/BidPublicityResult/index.tsx +++ b/src/pages/Calibration/BidPublicityResult/index.tsx @@ -432,7 +432,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); + let d = data?.traceDetailUrl?.replace(durl, '/'); window.open(d); } }).finally(() => { diff --git a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx index 6458dea..827a846 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx @@ -124,7 +124,7 @@ const MoreEvaluation: React.FC = (props) => { if (res?.code == 200 && res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); + let d = data?.traceDetailUrl?.replace(durl, '/'); window.open(d); } }).finally(() => { 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 a413ddb..76090cd 100644 --- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx +++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx @@ -242,7 +242,7 @@ const ExceptionHandling: React.FC = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); + let d = data?.traceDetailUrl?.replace(durl, '/'); window.open(d); } }).finally(() => { diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx index 03ef25f..093d20f 100644 --- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx +++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx @@ -569,7 +569,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); + let d = data?.traceDetailUrl?.replace(durl, '/'); window.open(d); } }) diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx index 0d39c29..baa8fc1 100644 --- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx +++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx @@ -592,7 +592,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); + let d = data?.traceDetailUrl?.replace(durl, '/'); window.open(d); } }) diff --git a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx index 5ef92e6..6961ba1 100644 --- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx +++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx @@ -351,7 +351,7 @@ const BidPublicityResult: React.FC<{}> = (props) => { if (res?.code == 200 || res?.success == true) { const data = res?.data; let durl = /http:\/\/([^\/]+)\//i; - let d = data?.traceDetailUrl?.replace(durl, '/approval_3.0/'); + let d = data?.traceDetailUrl?.replace(durl, '/'); window.open(d); } })