From bb1553f2e527072110dc24b19e3bca8407b9ed2f Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Tue, 10 Jan 2023 13:53:25 +0800
Subject: [PATCH 1/4] =?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) => {
             >
               编辑
             </Button>
-              <Button
-              hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])|| record.reasonMemo== null ||record.reasonMemo==undefined}
+            <Button
+              hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase']) || record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"edit")}
+              onClick={() => toEditReasonMemo(record, "edit")}
             >
               原因说明
             </Button>
@@ -168,9 +168,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               查看
             </Button>
             <Button
-              hidden={ record.reasonMemo== null ||record.reasonMemo==undefined}
+              hidden={record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"read")}
+              onClick={() => toEditReasonMemo(record, "read")}
             >
               原因说明
             </Button>
@@ -193,9 +193,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               查看
             </Button>
             <Button
-              hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
+              hidden={record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"read")}
+              onClick={() => toEditReasonMemo(record, "read")}
             >
               原因说明
             </Button>
@@ -214,9 +214,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               编辑
             </Button>
             <Button
-              hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])|| record.reasonMemo== null ||record.reasonMemo==undefined}
+              hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase']) || record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"edit")}
+              onClick={() => toEditReasonMemo(record, "edit")}
             >
               原因说明
             </Button>
@@ -252,9 +252,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               查看
             </Button>
             <Button
-              hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
+              hidden={record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"read")}
+              onClick={() => toEditReasonMemo(record, "read")}
             >
               原因说明
             </Button>
@@ -277,9 +277,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               查看
             </Button>
             <Button
-              hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
+              hidden={record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"read")}
+              onClick={() => toEditReasonMemo(record, "read")}
             >
               原因说明
             </Button>
@@ -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<ActionType>();
-  
+
   return (
     <div style={{ height: '100%', position: 'relative' }}>
       <Spin spinning={spin}>
@@ -564,15 +564,15 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
         }} data={approvalData} annoId={recordData?.id} />
       ) : null}
       {memoVisible ? (
-      <ReasonMemo
-      modalVisible={memoVisible}
+        <ReasonMemo
+          modalVisible={memoVisible}
           id={pkId}
           type={type}
           onCancel={() => {
             setMemoVisible(false)
           }}
         />
-        ) : null}
+      ) : null}
     </div>
   );
 };
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<MoreEvaluationProps> = (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<ExceptionHandlingProps> = (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 f2a1835affd84554d7e9eb2868e3d53bc6266fea Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 12 Jan 2023 18:44:25 +0800
Subject: [PATCH 2/4] =?UTF-8?q?1.12=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ApprovalModal/index.tsx        | 32 +++++++++++++
 .../components/BiddingAnnouncementList.tsx    |  9 +++-
 .../components/BiddingInvitationList.tsx      | 45 ++++++++++---------
 .../Calibration/BidPublicityResult/index.tsx  |  9 +++-
 .../components/MoreEvaluation.tsx             |  9 +++-
 .../ExceptionHandling/ExceptionHandling.tsx   |  9 +++-
 .../BiddingAnnouncementList.tsx               |  9 +++-
 .../BiddingAnnouncementList.tsx               |  9 +++-
 .../Calibration/BidPublicityResult/index.tsx  |  9 +++-
 9 files changed, 106 insertions(+), 34 deletions(-)
 create mode 100644 src/components/ApprovalModal/index.tsx

diff --git a/src/components/ApprovalModal/index.tsx b/src/components/ApprovalModal/index.tsx
new file mode 100644
index 0000000..9b82e09
--- /dev/null
+++ b/src/components/ApprovalModal/index.tsx
@@ -0,0 +1,32 @@
+import React, { useMemo } from 'react';
+import { Modal } from 'antd';
+
+interface ApprovalModalProps {
+    modalVisible: boolean;
+    onCancel: () => void;
+    url: string;
+}
+/**
+ * 审批流程弹窗
+ */
+const ApprovalModal: React.FC<ApprovalModalProps> = (props) => {
+    const { modalVisible, onCancel, url } = props;
+    const iframeContent = useMemo(() => {
+        return url != "" && <iframe width={"100%"} height={600} src={url} />
+    }, [url]);
+    return (
+        <Modal
+            destroyOnClose
+            title="审批流程"
+            visible={modalVisible}
+            width={"80%"}
+            centered
+            onCancel={() => onCancel()}
+            footer={null}
+        >
+            {iframeContent}
+        </Modal>
+    );
+};
+
+export default ApprovalModal;
\ No newline at end of file
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
index f54b13a..5d17d46 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
@@ -20,6 +20,7 @@ import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
 import { isEmpty } from "@/utils/CommonUtils"
 import { checkObjectId } from "@/utils/DownloadUtils"
+import ApprovalModal from "@/components/ApprovalModal"
 
 /*
 * 招标公告开始
@@ -58,6 +59,8 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   const [recordData, setRecordData] = useState<any>({});//存储当前record数据
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
+  const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
+  const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
 
   let name1 = "中标";
   let name2 = "评标";
@@ -598,8 +601,9 @@ 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, '/');
-        window.open(d);
+        let d = data?.replace(durl, '/');
+        setApprovalViewUrl(d);
+        setApprovalViewVisible(true);
       }
     })
   }
@@ -691,6 +695,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             }
           }} data={approvalData} annoId={recordData?.id} />
         ) : null}
+        <ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
       </Spin>
     </div>
   )
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
index fda9c20..04b1f2f 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
@@ -21,6 +21,7 @@ import { getApprProcessList } from '@/utils/SeleApprovalProcess/service';
 import SeleApprovalProcess from '@/utils/SeleApprovalProcess';
 import { checkObjectId } from '@/utils/DownloadUtils';
 import ReasonMemo from './ReasonMemo';
+import ApprovalModal from '@/components/ApprovalModal';
 
 /*
  * 招标公告开始
@@ -50,6 +51,8 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
   const [recordData, setRecordData] = useState<any>({});//存储当前record数据
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
+  const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
+  const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
 
   const [memoVisible, setMemoVisible] = useState<boolean>(false);//说明弹窗
   let proName = ''; //名称
@@ -132,10 +135,10 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             >
               编辑
             </Button>
-              <Button
-              hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])|| record.reasonMemo== null ||record.reasonMemo==undefined}
+            <Button
+              hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase']) || record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"edit")}
+              onClick={() => toEditReasonMemo(record, "edit")}
             >
               原因说明
             </Button>
@@ -168,9 +171,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               查看
             </Button>
             <Button
-              hidden={ record.reasonMemo== null ||record.reasonMemo==undefined}
+              hidden={record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"read")}
+              onClick={() => toEditReasonMemo(record, "read")}
             >
               原因说明
             </Button>
@@ -193,9 +196,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               查看
             </Button>
             <Button
-              hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
+              hidden={record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"read")}
+              onClick={() => toEditReasonMemo(record, "read")}
             >
               原因说明
             </Button>
@@ -214,9 +217,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               编辑
             </Button>
             <Button
-              hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])|| record.reasonMemo== null ||record.reasonMemo==undefined}
+              hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase']) || record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"edit")}
+              onClick={() => toEditReasonMemo(record, "edit")}
             >
               原因说明
             </Button>
@@ -252,9 +255,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               查看
             </Button>
             <Button
-              hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
+              hidden={record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"read")}
+              onClick={() => toEditReasonMemo(record, "read")}
             >
               原因说明
             </Button>
@@ -277,9 +280,9 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               查看
             </Button>
             <Button
-              hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
+              hidden={record.reasonMemo == null || record.reasonMemo == undefined}
               type="text"
-              onClick={() => toEditReasonMemo(record,"read")}
+              onClick={() => toEditReasonMemo(record, "read")}
             >
               原因说明
             </Button>
@@ -473,20 +476,21 @@ 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, '/');
-        window.open(d);
+        let d = data?.replace(durl, '/');
+        setApprovalViewUrl(d);
+        setApprovalViewVisible(true);
       }
     });
   };
 
   /*编辑原因说明*/
-  const toEditReasonMemo = (props: any,type: any) => {
+  const toEditReasonMemo = (props: any, type: any) => {
     setPkId(props.id);
     setType(type);
     setMemoVisible(true);
   };
   const Proref = useRef<ActionType>();
-  
+
   return (
     <div style={{ height: '100%', position: 'relative' }}>
       <Spin spinning={spin}>
@@ -564,15 +568,16 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
         }} data={approvalData} annoId={recordData?.id} />
       ) : null}
       {memoVisible ? (
-      <ReasonMemo
-      modalVisible={memoVisible}
+        <ReasonMemo
+          modalVisible={memoVisible}
           id={pkId}
           type={type}
           onCancel={() => {
             setMemoVisible(false)
           }}
         />
-        ) : null}
+      ) : null}
+      <ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
     </div>
   );
 };
diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx
index 73e3c99..65f1f31 100644
--- a/src/pages/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/Calibration/BidPublicityResult/index.tsx
@@ -20,6 +20,7 @@ import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
 import { releaseNoticeOffline } from "@/pages/Bid/BiddingAnnouncement/service"
 import { isEmpty } from "@/utils/CommonUtils"
 import { checkObjectId } from "@/utils/DownloadUtils"
+import ApprovalModal from "@/components/ApprovalModal"
 
 /*
 * 招标公示开始
@@ -53,6 +54,8 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   const [recordData, setRecordData] = useState<any>({});//存储当前record数据
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
+  const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
+  const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
 
   let name1 = "中标候选人";
   let name2 = "评标";
@@ -432,8 +435,9 @@ 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, '/');
-        window.open(d);
+        let d = data?.replace(durl, '/');
+        setApprovalViewUrl(d);
+        setApprovalViewVisible(true);
       }
     }).finally(() => {
       setPageloading(false);
@@ -485,6 +489,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             setRefresh(Math.random() + 1)
           }} data={approvalData} annoId={recordData?.id} />
         ) : null}
+        <ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
       </Spin>
     </div>
   )
diff --git a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx
index 827a846..fd5f49d 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/HomePageSectionList/components/MoreEvaluation.tsx
@@ -1,3 +1,4 @@
+import ApprovalModal from '@/components/ApprovalModal';
 import BidEvalAppointment from '@/components/ElecBidEvaluation/BidEvalAppointment';
 import { btnAuthority } from '@/utils/authority';
 import { checkObjectId } from '@/utils/DownloadUtils';
@@ -47,6 +48,8 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
   const [loading, setLoading] = useState<boolean>(false);
   //电子评标室-评标室预约选择 2022.9.8 zhoujianlong
   const [selectEvalVisible, setSelectEvalVisible] = useState<boolean>(false);
+  const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
+  const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
 
   const toAdd = async () => {
     await checkedAddAfresh(values.id).then((res) => {
@@ -124,8 +127,9 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
       if (res?.code == 200 && res?.success == true) {
         const data = res?.data;
         let durl = /http:\/\/([^\/]+)\//i;
-        let d = data?.traceDetailUrl?.replace(durl, '/');
-        window.open(d);
+        let d = data?.replace(durl, '/');
+        setApprovalViewUrl(d);
+        setApprovalViewVisible(true);
       }
     }).finally(() => {
       setLoading(false);
@@ -365,6 +369,7 @@ const MoreEvaluation: React.FC<MoreEvaluationProps> = (props) => {
       />
       {/**电子评标室-评标室预约选择 */}
       <BidEvalAppointment modalVisible={selectEvalVisible} onCancel={() => { setSelectEvalVisible(false), setRecordData(undefined) }} onSubmit={() => { }} values={recordData} type={"2"} reload={() => { actionRef.current?.reload?.(); }} />
+      <ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
     </Drawer>
   );
 };
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..5428687 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
@@ -1,3 +1,4 @@
+import ApprovalModal from '@/components/ApprovalModal';
 import { btnAuthority } from '@/utils/authority';
 import { isEmpty } from '@/utils/CommonUtils';
 import { checkObjectId } from '@/utils/DownloadUtils';
@@ -63,6 +64,8 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);
   //选择流程数据存储
   const [approvalData, setApprovalData] = useState<any[]>([]);
+  const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
+  const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
   //初始化显示字段
   let sectionName = '采购包';
   sectionName =
@@ -242,8 +245,9 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
       if (res?.code == 200 || res?.success == true) {
         const data = res?.data;
         let durl = /http:\/\/([^\/]+)\//i;
-        let d = data?.traceDetailUrl?.replace(durl, '/');
-        window.open(d);
+        let d = data?.replace(durl, '/');
+        setApprovalViewUrl(d);
+        setApprovalViewVisible(true);
       }
     }).finally(() => {
       setLoading(false)
@@ -650,6 +654,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
           actionRef.current?.reload?.();
         }} data={approvalData} annoId={recordData?.sendMessageId} />
       ) : null}
+      <ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
     </Drawer>
   );
 };
diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index 093d20f..79bacbd 100644
--- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
+++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
@@ -21,6 +21,7 @@ import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
 import { isEmpty } from "@/utils/CommonUtils"
 import { checkObjectId } from "@/utils/DownloadUtils"
+import ApprovalModal from "@/components/ApprovalModal"
 
 /*
 * 资审公告开始
@@ -58,6 +59,8 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   const [recordData, setRecordData] = useState<any>({});//存储当前record数据
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
+  const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
+  const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
 
   let name4 = "标段";
   let proName = "招标";
@@ -569,8 +572,9 @@ 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, '/');
-        window.open(d);
+        let d = data?.replace(durl, '/');
+        setApprovalViewUrl(d);
+        setApprovalViewVisible(true);
       }
     })
   }
@@ -660,6 +664,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           }
         }} data={approvalData} annoId={recordData?.id} />
       ) : null}
+      <ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
     </div>
   )
 }
diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index baa8fc1..256903a 100644
--- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
+++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
@@ -21,6 +21,7 @@ import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
 import { isEmpty } from "@/utils/CommonUtils"
 import { checkObjectId } from "@/utils/DownloadUtils"
+import ApprovalModal from "@/components/ApprovalModal"
 
 /*
 * 招标公告开始
@@ -60,6 +61,8 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   const [recordData, setRecordData] = useState<any>({});//存储当前record数据
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
+  const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
+  const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
   const { TabPane } = Tabs;
   const { confirm } = Modal;
   const columns: ProColumns<DataItem>[] = [
@@ -592,8 +595,9 @@ 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, '/');
-        window.open(d);
+        let d = data?.replace(durl, '/');
+        setApprovalViewUrl(d);
+        setApprovalViewVisible(true);
       }
     })
   }
@@ -720,6 +724,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           ) : null}
         </TabPane>
       </Tabs>
+      <ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
     </div>
   )
 }
diff --git a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
index 6961ba1..b91ac9c 100644
--- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
@@ -19,6 +19,7 @@ import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
 import { isEmpty } from "@/utils/CommonUtils"
 import { checkObjectId } from "@/utils/DownloadUtils"
+import ApprovalModal from "@/components/ApprovalModal"
 
 /*
 * 招标公示开始
@@ -51,6 +52,8 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   const [recordData, setRecordData] = useState<any>({});//存储当前record数据
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
+  const [approvalViewVisible, setApprovalViewVisible] = useState<boolean>(false);//查看审批流程弹窗
+  const [approvalViewUrl, setApprovalViewUrl] = useState<string>("");//查看审批流程参数-url
 
 
   const columns: ProColumns<DataItem>[] = [
@@ -351,8 +354,9 @@ 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, '/');
-        window.open(d);
+        let d = data?.replace(durl, '/');
+        setApprovalViewUrl(d);
+        setApprovalViewVisible(true);
       }
     })
   }
@@ -400,6 +404,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             setRefresh(Math.random() + 1)
           }} data={approvalData} annoId={recordData?.id} />
         ) : null}
+        <ApprovalModal modalVisible={approvalViewVisible} onCancel={() => { setApprovalViewVisible(false) }} url={approvalViewUrl} />
       </Spin>
     </div>
   )

From 94c72ac75ae15b8ad420124af8a7ff7e5abbeafa Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 12 Jan 2023 19:56:21 +0800
Subject: [PATCH 3/4] 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<MoreEvaluationProps> = (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<ExceptionHandlingProps> = (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);
       }
     })

From c7469266083617ecfd2fa4434eee915f067f8dd3 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 12 Jan 2023 21:48:53 +0800
Subject: [PATCH 4/4] =?UTF-8?q?1.12=20iframe=E9=AB=98=E5=BA=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ApprovalModal/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ApprovalModal/index.tsx b/src/components/ApprovalModal/index.tsx
index 9b82e09..9aaf56a 100644
--- a/src/components/ApprovalModal/index.tsx
+++ b/src/components/ApprovalModal/index.tsx
@@ -12,7 +12,7 @@ interface ApprovalModalProps {
 const ApprovalModal: React.FC<ApprovalModalProps> = (props) => {
     const { modalVisible, onCancel, url } = props;
     const iframeContent = useMemo(() => {
-        return url != "" && <iframe width={"100%"} height={600} src={url} />
+        return url != "" && <iframe width={"100%"} height={500} src={url} />
     }, [url]);
     return (
         <Modal