diff --git a/config/config.UAT.ts b/config/config.UAT.ts
index de9d1a0..6fce63b 100644
--- a/config/config.UAT.ts
+++ b/config/config.UAT.ts
@@ -18,7 +18,9 @@ export default defineConfig({
     START_ENV:'UAT',
 
     //询价查看报价跳转地址
-    REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8280/provider_uat',
+    // REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8280/provider_uat',
+    //询价-查看报价详情-虚拟用户uid
+    REACT_APP_XUNJIA_UID: 'admin_entrance',
 
     //智慧客服ws地址
     REACT_APP_CUSTOMERSERVICE_WS_REDIRECT: 'ws://10.242.31.158:18022/api/api/biz-customer-service',
diff --git a/config/config.dev.ts b/config/config.dev.ts
index 574135e..723cdb8 100644
--- a/config/config.dev.ts
+++ b/config/config.dev.ts
@@ -18,8 +18,9 @@ export default defineConfig({
     START_ENV: 'DEV',
 
     //询价查看报价跳转地址
-    REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider_dev',
-
+    // REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider_dev',
+    //询价-查看报价详情-虚拟用户uid
+    REACT_APP_XUNJIA_UID: 'admin_entrance',
     //智慧客服ws地址
     REACT_APP_CUSTOMERSERVICE_WS_REDIRECT: 'ws://10.242.37.148:18022/api/api/biz-customer-service',
     
diff --git a/config/config.prod.ts b/config/config.prod.ts
index c81cdac..067ee29 100644
--- a/config/config.prod.ts
+++ b/config/config.prod.ts
@@ -18,7 +18,9 @@ export default defineConfig({
     START_ENV:'PROD',
 
     //询价查看报价跳转地址
-    REACT_APP_XUNJIA_REDIRECT: 'https://60.10.26.178/provider',
+    // REACT_APP_XUNJIA_REDIRECT: 'https://60.10.26.178/provider',
+    //询价-查看报价详情-虚拟用户uid
+    REACT_APP_XUNJIA_UID: 'admin_entrance',
 
     //智慧客服ws地址
     REACT_APP_CUSTOMERSERVICE_WS_REDIRECT: 'ws://uscm.unicom.local:18022/api/api/biz-customer-service',
diff --git a/config/config.sim.ts b/config/config.sim.ts
index 9117142..8be6ed2 100644
--- a/config/config.sim.ts
+++ b/config/config.sim.ts
@@ -18,7 +18,9 @@ export default defineConfig({
     START_ENV: 'sim',
 
     //询价查看报价跳转地址
-    REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider',
+    // REACT_APP_XUNJIA_REDIRECT: 'http://10.0.204.215:8080/provider',
+    //询价-查看报价详情-虚拟用户uid
+    REACT_APP_XUNJIA_UID: 'admin_entrance',
 
     //智慧客服ws地址
     REACT_APP_CUSTOMERSERVICE_WS_REDIRECT: 'ws://10.242.31.54:18022/api/api/biz-customer-service',
diff --git a/config/router.config.ts b/config/router.config.ts
index a63478c..b4159e9 100644
--- a/config/router.config.ts
+++ b/config/router.config.ts
@@ -71,6 +71,10 @@ export default [
       },
     ],
   },
+  {//公共服务平台
+    path: '/PublicPlatform',
+    component: './Bid/BiddingAnnouncement/components/PublicPlatform',
+  },
 
   //==============================================================引入的业务路由
   ...approvalForm,//审批单
@@ -227,6 +231,11 @@ export default [
             name: 'Supervision',
             path: '/Supervision',
             component: './Project/ProjectManage/Supervision'
+          },
+           {//审查人员 项目管理页
+            name: 'Examination',
+            path: '/Examination',
+            component: './Project/ProjectManage/Examination'
           },
           {//招标项目评审-评委
             path: '/ExpertReview/Review',
diff --git a/src/components/BiddingRoom/index.js b/src/components/BiddingRoom/index.js
index aa1832f..0a8ef57 100644
--- a/src/components/BiddingRoom/index.js
+++ b/src/components/BiddingRoom/index.js
@@ -35,7 +35,7 @@ const BiddingRoom = (props) => {
   const roomId = getRoomId();
   const [list, setList] = useState();
   const [selectedPath, setSelectedPath] = useState(window.location.pathname.replace('ReviewResults/Jury', 'ReviewResults').replace('ReviewResults/GroupLeader', 'ReviewResults'));
-  const [risky, riskySet] = useState();
+  // const [risky, riskySet] = useState();
   //字段类型（两种） 评标，评审
   let sectionTypeTwo = MethodDict == "procurement_mode_1" || MethodDict == "procurement_mode_2" ? "评标" : "评审"
   //字段类型（三种） 评标，评审，谈判
@@ -156,19 +156,19 @@ const BiddingRoom = (props) => {
   }, [])
 
   //风险点展示获取是否有风险
-  async function isRisky() {
-    await getRiskStatus({ assessRoomId: roomId, tpId: tpId }).then((res) => {
-      if (res.code == 200) {
-        if (res?.data) {
-          riskySet(
-            <Tooltip title="当前存在风险项">
-              <ExclamationCircleOutlined style={{ color: 'rgb(250,173,20)', position: 'absolute', fontSize: 26, top: 12 }} />
-            </Tooltip>
-          )
-        }
-      }
-    })
-  }
+  // async function isRisky() {
+  //   await getRiskStatus({ assessRoomId: roomId, tpId: tpId }).then((res) => {
+  //     if (res.code == 200) {
+  //       if (res?.data) {
+  //         riskySet(
+  //           <Tooltip title="当前存在风险项">
+  //             <ExclamationCircleOutlined style={{ color: 'rgb(250,173,20)', position: 'absolute', fontSize: 26, top: 12 }} />
+  //           </Tooltip>
+  //         )
+  //       }
+  //     }
+  //   })
+  // }
 
   //评审结果页签点击事件
   const onclick = async (path, id) => {
@@ -285,7 +285,7 @@ const BiddingRoom = (props) => {
 
   //初始化数据
   const listRender = async () => {
-    await isRisky();
+    // await isRisky();
     //供应商是否用ipass解密判断
     IPassDecode == 0 ? null : supplierList.splice(2, 1)
     //供应商是否显示评审进展判断（招标类不显示）
diff --git a/src/components/Upload/react-resumable.js b/src/components/Upload/react-resumable.js
index ebf50d2..8848f1d 100644
--- a/src/components/Upload/react-resumable.js
+++ b/src/components/Upload/react-resumable.js
@@ -5,6 +5,7 @@ import Resumablejs from "./resumable";
 import SparkMD5 from "./spark-md5";
 import './style.css';
 import { getCurrentTime, getTendererFileStatus } from './service';
+import { getProId } from '@/utils/session';
 
 function getUuid() {
     return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
@@ -39,7 +40,8 @@ export default class ReactResumableJs extends React.Component {
             },
             timer: 0,// 计时器
             redText: false,
-            btnHide: false
+            btnHide: false,
+            projectId: getProId(),
         };
         this.resumable = null;
         this.timerInterval;
@@ -253,7 +255,8 @@ export default class ReactResumableJs extends React.Component {
                         let data = {
                           "tdocCatalogId": this.props.currentDate.tdocCatalogId,
                           "tdocId": this.props.currentDate.tdocId,
-                          "tendererId": this.props.currentDate.tendererId
+                          "tendererId": this.props.currentDate.tendererId,
+                          "tpId": this.state.projectId,
                         }
                         getTendererFileStatus(data).then((res) => { // 判断是否已投标
                           if (res.code == 200) {
diff --git a/src/images/stamp/stamp_example.png b/src/images/stamp/stamp_example.png
new file mode 100644
index 0000000..d81cbb7
Binary files /dev/null and b/src/images/stamp/stamp_example.png differ
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
index fc23162..f54b13a 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
@@ -18,6 +18,8 @@ import { history } from "umi";
 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"
 
 /*
 * 招标公告开始
@@ -157,42 +159,47 @@ 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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
           <>
             <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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + 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 type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
             <Button type="text" onClick={() => toChange(record)}>变更</Button>
           </>
         );
@@ -201,9 +208,10 @@ 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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 
@@ -271,51 +279,57 @@ 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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
           <>
             <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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + 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 type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + 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 type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingDocument.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingDocument.tsx
index 88793e0..f16a050 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingDocument.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingDocument.tsx
@@ -12,6 +12,7 @@ import { getProMethod } from "@/utils/session";
 import WebOffice0609, { WebOfficeRefProps } from "@/pages/webOffice/weboffice0609";
 import moment from "moment";
 import { AnnouncementGetMsg1, AnnouncementGetMsg2, AnnouncementGetMsg3, AnnouncementGetMsg4 } from "@/utils/AboutAnnouncementHelp";
+import { trim } from "@/utils/CommonUtils";
 
 interface BiddingDocumentProps {
   modalVisible: boolean;
@@ -213,7 +214,7 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
 
       let fromData = {
         "tpId": tpId,
-        "documentName": form.getFieldValue("documentName"),
+        "documentName": trim(form.getFieldValue("documentName")),
         "documentSetId": form.getFieldValue("documentSetId"),
         "sections": packageMsg,
         "contentFileId": ref.current?.DocFileCode,
@@ -285,6 +286,7 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
                 message: '当前项不可为空',
               },
             ]}
+            normalize={(value) => trim(value)}
           >
             <Input maxLength={200} readOnly={editInformation} />
           </Form.Item>
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/Bid/BiddingAnnouncement/components/Medias.tsx b/src/pages/Bid/BiddingAnnouncement/components/Medias.tsx
index b110980..653564d 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/Medias.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/Medias.tsx
@@ -1,4 +1,5 @@
-import { Checkbox, Col, Form, Row } from "antd";
+import { getDefId } from "@/utils/session";
+import { Checkbox, Col, Form, Row, Typography } from "antd";
 import React, { useEffect, useState } from "react"
 import { getMediaService } from "../service";
 
@@ -26,7 +27,8 @@ const Media: React.FC<MediaProps> = (props) => {
   } = props;
   //============================================================state
   const [medias, mediasSet] = useState<any>([]);
-
+  const { Text } = Typography
+  const defId = getDefId(); //流程id
   //mediaReleases: [{mediaId: "9", status: 1}]  9-无需推送外网；  0：没发 1：发布成功 2发布失败
   let mediaStatus = {};//媒体对应发布状态
   mediaReleases?.length > 0 && mediaReleases.map((item: any) => {
@@ -81,7 +83,19 @@ const Media: React.FC<MediaProps> = (props) => {
             {
               medias?.length != 0 &&
               medias.map((item: any) => {
-                return (
+                return defId == "recruit_multi" ? (
+                  item.id != "6" && <Col span={24} key={item.id + 'Col'}>
+                    <Checkbox disabled={item.id != '9' && mediaType} key={item.id} value={item.id}>
+                      {item.webName}
+                      <span style={{ color: mediaStatus[item.id] == '发布成功' ? 'rgb(7,193,96)' : 'red' }}>
+                        {
+                          mediaReleases?.length > 0 && mediaStatus[item.id] != undefined && item.id != '9' &&
+                          `（${mediaStatus[item.id]}）`
+                        }
+                      </span>
+                    </Checkbox>
+                  </Col>
+                ) : (
                   <Col span={24} key={item.id + 'Col'}>
                     <Checkbox disabled={item.id != '9' && mediaType} key={item.id} value={item.id}>
                       {item.webName}
@@ -99,6 +113,7 @@ const Media: React.FC<MediaProps> = (props) => {
           </Row>
         </Checkbox.Group>
       </Form.Item>
+      {defId != "recruit_multi" && <Text type="secondary">如选择发布到【中国招标投标公共服务平台】，在发布前需填写【公共服务平台】信息</Text>}
     </>
   )
 }
diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
new file mode 100644
index 0000000..e5612b1
--- /dev/null
+++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
@@ -0,0 +1,406 @@
+import React, { useEffect, useState } from 'react';
+import logo from '@/images/opening/logo.svg';
+import styles from './style.less';
+import './style.less';
+import { Anchor, BackTop, Button, Collapse, Descriptions, Form, Input, message, Modal, PageHeader, Space, Spin, Tooltip, Typography } from 'antd';
+import { btnAuthority } from '@/utils/authority';
+import { ArrowUpOutlined, CaretRightOutlined, InfoCircleOutlined } from '@ant-design/icons';
+import { getURLInformation, isNotEmpty, returnDictVal } from '@/utils/CommonUtils';
+import ExtendUpload from '@/utils/ExtendUpload';
+import { getPublicData, savePublicData } from '../service';
+import { getDefId, getDicData, getProMethod } from '@/utils/session';
+import { getAllFlowNameByRoomType } from '@/utils/FlowUtils';
+import exampleImg from '@/images/stamp/stamp_example.png'
+
+const layout = {
+    labelCol: {
+        span: 6,
+    },
+    wrapperCol: {
+        span: 17,
+    },
+};
+
+const validateMessages = {
+    required: '请填写当前项内容',
+};
+
+const PublicPlatform: React.FC<{}> = () => {
+    //loading
+    const [loading, setLoading] = useState<boolean>(false);
+    //右侧浮动层监听Dom
+    const [container, setContainer] = useState<HTMLDivElement | null>(null);
+    //初始数据
+    const [initialData, setInitialData] = useState<any>({});
+    //只读状态readOnly 默认只读
+    const [readOnly, setReadOnly] = useState<boolean>(true);
+    //公示or公告 true-公示 false-公告
+    const [annoType, setAnnoType] = useState<boolean>(false);
+    //示例弹窗Example
+    const [exampleVisible, setExampleVisible] = useState<boolean>(false);
+    //annoId 公告公示id
+    const annoId = getURLInformation("id");
+    //资审流程所处阶段 (roomType 2是后审，1是预审)
+    const roomType = getURLInformation('roomType') === null ? '2' : getURLInformation('roomType');
+    //采购方式
+    const proMethod = getProMethod();
+    //所有流程名
+    const flowName = getAllFlowNameByRoomType(proMethod, roomType);
+    //流程id
+    const defId = getDefId();
+    //获取字典
+    const getDict: any = getDicData();
+    const dictData = JSON.parse(getDict);
+
+    const { TextArea } = Input;
+    const { Panel } = Collapse;
+    const { Text } = Typography;
+    const { Link } = Anchor;
+    const [form] = Form.useForm();
+    //Input
+    function returnInput(name: string | string[], label: string, readonly: boolean, initialValue: string | number | null, rules?: any[], placeholder?: string, maxLength?: number, extra?: React.ReactNode, width?: string | number, type?: string, suffix?: React.ReactNode) {
+        return (
+            <Form.Item
+                name={name}
+                label={label}
+                rules={rules}
+                extra={extra}
+                initialValue={initialValue}
+            >
+                <Input
+                    bordered={!readonly}
+                    readOnly={readonly}
+                    placeholder={placeholder}
+                    style={{ width }}
+                    maxLength={maxLength ? maxLength : 20}
+                    type={type}
+                    suffix={suffix}
+                />
+            </Form.Item>
+        )
+    }
+    //TextArea
+    function returnArea(name: string | string[], label: string, readonly: boolean, initialValue: string | null, rules?: any[], placeholder?: string, extra?: React.ReactNode, maxLength?: number) {
+        return (
+            <Form.Item
+                name={name}
+                label={label}
+                rules={rules}
+                extra={extra}
+                initialValue={initialValue}
+            >
+                <TextArea
+                    bordered={!readonly}
+                    showCount={!readonly}
+                    readOnly={readonly}
+                    maxLength={maxLength ? maxLength : 1000}
+                    rows={3}
+                    autoSize={readonly}
+                    placeholder={placeholder}
+                />
+            </Form.Item>
+        )
+    }
+    //Upload
+    function returnUpload(name: string | string[], label: string, readonly: boolean, initialValue?: string, rules?: any[], extra?: React.ReactNode) {
+        return (
+            <Form.Item
+                name={name}
+                label={label}
+                rules={rules}
+                extra={
+                    <div style={{ color: '#b30000', marginTop: 16 }}>
+                        <p>1、请上传含公告（公示）正文的pdf文件</p>
+                        <p>2、依据公共服务平台要求，上传的pdf请务必进行手写签名及盖章
+                            <Tooltip title="查看示例">
+                                <InfoCircleOutlined style={{ marginLeft: 4 }} onClick={() => setExampleVisible(true)} />
+                            </Tooltip>
+                        </p>
+                        <p>勾选中国招标投标公共服务平台后该操作为必须执行</p>
+                    </div>
+                }
+            >
+                <ExtendUpload bid={initialValue} btnName="上传文件" maxCount={1} uploadProps={{ disabled: readonly, accept: ".pdf" }} />
+            </Form.Item>
+        )
+    }
+    //公示-标段（包）遍历
+    const sectionsRender = (sections: any[] | null, readonly: boolean) => {
+        if (isNotEmpty(sections)) {
+            const activeKeyList = (length: number) => {
+                const list: number[] = []
+                for (let i = 0; i < length; i++) {
+                    list.push(i);
+                }
+                return list;
+            }
+            return sections?.map((item, index) => (
+                <Descriptions bordered key={index}>
+                    <Descriptions.Item label="标段（包）名称" span={2} key="1">
+                        {item.bidSectName}
+                    </Descriptions.Item>
+                    <Descriptions.Item label="标段（包）编号" key="2">
+                        {item.bidSectBizNum}
+                    </Descriptions.Item>
+                    <Descriptions.Item label="中标候选人" key="3">
+                        <Collapse
+                            defaultActiveKey={isNotEmpty(item.suppliers) ? activeKeyList(item.suppliers.length) : []}
+                            expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} />}
+                        >
+                            {suppliersRender(item.suppliers, readonly)}
+                        </Collapse>
+                    </Descriptions.Item>
+                </Descriptions>
+            ))
+        }
+        return null;
+    }
+    //公示-中标候选人遍历
+    const suppliersRender = (suppliers: any[] | null, readonly: boolean) => {
+        if (isNotEmpty(suppliers)) {
+            return suppliers?.map((item, index) => (
+                <Panel header={item.companyName} key={index}>
+                    {returnInput([item.sectionId, item.id, 'pmName'], "项目负责人姓名", readonly, item.pmName, [{ required: !readonly }], "项目负责人姓名")}
+                    {returnInput([item.sectionId, item.id, 'pmCode'], "项目负责人证件号码", readonly, item.pmCode, [{ required: !readonly }], "项目负责人证件号码", 18)}
+                    {returnArea([item.sectionId, item.id, 'pmCeritficates'], "项目负责人相关证书和编号", readonly, item.pmCeritficates, [{ required: !readonly }], "项目负责人相关证书和编号")}
+                    {returnArea([item.sectionId, item.id, 'quality'], "质量", readonly, item.quality, [{ required: !readonly }], "质量")}
+                    {returnArea([item.sectionId, item.id, 'evaluationStatus'], "评标情况", readonly, item.evaluationStatus, [{ required: !readonly }], "评标情况")}
+                    {returnArea([item.sectionId, item.id, 'winCandidateQualification'], "资格能力条件", readonly, item.winCandidateQualification, [{ required: !readonly }], "中标候选人响应招标文件的资格能力条件")}
+                    {returnInput([item.sectionId, item.id, 'timeLimit'], "工期/交货期/服务期", readonly, readonly ? item.timeLimit + "天" : item.timeLimit, [{ required: !readonly }], "天数", void 0, null, 100, readonly ? void 0 : "number", readonly ? null : "天")}
+                </Panel>
+            ))
+        }
+        return null;
+    }
+    //项目信息
+    const projectRender = (project: any, tenderer: any, agency: any, projectRecord: any, readonly: boolean) => {
+        if (isNotEmpty(project) && isNotEmpty(tenderer) && isNotEmpty(agency) && isNotEmpty(projectRecord)) {
+            const rel: boolean = readonly || project.readonly;
+            return (
+                <>
+                    {returnInput("tenderProjectCode", "项目编号", true, project.tenderProjectCode)}
+                    {returnArea("projectName", "项目名称", true, projectRecord.projectName)}
+                    {returnInput("agencyCode", "招标代理机构代码", true, agency.code)}
+                    {returnInput("agencyCompanyName", "招标代理机构名称", true, agency.companyName)}
+                    {returnInput("bidOrgDict", "招标组织形式", true, returnDictVal(dictData['organization=entrust'], projectRecord.bidOrgDict))}
+                    {returnInput("constant", "招标代理机构联系人", true, agency.constant)}
+                    {returnInput("tel", "招标代理机构联系电话", true, agency.tel)}
+                    {returnInput("name", "招标人名称", rel, tenderer.name, [{ required: !rel }], "招标人名称")}
+                    {returnInput("code", "招标人代码", rel, tenderer.code, [{ required: !rel }], "统一社会信用代码")}
+                    {returnArea("projectScale", "项目规模", rel, project.projectScale, [{ required: !rel }], "项目规模", null, 500)}
+                    {returnArea("tenderContent", "招标内容与范围及招标方案说明", rel, project.tenderContent, [{ required: !rel }], "招标内容与范围及招标方案说明")}
+                </>
+            )
+        }
+        return null;
+    }
+    //公告&公示信息
+    const annoRender = (anno: any, readonly: boolean) => {
+        if (isNotEmpty(anno)) {
+            if (anno.annoNature === 1 || anno.annoNature === 7 || anno.annoNature === 8) {//公告&变更公告&再次发布
+                return (
+                    <>
+                        {returnArea("annoTitle", "公告名称", true, anno.annoTitle)}
+                        {returnInput("docStartTime", flowName['fileName'] + "文件获取开始时间", true, anno.docStartTime)}
+                        {returnInput("docEndTime", flowName['fileName'] + "文件获取截止时间", true, anno.docEndTime)}
+                        {returnInput("replyEndTime", flowName['response'] + "截止时间", true, anno.replyEndTime)}
+                        {defId != "recruit_multi" && returnInput("openingTime", flowName['review'] + "时间", true, anno.openingTime)}
+                        {returnUpload("ctpspFileId", "PDF公告文件", readonly, anno.ctpspFileId, [{ required: !readonly, message: '请上传' }])}
+                    </>
+                )
+            } else if (anno.annoNature === 4) {//失败公告
+                return (
+                    <>
+                        {returnArea("annoTitle", "失败公告名称", true, anno.annoTitle)}
+                        {returnInput("annoStartTime", "失败公告发布时间", true, anno.annoStartTime)}
+                        {returnInput("annoEndTime", "失败公告结束时间", true, anno.annoEndTime)}
+                        {returnUpload("ctpspFileId", "PDF公告文件", readonly, anno.ctpspFileId, [{ required: !readonly, message: '请上传' }])}
+                    </>
+                )
+            } else if (anno.annoNature === 201) {//公示
+                return (
+                    <>
+                        {returnArea("annoTitle", "公示名称", true, anno.annoTitle)}
+                        {returnInput("docStartTime", "公示开始时间", true, anno.docStartTime)}
+                        {returnInput("docEndTime", "公示结束时间", true, anno.docEndTime)}
+                        {returnUpload("ctpspFileId", "PDF公示文件", readonly, anno.ctpspFileId, [{ required: !readonly, message: '请上传' }])}
+                    </>
+                )
+            }
+            return
+        }
+        return null;
+    }
+    //保存方法
+    const onSave = () => {
+        form.validateFields()
+            .then(values => {
+                setLoading(true);
+                console.log('success', values);
+                const data = JSON.parse(JSON.stringify(initialData));//深拷贝
+                console.log('init', data);
+                //项目
+                if (isNotEmpty(data?.project)) {
+                    data.project.projectScale = values.projectScale;
+                    data.project.tenderContent = values.tenderContent;
+                }
+                //投标人
+                if (isNotEmpty(data?.tenderer)) {
+                    data.tenderer.name = values.name;
+                    data.tenderer.code = values.code;
+                }
+                //公告&公示
+                if (isNotEmpty(data?.anno)) {
+                    data.anno.ctpspFileId = values.ctpspFileId;
+                }
+                //标段 中标候选人公示
+                if (isNotEmpty(data?.sections)) {
+                    for (const item of data?.sections) {
+                        if (isNotEmpty(item.suppliers)) {
+                            for (const val of item.suppliers) {
+                                const formData: any = form.getFieldValue([item.id, val.id]);
+                                val.pmName = formData.pmName;
+                                val.pmCode = formData.pmCode;
+                                val.pmCeritficates = formData.pmCeritficates;
+                                val.quality = formData.quality;
+                                val.evaluationStatus = formData.evaluationStatus;
+                                val.winCandidateQualification = formData.winCandidateQualification;
+                                val.timeLimit = formData.timeLimit;
+                            }
+                        }
+                    }
+                }
+                //保存数据
+                savePublicData(data).then(res => {
+                    if (res?.code == 200 && res?.success) {
+                        message.success('保存成功');
+                    }
+                }).finally(() => {
+                    setLoading(false);
+                })
+            })
+            .catch(errorInfo => {
+                console.log('error', errorInfo)
+            });
+    };
+
+    const handleClick = (
+        e: React.MouseEvent<HTMLElement>,
+        link: {
+            title: React.ReactNode;
+            href: string;
+        },
+    ) => {
+        e.preventDefault();
+        console.log(link);
+    };
+
+    useEffect(() => {
+        if (isNotEmpty(annoId)) {
+            setLoading(true);
+            //获取公共服务平台数据
+            getPublicData(annoId).then(res => {
+                if (res?.code == 200) {
+                    const data = res?.data;
+                    setInitialData(data);
+                    if (isNotEmpty(data.anno)) {
+                        setAnnoType(data.anno.annoNature === 201);
+                        setReadOnly(data.anno.status != 1 && data.anno.status != 4);
+                    }
+                }
+            }).finally(() => {
+                setLoading(false);
+            })
+        } else {
+            message.error('获取公共服务平台数据失败，请联系管理员');
+        }
+    }, []);
+
+    return (
+        <div style={{ height: '100%', background: 'rgb(240,242,245)' }}>
+            <div className={styles.header}>
+                <div className={styles.headerAlign}>
+                    <img src={logo} style={{ height: '30px', position: 'relative', top: '-2px' }} />
+                    <span style={{ marginLeft: '10px', height: '30px' }}>招标采购中心 | 公共服务平台</span>
+                </div>
+            </div>
+            <Spin spinning={loading} size='large'>
+                <PageHeader
+                    title={
+                        <Space>
+                            {!readOnly && <Button type='primary' key='save' hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} onClick={() => onSave()}>保存</Button>}
+                            <Button key='close' onClick={() => window.close()}>关闭</Button>
+                        </Space>
+                    }
+                />
+                <div style={{ width: '100%', height: 16, backgroundColor: 'rgb(240,242,245)', }}></div>
+                <div style={{ padding: '0px 24px' }} className="public-platform-header">
+                    <div style={{ width: '85%', float: 'left', borderRadius: '8px', }}>
+                        <PageHeader
+                            title={<Text strong>公共服务平台信息</Text>}
+                            extra={<Text strong style={{ color: '#b30000' }}>注：因公共服务平台的公告/公示信息无法实时推送，招标采购中心发送成功后，建议间隔15分钟到公共服务平台进行确认</Text>}
+                        />
+                        <div style={{ height: innerHeight - 180, overflowY: 'auto' }} className="public-platform" ref={setContainer}>
+                            <Form {...layout} form={form} scrollToFirstError name="public-platform" validateMessages={validateMessages}>
+                                <Collapse
+                                    defaultActiveKey={['1', '2', '3', '4']}
+                                    expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} />}
+                                >
+                                    <Panel
+                                        header={<Text strong>项目信息</Text>}
+                                        id="panel1"
+                                        key="1"
+                                    >
+                                        {projectRender(initialData?.project, initialData?.tenderer, initialData?.agency, initialData?.projectRecord, readOnly)}
+                                    </Panel>
+                                    {annoType && <Panel
+                                        header={<Text strong>中标候选人信息</Text>}
+                                        id="panel2"
+                                        key="2"
+                                    >
+                                        {sectionsRender(initialData?.sections, readOnly)}
+                                    </Panel>}
+                                    <Panel
+                                        header={<Text strong>{annoType ? "公示信息" : "公告信息"}</Text>}
+                                        id="panel3"
+                                        key="3"
+                                    >
+                                        {annoRender(initialData?.anno, readOnly)}
+                                    </Panel>
+                                </Collapse>
+                            </Form>
+                        </div>
+                    </div>
+                    <div style={{ width: '15%', float: 'right' }}>
+                        <div style={{ margin: '0px 16px', border: '1px solid rgb(179,0,0)', borderRadius: '8px', padding: '8px 0px', backgroundColor: 'white', width: '12%' }} className='anchor-father'>
+                            {container && (
+                                <Anchor getContainer={() => container} style={{ overflow: 'hidden' }} onClick={handleClick}>
+                                    <Link href="#panel1" title="项目信息" />
+                                    {annoType && <Link href="#panel2" title="中标候选人信息" />}
+                                    <Link href="#panel3" title={annoType ? "公示信息" : "公告信息"} />
+                                </Anchor>
+                            )}
+                        </div>
+                        <BackTop style={{ right: '100vh-40px' }}>
+                            <div className='backtop'><ArrowUpOutlined /></div>
+                        </BackTop>
+                    </div>
+                </div>
+            </Spin>
+            <Modal
+                destroyOnClose
+                title="PDF文件手写签名及盖章示例"
+                visible={exampleVisible}
+                onCancel={() => setExampleVisible(false)}
+                cancelText="关闭"
+                okButtonProps={{ hidden: true }}
+                bodyStyle={{ padding: 48 }}
+                centered
+                width={921}
+            >
+                <img src={exampleImg} width="825" height="501" />
+            </Modal>
+        </div>
+    )
+}
+export default PublicPlatform;
\ No newline at end of file
diff --git a/src/pages/Bid/BiddingAnnouncement/components/style.less b/src/pages/Bid/BiddingAnnouncement/components/style.less
index 121b7aa..72ffe27 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/style.less
+++ b/src/pages/Bid/BiddingAnnouncement/components/style.less
@@ -1,90 +1,91 @@
-//新增招标公告
-// .bidding {
-//     margin-bottom: 8px;
-//     :global {
-//         .biddingLabel {
-//             width: 30%;
-//             display: inline-block;
-//             text-align: right;
-//             // padding-left: 20px;
-//             padding-right: 10px;
-//         }
-//         .biddingIndex {
-//             width: 40%;
-//             display: inline-block;
-//             justify-content: right;
-//         }
-//         .biddingDatePicker {
-//             width: 40%;
-//         }
-//         .biddingRadio {
-//             // display: inline-block;
-//             width: 40%;
-//             margin-top:24px;
-//         }
-//         .ant-row .ant-col {
-//             margin: 6px 0px;
-//         }
-//         .uploadTotal {
-//             display: inline-block;
-//             width: 40%;
-//             .upload {
-//                 --antd-wave-shadow-color:#1c84c6;
-//                 background: #1c84c6;
-//                 color:#fff;
-//                 border-color: #1c84c6;
-//             }
-//             .uploadLabel {
-//                 // display: inline;
-//                 font-size: 13px;
-//                 color: #c8ced1;
-//                 margin-top: 5px;
-//             }
-//         }
-//     }
-// }
-// .announcementFootButton {
-//     :global{
-//         display: flex;
-//         justify-content: center;
-//         margin-top: 15px;
-//     .save{
-//         --antd-wave-shadow-color:#f7ab59;
-//         background: #f7ab59;
-//         color:#fff;
-//         border-color: #f7ab59;
-//     }
-//     }
-// }
-// //招标公告
-// .label {
-//     :global {
-//         color:#f62a2b;
-//     }
-// }
-// .ant-pro-table-toolbar {
-//     :global {
-//         margin: -12px 0px;
-//     }
-// }
-.card-onmouse{
-    // margin:auto;
-    .ant-image{
-        position: absolute;
-        left: 0px;
-        z-index: 1,
-    }
-    .text-css{
-        width:100%;
-        text-align: center;
-        font-size: 20px;
-        position: absolute;
-        z-index: 99;
-        color: white;
-        top: 50%;
-        transform: translateY(-50%);
-    }
+@import '~antd/lib/style/themes/default.less';
+
+.card-onmouse {
+  // margin:auto;
+  .ant-image {
+    position: absolute;
+    left: 0px;
+    z-index: 1;
+  }
+  .text-css {
+    position: absolute;
+    top: 50%;
+    z-index: 99;
+    width: 100%;
+    color: white;
+    font-size: 20px;
+    text-align: center;
+    transform: translateY(-50%);
+  }
+}
+.card-onmouse:hover {
+  box-shadow: 8px 8px 5px #9e9e9e; /*设置阴影,可以自定义参数*/
+}
+.header {
+  display: flex;
+  height: 56px;
+  color: white;
+  font-weight: 600;
+  font-size: 16px;
+  line-height: 56px;
+  background-color: #b30000;
+  .headerAlign {
+    align-self: center;
+    margin-left: 20px;
+  }
+  .proName {
+    font-weight: 300;
+    font-size: 30px;
+  }
+  .closeButton {
+    position: absolute;
+    right: 20px;
+  }
+}
+.anchor-father {
+  position: fixed;
+  .ant-anchor {
+    padding: 0px;
+    overflow: hidden;
+  }
+  .ant-anchor-ink {
+    position: fixed;
+    margin: 0px;
+  }
+  .ant-anchor-wrapper {
+    margin-left: 0px;
+    padding: 0px;
+    // border-radius: 8px;
+  }
+  .ant-anchor-ink-ball.visible {
+    display: none;
+  }
+  .ant-anchor-ink::before {
+    display: none;
+  }
+  .ant-anchor-link-active {
+    background-color: rgb(179, 0, 0);
+  }
+  .ant-anchor-link-title-active {
+    color: rgb(255, 255, 255);
+  }
+  .ant-affix {
+    top: 135px !important;
+  }
+}
+.backtop {
+  width: 40px;
+  height: 40px;
+  color: #fff;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: center;
+  background-color: rgb(179, 0, 0);
+  border-radius: 4px;
+}
+.public-platform .ant-form-item {
+  margin-bottom: 22px;
+}
+.public-platform-header .ant-page-header-heading {
+  align-items: center;
 }
-.card-onmouse:hover{
-    box-shadow: 8px 8px 5px #9e9e9e;/*设置阴影,可以自定义参数*/
-}
\ No newline at end of file
diff --git a/src/pages/Bid/BiddingAnnouncement/service.ts b/src/pages/Bid/BiddingAnnouncement/service.ts
index ea5ef23..bc87e77 100644
--- a/src/pages/Bid/BiddingAnnouncement/service.ts
+++ b/src/pages/Bid/BiddingAnnouncement/service.ts
@@ -203,4 +203,23 @@ export async function TOrF(params: any, id: any) {//{skip:'true/false'}
     method: "POST",
     data: params
   });
+}
+/**
+ * 公共服务平台-获取数据
+ * @param params 
+ * @returns 
+ */
+export async function getPublicData(params: any) {
+  return request('/api/biz-service-ebtp-bid/v1/ctpsp/get/' + params);
+}
+/**
+ * 公共服务平台-保存数据
+ * @param params 
+ * @returns 
+ */
+export async function savePublicData(params: any) {
+  return request('/api/biz-service-ebtp-bid/v1/ctpsp/save', {
+    method: "POST",
+    data: params
+  });
 }
\ No newline at end of file
diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx
index 9e957d4..73e3c99 100644
--- a/src/pages/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/Calibration/BidPublicityResult/index.tsx
@@ -18,6 +18,8 @@ import { btnAuthority } from "@/utils/authority";
 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"
 
 /*
 * 招标公示开始
@@ -52,7 +54,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
 
-  let name1 = "中标";
+  let name1 = "中标候选人";
   let name2 = "评标";
   let name3 = "开标";
   let name4 = "标段";
@@ -62,35 +64,35 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   let defId = getDefId();
   if (proDict == "procurement_mode_1" || proDict == "procurement_mode_2") {
     TpPackageName = "招标";
-    name1 = "中标";
+    name1 = "中标候选人";
     name2 = "评标";
     name3 = "开标";
     name4 = "标段";
     name5 = '定标';
   } else if (proDict == "procurement_mode_3") {
     TpPackageName = "比选";
-    name1 = "中选";
+    name1 = "中选候选人";
     name2 = "评审";
     name3 = "评审开始"
     name4 = "采购包";
     name5 = '评审结果';
   } else if (proDict == "procurement_mode_5" || proDict == "procurement_mode_6" || proDict == "procurement_mode_9") {
     TpPackageName = "谈判";
-    name1 = "中选";
+    name1 = "中选候选人";
     name2 = "评审";
     name3 = "评审开始";
     name4 = "采购包";
     name5 = '评审结果';
   } else if (proDict == "procurement_mode_4") {
     TpPackageName = "招募";
-    name1 = "中选";
+    name1 = "招募结果";
     name2 = "评审";
     name3 = "评审开始"
     name4 = "包件";
     name5 = '评审结果';
   } else if (proDict == "procurement_mode_7") {
     TpPackageName = "询价";
-    name1 = "中选";
+    name1 = "中选候选人";
     name2 = "评审";
     name3 = "评审开始";
     name4 = "采购包";
@@ -156,42 +158,47 @@ 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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
           <>
             <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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn4 = (
           <>
             <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={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
             <Popconfirm
               title={`确定要${name5}结束吗？`}
               onConfirm={async () => {
@@ -215,9 +222,10 @@ 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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 
@@ -282,7 +290,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           message.warn(`没有可关联的${name4}！`)
         } else {
           setPkId("");
-          setUpdateChange(`新建${name1}候选人公示`)
+          setUpdateChange(`${proDict == "procurement_mode_4" ? '新增' : '新建'}${name1}公示`)
           setType("new");
           setUpdateVisible(true);
         }
@@ -293,14 +301,14 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   }
   /*编辑招标公示*/
   const toEdit = (props: any) => {
-    setUpdateChange(`编辑${name1}候选人公示`)
+    setUpdateChange(`编辑${name1}公示`)
     setPkId(props.id);
     setType("edit");
     setUpdateVisible(true);
   }
   /*查看招标公示*/
   const toRead = (props: any) => {
-    setUpdateChange(`查看${name1}候选人公示`)
+    setUpdateChange(`查看${name1}公示`)
     setType("read");
     setPkId(props.id);
     setUpdateVisible(true);
@@ -440,7 +448,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           size={"small"}
           loading={pageloading}
           toolBarRender={() => [
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>新建{name1}候选人公示</Button>,
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>{proDict == "procurement_mode_4" ? '新增' : '新建'}{name1}公示</Button>,
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"2"} onClick={() => {
               handleRemoveMore()
             }}>批量删除</Button>,
diff --git a/src/pages/Evaluation/BidControl/BidControlManager/components/MACAddressPrompt.tsx b/src/pages/Evaluation/BidControl/BidControlManager/components/MACAddressPrompt.tsx
new file mode 100644
index 0000000..100c350
--- /dev/null
+++ b/src/pages/Evaluation/BidControl/BidControlManager/components/MACAddressPrompt.tsx
@@ -0,0 +1,70 @@
+import React, { useState } from 'react';
+import { Modal, Popover, Typography } from 'antd';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
+import ViewRishFormModal from './ViewRishFormModal';
+
+interface MACAddressPromptProps {
+    type: string; //score-打分 other-其他
+    companyName?: string //公司名称
+}
+
+const MACAddressPrompt: React.FC<MACAddressPromptProps> = (props) => {
+    const { type, companyName } = props;
+    const { Text, Link } = Typography;
+    const modalHeight = window.innerHeight * 96 / 100;
+    //Modal visible
+    const [visible, setVisible] = useState<boolean>(false);
+
+    return (
+        <>
+            {type == 'score' ? (
+                <Modal
+                    destroyOnClose
+                    visible={visible}
+                    onCancel={() => setVisible(false)}
+                    style={{ maxHeight: modalHeight }}
+                    bodyStyle={{ maxHeight: modalHeight - 54, overflowY: 'auto', }}
+                    width={'80%'}
+                    centered
+                    closable={false}
+                    cancelText="关闭"
+                    okButtonProps={{ hidden: true }}
+                >
+                    <ViewRishFormModal activeKey={true} />
+                </Modal>
+            ) : (
+                <Modal
+                    destroyOnClose
+                    visible={visible}
+                    onCancel={() => setVisible(false)}
+                    centered
+                    bodyStyle={{ padding: 40 }}
+                    footer={null}
+                >
+                    <Text strong>{companyName}与其他供应商MAC地址相同，根据联通《关于进一步防范围标串标风险的通知》（WTZ2019110816765），如不同供应商MAC地址相同，视同围标、串标！</Text>
+                </Modal>
+            )}
+            <Popover
+                content={
+                    <Typography>
+                        <Text strong style={{ display: 'block', }}>风险点</Text>
+                        <Text strong style={{ fontSize: 64, lineHeight: '8px', float: 'left', color: '#b30000' }}>·</Text>
+                        <Link
+                            href="#"
+                            onClick={() => {
+                                setVisible(true);
+                            }}
+                            underline={true}
+                        >
+                            与其他供应商MAC地址重复
+                        </Link>
+                    </Typography>
+                }
+            >
+                <ExclamationCircleOutlined style={{ color: '#b30000', marginLeft: 4 }} />
+            </Popover>
+        </>
+    );
+};
+
+export default MACAddressPrompt;
diff --git a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx
index 6203217..05d3c99 100644
--- a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx
+++ b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewBlacklistFormModal.tsx
@@ -68,14 +68,7 @@ const ViewBlacklistFormModal: React.FC<ViewBlacklistFormModalProps> = (props) =>
         return a;
       }
     },
-    {
-      title: '黑名单等级', dataIndex: 'lv', render: (_, record) => {
-        if (record.isBlack == "1") {
-          return (isEmpty(record.lv) || record.lv == "1") ? '一级' : '二级';
-        }
-        return '';
-      }
-    },
+    { title: '黑名单等级', dataIndex: 'lvName', },
     { title: '黑名单开始时间', dataIndex: 'startTime', },
     { title: '黑名单结束时间', dataIndex: 'endTime', },
     { title: '黑名单期限', dataIndex: 'term', },
diff --git a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx
index 951eb09..916669b 100644
--- a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx
+++ b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewInvoiceFormModal.tsx
@@ -32,10 +32,7 @@ const ViewInvoiceFormModal: React.FC<ViewInvoiceFormModalProps> = (props) => {
       dataIndex: 'ouName',
     }, {
       title: '黑名单等级',
-      dataIndex: 'reserved5',
-      render: (_: any, record: any) => {
-        return (isEmpty(record.reserved5) || record.reserved5 == "1") ? '一级' : '二级';
-      }
+      dataIndex: 'lvName',
     }, {
       title: '黑名单开始时间',
       dataIndex: 'startTime',
diff --git a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRishFormModal.tsx b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRishFormModal.tsx
index 1d5eb1d..eb02c3c 100644
--- a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRishFormModal.tsx
+++ b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRishFormModal.tsx
@@ -5,9 +5,10 @@ import { getProMethod, getRoomId } from '@/utils/session';
 import FileDown from '@/utils/Download';
 
 interface ViewRishFormModalProps {
-  modalVisible: boolean;
-  values: any;
-  onCancel: any;
+  modalVisible?: boolean;
+  values?: any;
+  onCancel?: any;
+  activeKey?: boolean;
 }
 
 
@@ -22,7 +23,7 @@ const ViewRishFormModal: React.FC<ViewRishFormModalProps> = (props) => {
   } else {
     name1 = "应答";
   }
-  
+
   useEffect(() => {
     getWarningList();
   }, [])
@@ -35,12 +36,12 @@ const ViewRishFormModal: React.FC<ViewRishFormModalProps> = (props) => {
     { title: '序号', width: '10%', render: (text: any, record: any, index: any) => `${index + 1}` },
     { title: '供应商名称', width: '20%', dataIndex: 'companyName', },
     {
-      title: 'IP地址', width: 200, dataIndex: 'ip', render: (_ : any, record: any) => {
+      title: 'IP地址', width: 200, dataIndex: 'ip', render: (_: any, record: any) => {
         return <div style={{ wordBreak: 'break-all', wordWrap: 'break-word' }}>{record.ip}</div>;
       }
     },
     {
-      title: 'MAC地址', width: '20%', dataIndex: 'mac', render: (_ : any, record: any) => {
+      title: 'MAC地址', width: '20%', dataIndex: 'mac', render: (_: any, record: any) => {
         return <div style={{ wordBreak: 'break-all', wordWrap: 'break-word' }}>{record.mac}</div>;
       }
     },
@@ -51,7 +52,7 @@ const ViewRishFormModal: React.FC<ViewRishFormModalProps> = (props) => {
     { title: '序号', width: '10%', render: (text: any, record: any, index: any) => `${index + 1}` },
     { title: '供应商名称', width: '25%', dataIndex: 'companyName', },
     {
-      title: 'MAC地址', width: '20%', dataIndex: 'mac', render: (_ : any, record: any) => {
+      title: 'MAC地址', width: '20%', dataIndex: 'mac', render: (_: any, record: any) => {
         return <div style={{ wordBreak: 'break-all', wordWrap: 'break-word' }}>{record.mac}</div>;
       }
     },
@@ -77,7 +78,7 @@ const ViewRishFormModal: React.FC<ViewRishFormModalProps> = (props) => {
 
   return (
     <>
-      <Collapse onChange={callback}>
+      <Collapse onChange={callback} defaultActiveKey={props?.activeKey ? ['1'] : []}>
         <Collapse.Panel header={`${name1}文件制作地址日志信息查看`} key="1">
           {rishList?.length == 0
             ? <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
@@ -124,7 +125,7 @@ const ViewRishFormModal: React.FC<ViewRishFormModalProps> = (props) => {
                     </Collapse>
                   );
                 }) : (
-                  <Card bordered={false} bodyStyle={{padding: '16px 24px'}}>
+                  <Card bordered={false} bodyStyle={{ padding: '16px 24px' }}>
                     <p>MAC地址相同的供应商信息如下： </p>
                     <Table
                       size='small'
diff --git a/src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx b/src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx
index 7c58585..41c620e 100644
--- a/src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx
+++ b/src/pages/Evaluation/BidDetailed/BidDetailedReview/index.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react';
 import { Button, Table, Tabs, Space, Progress, Radio, Input, Checkbox, Select, Modal, Pagination, Spin, Form, message, Upload } from 'antd';
-import { getTabList, getProgress, getScoreDetail, getRegister, submitDetail, updateJudgesStatus, findPriceScoreList, getEval, getFile, calculationPriceScore, saveOffer, getPage, getProjectById } from './service';
+import { getTabList, getProgress, getScoreDetail, getRegister, submitDetail, updateJudgesStatus, findPriceScoreList, getEval, getFile, calculationPriceScore, saveOffer, getPage, getProjectById, getOfferUrl } from './service';
 import '@/assets/ld_style.less'
 import FirstTrialTableDetailed from '../BidDetailedManager/module/FirstTrialTableDetailed';
-import { getSessionUserData, getRoomId, getUserToken, getProMethod, getProId, getSectionQuot } from '@/utils/session';
+import { getSessionUserData, getRoomId, getUserToken, getProMethod, getProId, getSectionQuot, getSessionRoleData } from '@/utils/session';
 import FileDown from '@/utils/Download';
 import { getURLInformation } from '@/utils/CommonUtils';
 import { btnAuthority } from '@/utils/authority';
@@ -68,6 +68,8 @@ const Index: React.FC<{}> = () => {
   const modalHeight = (innerHeight * 96) / 100;
   //获取标段的标价类型 1-百分比 0-元
   const sectionQuot = getSectionQuot();
+  //当前登录人角色
+  const roleCode = getSessionRoleData()?.roleCode;
   let showNameT: any = { tbr: '', pb: '', tb: '' }//投标人供应商
   if (proMethod === 'procurement_mode_1' || proMethod === 'procurement_mode_2') {//招标
     showNameT = { tbr: '投标人', pb: '评标', tb: '投标' };
@@ -439,22 +441,22 @@ const Index: React.FC<{}> = () => {
           bidEvalDetailDTOList = []
         })
       } else {
-        let date = {
-          bidEvalId: bidEvalId,
-          reviewTurnId: reviewTurnId,
-          category: typeCategory,
-          assessRoomId: assessRoomId,
-          reviewType: '2'
-        }
-        getProgress({ ...date }).then((res) => {
-          if (res.code == 200) {
-            if(res.data == 100){
-              submitApi()
-            } else {
-              message.error("您有未完成的打分项，请完成后再提交！")
-            }
-          }
-        })          
+        let date = {
+          bidEvalId: bidEvalId,
+          reviewTurnId: reviewTurnId,
+          category: typeCategory,
+          assessRoomId: assessRoomId,
+          reviewType: '2'
+        }
+        getProgress({ ...date }).then((res) => {
+          if (res.code == 200) {
+            if (res.data == 100) {
+              submitApi()
+            } else {
+              message.error("您有未完成的打分项，请完成后再提交！")
+            }
+          }
+        })
       }
     }
   }
@@ -1021,8 +1023,15 @@ const Index: React.FC<{}> = () => {
         }
         await getProjectById(getProId()).then(response => {
           if (response?.code == 200 && response?.success == true) {
-            const resData = response?.data
-            window.open(`${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${resData?.ebpProjectNumber}&offer_no=${offerId}`)
+            const data = response?.data
+            // window.open(`${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${resData?.ebpProjectNumber}&offer_no=${offerId}`)
+            const page = `quote-ztbIndex&inqueryNo=${data?.ebpProjectNumber}&offNo=${record?.offerOrderNo}`;
+            const userId = roleCode == "ebtp-supplier" ? record.bidUserId : REACT_APP_XUNJIA_UID;
+            getOfferUrl({ userId, page }).then(response => {
+              if (response?.code == 200) {
+                window.open(response?.data);
+              }
+            })
           }
         })
       }
diff --git a/src/pages/Evaluation/BidDetailed/BidDetailedReview/service.ts b/src/pages/Evaluation/BidDetailed/BidDetailedReview/service.ts
index 843ebe5..62fc3ee 100644
--- a/src/pages/Evaluation/BidDetailed/BidDetailedReview/service.ts
+++ b/src/pages/Evaluation/BidDetailed/BidDetailedReview/service.ts
@@ -99,7 +99,7 @@ export async function getEval(params: any) { // 获取页面接口数据
 }
 
 export async function getFile(id: any) { // 查找是否有应答文件
-  return request('/api/biz-service-ebtp-rsms/v1/review/config/detail/doc/list?detailId='+id, {
+  return request('/api/biz-service-ebtp-rsms/v1/review/config/detail/doc/list?detailId=' + id, {
     method: 'get',
   });
 }
@@ -136,8 +136,8 @@ export async function saveOffer(data: any) { // 自动报价保存
  * 查询已报名的供应商
  * @param params 
  */
- export async function getPage(params?: any) {
-  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`,{
+export async function getPage(params?: any) {
+  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`, {
     method: 'GET',
   });
 }
@@ -146,6 +146,17 @@ export async function saveOffer(data: any) { // 自动报价保存
  * 根据id查询项目信息
  * @param id 
  */
- export function getProjectById(id: any) {
-    return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
-  }
+export function getProjectById(id: any) {
+  return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
+}
+
+/**
+* 加密后的查看报价详情跳转地址
+* @param params 
+*/
+export function getOfferUrl(params: any) {
+  return request('/api/biz-service-ebtp-extend/v1/singlePoint/getSsoUrlByPage', {
+    method: 'GET',
+    params: params,
+  });
+}
\ No newline at end of file
diff --git a/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx b/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx
index 5fc10f4..09666af 100644
--- a/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx
+++ b/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/index.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { Button, Table, Tabs, Space, Progress, Radio, Input, Checkbox, Select, Modal, Menu, Pagination, Spin, Form, message, Collapse, Upload } from 'antd';
-import { getTabList, getProgress, getScoreDetail, getRegister, submitDetail, updateJudgesStatus, findPriceScoreList, getMemberInfo, getEval, getUnlock, getCheckData, isStatus, getFile, calculationPriceScore, saveOffer, getPage, getProjectById } from './service';
+import { getTabList, getProgress, getScoreDetail, getRegister, submitDetail, updateJudgesStatus, findPriceScoreList, getMemberInfo, getEval, getUnlock, getCheckData, isStatus, getFile, calculationPriceScore, saveOffer, getPage, getProjectById, getOfferUrl } from './service';
 import '@/assets/ld_style.less'
 import FirstTrialTableDetailed from '../BidDetailedManager/module/FirstTrialTableDetailed';
 import { getExperts } from '../BidDetailedManager/service';
@@ -8,7 +8,7 @@ import ConsistencyCheck from './components/ConsistencyCheck';
 import BidDetailSummary from './components/BidDetailSummary';
 import BidDetailSpeed from './components/BidDetailSpeed';
 import { handleSubmit } from './utils';
-import { getProId, getProMethod, getRoomId, getSectionQuot, getSessionUserData, getUserToken } from '@/utils/session';
+import { getProId, getProMethod, getRoomId, getSectionQuot, getSessionRoleData, getSessionUserData, getUserToken } from '@/utils/session';
 import FileDown from '@/utils/Download';
 import { getURLInformation, isEmpty } from '@/utils/CommonUtils';
 import { btnAuthority } from '@/utils/authority';
@@ -90,6 +90,8 @@ const Index: React.FC<{}> = () => {
   const sectionQuot = getSectionQuot();
   const [isEndProgress, setIsEndProgress] = useState<boolean>(false); // 是否可编辑
   const [submitLoading, setSubmitLoading] = useState<boolean>(false); // 提交汇总loading
+  //当前登录人角色
+  const roleCode = getSessionRoleData()?.roleCode;
   let showNameT: any = { tbr: '', pb: '', tb: '' }//投标人供应商
   if (proMethod === 'procurement_mode_1' || proMethod === 'procurement_mode_2') {//招标
     showNameT = { tbr: '投标人', pb: '评标', tb: '投标' };
@@ -466,22 +468,22 @@ const Index: React.FC<{}> = () => {
           bidEvalDetailDTOList = []
         })
       } else {
-        let date = {
-          bidEvalId: bidEvalId,
-          reviewTurnId: reviewTurnId,
-          category: typeCategory,
-          assessRoomId: assessRoomId,
-          reviewType: '2'
-        }
-        getProgress({ ...date }).then((res) => {
-          if (res.code == 200) {
-            if(res.data == 100){
-              submitApi()
-            } else {
-              message.error("您有未完成的打分项，请完成后再提交！")
-            }
-          }
-        })  
+        let date = {
+          bidEvalId: bidEvalId,
+          reviewTurnId: reviewTurnId,
+          category: typeCategory,
+          assessRoomId: assessRoomId,
+          reviewType: '2'
+        }
+        getProgress({ ...date }).then((res) => {
+          if (res.code == 200) {
+            if (res.data == 100) {
+              submitApi()
+            } else {
+              message.error("您有未完成的打分项，请完成后再提交！")
+            }
+          }
+        })
       }
     }
   }
@@ -1052,8 +1054,15 @@ const Index: React.FC<{}> = () => {
         }
         await getProjectById(getProId()).then(response => {
           if (response?.code == 200 && response?.success == true) {
-            const resData = response?.data
-            window.open(`${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${resData?.ebpProjectNumber}&offer_no=${offerId}`)
+            const data = response?.data
+            // window.open(`${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${resData?.ebpProjectNumber}&offer_no=${offerId}`)
+            const page = `quote-ztbIndex&inqueryNo=${data?.ebpProjectNumber}&offNo=${record?.offerOrderNo}`;
+            const userId = roleCode == "ebtp-supplier" ? record.bidUserId : REACT_APP_XUNJIA_UID;
+            getOfferUrl({ userId, page }).then(response => {
+              if (response?.code == 200) {
+                window.open(response?.data);
+              }
+            })
           }
         })
       }
diff --git a/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/service.ts b/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/service.ts
index a3dcdad..cedf51d 100644
--- a/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/service.ts
+++ b/src/pages/Evaluation/BidDetailed/BidDetailedReviewLeader/service.ts
@@ -215,8 +215,8 @@ export async function saveOffer(data: any) { // 自动报价保存
  * 查询已报名的供应商
  * @param params 
  */
- export async function getPage(params?: any) {
-  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`,{
+export async function getPage(params?: any) {
+  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`, {
     method: 'GET',
   });
 }
@@ -225,6 +225,17 @@ export async function saveOffer(data: any) { // 自动报价保存
  * 根据id查询项目信息
  * @param id 
  */
- export function getProjectById(id: any) {
-    return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
-  }
\ No newline at end of file
+export function getProjectById(id: any) {
+  return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
+}
+
+/**
+* 加密后的查看报价详情跳转地址
+* @param params 
+*/
+export function getOfferUrl(params: any) {
+  return request('/api/biz-service-ebtp-extend/v1/singlePoint/getSsoUrlByPage', {
+    method: 'GET',
+    params: params,
+  });
+}
\ No newline at end of file
diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx
index b5223c0..f027c6c 100644
--- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx
+++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/components/PreliminarySummary.tsx
@@ -6,6 +6,7 @@ import { CheckOutlined, CloseOutlined } from '@ant-design/icons';
 import { getProMethod, getRoomId } from '@/utils/session';
 import { getURLInformation } from '@/utils/CommonUtils';
 import ExtendUpload from '@/utils/ExtendUpload';
+import MACAddressPrompt from '@/pages/Evaluation/BidControl/BidControlManager/components/MACAddressPrompt';
 
 interface BidPreliminarySummaryProps {
   totalSupplier: any;
@@ -168,7 +169,12 @@ const PreliminarySummary: React.FC<BidPreliminarySummaryProps> = (props) => {
     ];
     columns.forEach((ele: any) => {
       tcolumns[4].children.push({
-        title: ele.supplierRegisterName,
+        title: (
+          <>
+            {ele.supplierRegisterName}
+            {ele.macConflictStatus && <MACAddressPrompt type='other' companyName={ele.supplierRegisterName} />}
+          </>
+        ),
         dataIndex: ele.supplierRegisterId,
         key: ele.supplierRegisterId,
         render: (value: any, record: any, index: any) => {
diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReview/index.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReview/index.tsx
index 629e1a7..e674016 100644
--- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReview/index.tsx
+++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReview/index.tsx
@@ -7,6 +7,7 @@ import FileDown from '@/utils/Download';
 import { getURLInformation } from '@/utils/CommonUtils';
 import FirstTrialTable from '../BidPreliminaryManager/module/FirstTrialTable';
 import { btnAuthority } from '@/utils/authority';
+import MACAddressPrompt from '../../BidControl/BidControlManager/components/MACAddressPrompt';
 
 const { TabPane } = Tabs;
 const { TextArea } = Input;
@@ -214,7 +215,7 @@ const Index: React.FC<{}> = () => {
           }
           getProgress({ ...date }).then((res) => {
             if (res.code == 200) {
-              if(res.data == 100){
+              if (res.data == 100) {
                 submitApi()
               } else {
                 message.error("您有未完成的打分项，请完成后再提交！")
@@ -237,7 +238,7 @@ const Index: React.FC<{}> = () => {
       }
       getProgress({ ...date }).then((res) => {
         if (res.code == 200) {
-          if(res.data == 100){
+          if (res.data == 100) {
             setProcess(res.data)
             submitApi()
           } else {
@@ -359,7 +360,12 @@ const Index: React.FC<{}> = () => {
     totalSupplierColumns.slice(currentDate, currentDate + 3).map((item: any) => {
       supplierId.push(item.supplierRegisterId)
       newColumns.push({
-        title: item.supplierRegisterName,
+        title: (
+          <>
+            {item.supplierRegisterName}
+            {item.macConflictStatus && <MACAddressPrompt type='score' />}
+          </>
+        ),
         dataIndex: item.supplierRegisterId,
         render: (text: any, record: any) => {
           if (record.scoreMap && record.scoreMap[item.supplierRegisterId]) {
diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx
index 094464a..dab1065 100644
--- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx
+++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/components/BidPreliminarySummary.tsx
@@ -1,10 +1,11 @@
-import React, { useEffect, useImperativeHandle, useState } from 'react';
-import { Input, Pagination, Table } from 'antd';
+import React, { useEffect, useImperativeHandle, useRef, useState } from 'react';
+import { Input, Pagination, Select, Table } from 'antd';
 import '@/assets/ld_style.less';
 import { getSupplierScoreData, isCheckShow } from '../service';
 import { CheckOutlined, CloseOutlined } from '@ant-design/icons';
 import { getURLInformation } from '@/utils/CommonUtils';
 import { getProMethod, getRoomId } from '@/utils/session';
+import MACAddressPrompt from '@/pages/Evaluation/BidControl/BidControlManager/components/MACAddressPrompt';
 
 interface BidPreliminarySummaryProps {
   totalSupplier?: any;
@@ -29,12 +30,15 @@ const BidPreliminarySummary: React.FC<BidPreliminarySummaryProps> = (props) => {
   const [tableDataSource, setTableDataSource] = useState<any[]>([]);
   //刷新参数
   const [count, setCount] = useState<number>(0);
+  const tableDataRef = useRef<any[]>([]);
+  const isShowRef = useRef<boolean>(false);
+  tableDataRef.current = tableDataSource;
   const proMethod = getProMethod();//获取采购方式
   let showNameT: any = { tbr: '', pb: '', tb: '' }//投标人供应商
   if (proMethod === 'procurement_mode_1' || proMethod === 'procurement_mode_2') {//招标
-      showNameT = { tbr: '投标人', pb: '评标', tb: '投标' };
+    showNameT = { tbr: '投标人', pb: '评标', tb: '投标' };
   } else {
-      showNameT = { tbr: '供应商', pb: '评审', tb: '应答'  }
+    showNameT = { tbr: '供应商', pb: '评审', tb: '应答' }
   }
 
   const { TextArea } = Input;
@@ -76,6 +80,7 @@ const BidPreliminarySummary: React.FC<BidPreliminarySummaryProps> = (props) => {
           //判断采购方式是否符合
           isCheckShow(juryDataParams.assessRoomId).then((res) => {
             if (res.code == 200) {
+              isShowRef.current = res.data;
               let count = 0;
               totalSupplier.forEach((ele: any) => {
                 if (
@@ -133,6 +138,18 @@ const BidPreliminarySummary: React.FC<BidPreliminarySummaryProps> = (props) => {
               return pre
             }
           }, 0)
+          for (const key in inner.earlyMap) {
+            if (Object.prototype.hasOwnProperty.call(inner.earlyMap, key)) {
+              const element = inner.earlyMap[key];
+              for (const ite of totalSupplier) {
+                if (key == ite.supplierRegisterId) {
+                  element['macConflictStatus'] = ite.macConflictStatus;
+                  break;
+                }
+              }
+              element['originalResult'] = element.judgesResult;
+            }
+          }
           if (count == inner.length - 1) {
             count = 0
           } else {
@@ -232,7 +249,12 @@ const BidPreliminarySummary: React.FC<BidPreliminarySummaryProps> = (props) => {
     ];
     columns.forEach((ele: any) => {
       tcolumns[4].children.push({
-        title: ele.supplierRegisterName,
+        title: (
+          <>
+            {ele.supplierRegisterName}
+            {ele.macConflictStatus && <MACAddressPrompt type='other' companyName={ele.supplierRegisterName} />}
+          </>
+        ),
         dataIndex: ele.supplierRegisterId,
         key: ele.supplierRegisterId,
         render: (value: any, record: any, index: any) => {
@@ -261,6 +283,7 @@ const BidPreliminarySummary: React.FC<BidPreliminarySummaryProps> = (props) => {
               return readOnly ? value.remarks : (!value.judgesResult ? <TextArea
                 onBlur={(e) => {
                   value.remarks = e.target.value
+                  setTableDataSource([...tableDataRef.current])
                 }}
                 maxLength={500}
                 autoSize
@@ -268,7 +291,33 @@ const BidPreliminarySummary: React.FC<BidPreliminarySummaryProps> = (props) => {
                 defaultValue={value.remarks}
               /> : null)
             } else {
-              return value.judgesResult == true ? '合格' : '不合格';
+              // return value.judgesResult == true ? '合格' : '不合格';
+              return readOnly || !ele.macConflictStatus ? value.judgesResult ? '合格' : '不合格' : (<Select
+                onChange={(e) => {
+                  value.judgesResult = !!e;
+                  tableDataRef.current[tableDataRef.current.length - 1][ele.supplierRegisterId].judgesResult = !!e;
+                  setTableDataSource([...tableDataRef.current])
+                  if (isShowRef.current) {
+                    let count = 0;
+                    totalSupplier.forEach((ele: any) => {
+                      if (tableDataRef.current[tableDataRef.current.length - 1][ele.supplierRegisterId].judgesResult) {
+                        count = count + 1;
+                      }
+                    });
+                    if (count < 3) {
+                      onSubmit(true)
+                    } else {
+                      onSubmit(false)
+                    }
+                  }
+                }}
+                options={[
+                  { label: '合格', value: 1 },
+                  { label: '不合格', value: 0 },
+                ]}
+                style={{ width: '100px' }}
+                defaultValue={value.judgesResult ? 1 : 0}
+              />)
             }
           }
         },
diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx
index 680dc09..8cad81d 100644
--- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx
+++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx
@@ -11,6 +11,7 @@ import FileDown from '@/utils/Download';
 import { getURLInformation, isEmpty } from '@/utils/CommonUtils';
 import ExtendUpload from '@/utils/ExtendUpload';
 import { btnAuthority } from '@/utils/authority';
+import MACAddressPrompt from '../../BidControl/BidControlManager/components/MACAddressPrompt';
 
 const { TabPane } = Tabs;
 const { SubMenu } = Menu;
@@ -444,7 +445,12 @@ const Index: React.FC<{}> = () => {
     totalSupplierColumns.slice(currentDate, currentDate + 3).map((item: any) => {
       supplierId.push(item.supplierRegisterId)
       newColumns.push({
-        title: item.supplierRegisterName,
+        title: (
+          <>
+            {item.supplierRegisterName}
+            {item.macConflictStatus && <MACAddressPrompt type='score' />}
+          </>
+        ),
         dataIndex: item.supplierRegisterId,
         render: (text: any, record: any) => {
           if (record.scoreMap && record.scoreMap[item.supplierRegisterId]) {
@@ -737,25 +743,27 @@ const Index: React.FC<{}> = () => {
   }
   //处理汇总表返回的数据
   const getRemarkList = (data: any) => {
+    console.log('data', data);
     const List: any[] = []
-    const Error: any[] = []
-    totalSupplierColumns.forEach((item: any) => {
+    for (const item of totalSupplierColumns) {
       const obj = data[data.length - 1][item?.supplierRegisterId]
       if (obj.judgesResult == false) {//判断为不合格情况
         if (isEmpty(obj.remarks)) {
-          Error.push(item?.supplierRegisterName)
-          return
+          message.info(`请填写【${item?.supplierRegisterName}】的不合格原因说明`)
+          return false;
         }
       }
+      if (obj.macConflictStatus && obj.judgesResult) {//mac地址重复供应商选为合格
+        message.info(`${item?.supplierRegisterName}与其他供应商MAC地址重复，不可选为初审合格`);
+        return false;
+      }
       List.push({
         supplierRegisterId: item?.supplierRegisterId,
         qualifiedStatus: obj?.judgesResult ? '1' : '2',
         remarks: obj?.judgesResult ? null : obj?.remarks,
+        originalResult: obj?.originalResult ? '1' : '2',
+        modifyResultStatus: obj?.judgesResult != obj?.originalResult,
       })
-    });
-    if (Error.length > 0) {
-      message.info(`请填写【${Error[0]}】的不合格原因说明`)
-      return false
     }
     return List
   }
diff --git a/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx b/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx
index e6b48da..6325594 100644
--- a/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx
+++ b/src/pages/Evaluation/BiddingDocumentsDecrypt/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Button, Card, DatePicker, Divider, Form, List, message, Modal, Progress, Spin } from "antd";
+import { Button, Card, DatePicker, Divider, Form, List, message, Modal, Popover, Progress, Spin, Typography } from "antd";
 import ProForm, {
   ModalForm,
   ProFormDateTimePicker,
@@ -8,9 +8,10 @@ import ProTable from "@ant-design/pro-table";
 import {
   ClockCircleOutlined,
   DownloadOutlined,
+  ExclamationCircleOutlined,
   FullscreenExitOutlined,
   UnorderedListOutlined
-} from "@ant-design/icons/lib";
+} from "@ant-design/icons";
 import {
   getBiddingDocumentsDecryptList,
   DownFile,
@@ -24,6 +25,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 {
 
@@ -57,6 +59,7 @@ const BiddingDocumentsDecrypt: React.FC<BiddingDocumentsDecryptProps> = (props)
   const [spinTip, spinTipSet] = useState<string>('请稍等...');//spin tip显示文字
 
   const MethodDict = getProMethod();
+  const { Title, Text } = Typography;
   //应答字段类型 评标，应答
   let responseType = MethodDict == "procurement_mode_1" || MethodDict == "procurement_mode_2" ? "投标" : "应答"
   let supplierType = MethodDict == "procurement_mode_1" || MethodDict == "procurement_mode_2" ? "投标人" : "供应商"
@@ -367,6 +370,26 @@ const BiddingDocumentsDecrypt: React.FC<BiddingDocumentsDecryptProps> = (props)
                   dataIndex: 'companyName',
                   valueType: 'text'
                 },
+                {
+                  title: (
+                    <span>
+                      同意MAC地址检测承诺书时间
+                      <Popover
+                        content={
+                          <Typography>
+                            <Title level={5}>承诺书内容：</Title>
+                            <Text style={{ display: 'inline-block', textIndent: '2em' }}>已阅读并承诺在采购招标过程中，不存在围标、串标行为。同意中国联通公司对参与供应商进行IP、MAC地址校验，如不同供应商的MAC地址相同，评标/评审委员会（或采购人）将按围标、串标处理。</Text>
+                          </Typography>
+                        }
+                        overlayInnerStyle={{ width: 400 }}
+                      >
+                        <ExclamationCircleOutlined style={{ color: '#b30000', marginLeft: 4 }} />
+                      </Popover>
+                    </span>
+                  ),
+                  dataIndex: 'confirmTime',
+                  valueType: 'text'
+                },
                 {
                   title: '解密状态',
                   dataIndex: item.quoteOrOther == "1" ? 'decryptOtherStatus' : "decryptStatus",
@@ -397,8 +420,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/Evaluation/expert/ReviewResults/GroupLeader/components/GroupLeader.tsx b/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/GroupLeader.tsx
index 7ad48c0..dca25b4 100644
--- a/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/GroupLeader.tsx
+++ b/src/pages/Evaluation/expert/ReviewResults/GroupLeader/components/GroupLeader.tsx
@@ -15,6 +15,7 @@ import SortEditableTable from './SortEditableTable';
 import ReviewReportUpload from '@/utils/ReviewReportUpload';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { getFileListByBid } from '@/utils/DownloadUtils';
+import MACAddressPrompt from '@/pages/Evaluation/BidControl/BidControlManager/components/MACAddressPrompt';
 
 const { Panel } = Collapse;
 const { TextArea } = Input;
@@ -286,6 +287,26 @@ const GroupLeader: React.FC = () => {
         {
           title: '供应商名称',
           dataIndex: 'companyName',
+          render: (_: any, record: any) => {
+            if (record.problemInfoList != null) {
+              let count = 0;
+              record.problemInfoList.forEach((ele: any) => {
+                if (ele.problemType == 1) {//MAC地址重复
+                  count += 1;
+                }
+              });
+              if (count > 0) {
+                return (
+                  <>
+                    {_}
+                    {<MACAddressPrompt type='other' companyName={_} />}
+                  </>
+                )
+              }
+              return _;
+            }
+            return _;
+          }
           // render: (_: any, record: any) => {
           //   let tip = <></>;
           //   if (record.problemInfoList?.length > 0) {
@@ -345,6 +366,23 @@ const GroupLeader: React.FC = () => {
           title: '是否通过初步评审',
           dataIndex: 'firstRvwResult',
           render: (_: any, record: any) => {
+            /**
+             * 2022.5.9 zhoujianlong 增加MAC地址重复供应商不能将中标候选人选为‘是’的校验
+             */
+            if (!confirmSubmitStatus && record.problemInfoList != null) {
+              let count = 0;
+              record.problemInfoList.forEach((ele: any) => {
+                if (ele.problemType == 1) {//MAC地址重复
+                  count += 1;
+                }
+              });
+              if (count > 0) {
+                if (record.winnerCandidate == 'yes') {
+                  message.info(`${record.companyName}与其他供应商MAC地址相同，不可选为${candidateType}候选人`);
+                  record.winnerCandidate = 'no'
+                }
+              }
+            }
             if (record.firstRvwResult == null) {
               return '-'
             } else {
@@ -382,6 +420,26 @@ const GroupLeader: React.FC = () => {
           dataIndex: 'companyName',
           width: 110,
           fixed: 'left',
+          render: (_: any, record: any) => {
+            if (record.problemInfoList != null) {
+              let count = 0;
+              record.problemInfoList.forEach((ele: any) => {
+                if (ele.problemType == 1) {//MAC地址重复
+                  count += 1;
+                }
+              });
+              if (count > 0) {
+                return (
+                  <>
+                    {_}
+                    {<MACAddressPrompt type='other' companyName={_} />}
+                  </>
+                )
+              }
+              return _;
+            }
+            return _;
+          }
           // render: (_: any, record: any) => {
           //   let tip = <></>;
           //   if (record.problemInfoList?.length > 0) {
@@ -476,6 +534,27 @@ const GroupLeader: React.FC = () => {
               isEmpty(record.winnerCandidate) ? record.winnerCandidate = 'no' : null
               isEmpty(record.winnerBidder) ? record.winnerBidder = '0' : null
             }
+            /**
+             * 2022.5.9 zhoujianlong 增加MAC地址重复供应商不能将中标候选人选为‘是’的校验
+             */
+            if (!confirmSubmitStatus && record.problemInfoList != null) {
+              let count = 0;
+              record.problemInfoList.forEach((ele: any) => {
+                if (ele.problemType == 1) {//MAC地址重复
+                  count += 1;
+                }
+              });
+              if (count > 0) {
+                if (record.winnerCandidate == 'yes') {
+                  message.info(`${record.companyName}与其他供应商MAC地址相同，不可选为入围候选人`);
+                  record.winnerCandidate = 'no'
+                }
+                if (record.winnerBidder == '1') {
+                  message.info(`${record.companyName}与其他供应商MAC地址相同，不可选为拟入围人`);
+                  record.winnerBidder = '0'
+                }
+              }
+            }
             record.answerValid = valid
             return rvwResultRender(_, record.detailRvwReason);
           }
@@ -532,6 +611,26 @@ const GroupLeader: React.FC = () => {
           dataIndex: 'companyName',
           width: 110,
           fixed: 'left',
+          render: (_: any, record: any) => {
+            if (record.problemInfoList != null) {
+              let count = 0;
+              record.problemInfoList.forEach((ele: any) => {
+                if (ele.problemType == 1) {//MAC地址重复
+                  count += 1;
+                }
+              });
+              if (count > 0) {
+                return (
+                  <>
+                    {_}
+                    {<MACAddressPrompt type='other' companyName={_} />}
+                  </>
+                )
+              }
+              return _;
+            }
+            return _;
+          }
           // render: (_: any, record: any) => {
           //   let tip = <></>;
           //   if (record.problemInfoList?.length > 0) {
@@ -645,6 +744,27 @@ const GroupLeader: React.FC = () => {
               isEmpty(record.winnerCandidate) ? record.winnerCandidate = 'no' : null
               isEmpty(record.winnerBidder) ? record.winnerBidder = '0' : null
             }
+            /**
+             * 2022.5.9 zhoujianlong 增加MAC地址重复供应商不能将中标候选人选为‘是’的校验
+             */
+            if (!confirmSubmitStatus && record.problemInfoList != null) {
+              let count = 0;
+              record.problemInfoList.forEach((ele: any) => {
+                if (ele.problemType == 1) {//MAC地址重复
+                  count += 1;
+                }
+              });
+              if (count > 0) {
+                if (record.winnerCandidate == 'yes') {
+                  message.info(`${record.companyName}与其他供应商MAC地址相同，不可选为${candidateType}候选人`);
+                  record.winnerCandidate = 'no'
+                }
+                if (record.winnerBidder == '1') {
+                  message.info(`${record.companyName}与其他供应商MAC地址相同，不可选为拟${candidateType}人`);
+                  record.winnerBidder = '0'
+                }
+              }
+            }
             record.answerValid = valid
             return rvwResultRender(_, record.detailRvwReason);
           }
@@ -747,6 +867,26 @@ const GroupLeader: React.FC = () => {
           dataIndex: 'companyName',
           width: 110,
           fixed: 'left',
+          render: (_: any, record: any) => {
+            if (record.problemInfoList != null) {
+              let count = 0;
+              record.problemInfoList.forEach((ele: any) => {
+                if (ele.problemType == 1) {//MAC地址重复
+                  count += 1;
+                }
+              });
+              if (count > 0) {
+                return (
+                  <>
+                    {_}
+                    {<MACAddressPrompt type='other' companyName={_} />}
+                  </>
+                )
+              }
+              return _;
+            }
+            return _;
+          }
         },
         {
           title: '商务分',
@@ -827,6 +967,23 @@ const GroupLeader: React.FC = () => {
             if (valid == 0 && !resultDisabledStatus) {//应答是否有效为否并且当前是编辑状态自动触发
               isEmpty(record.winnerCandidate) ? record.winnerCandidate = 'no' : null
             }
+            /**
+             * 2022.5.9 zhoujianlong 增加MAC地址重复供应商不能将中标候选人选为‘是’的校验
+             */
+            if (!confirmSubmitStatus && record.problemInfoList != null) {
+              let count = 0;
+              record.problemInfoList.forEach((ele: any) => {
+                if (ele.problemType == 1) {//MAC地址重复
+                  count += 1;
+                }
+              });
+              if (count > 0) {
+                if (record.winnerCandidate == 'yes') {
+                  message.info(`${record.companyName}与其他供应商MAC地址相同，不可通过审核结果`);
+                  record.winnerCandidate = 'no'
+                }
+              }
+            }
             record.answerValid = valid
             return rvwResultRender(_, record.detailRvwReason);
           }
diff --git a/src/pages/Evaluation/expert/ReviewResults/Jury/components/Jury.tsx b/src/pages/Evaluation/expert/ReviewResults/Jury/components/Jury.tsx
index 00be8e1..7f29f13 100644
--- a/src/pages/Evaluation/expert/ReviewResults/Jury/components/Jury.tsx
+++ b/src/pages/Evaluation/expert/ReviewResults/Jury/components/Jury.tsx
@@ -12,6 +12,7 @@ import { btnAuthority } from '@/utils/authority';
 import WebOffice0609, { WebOfficeRefProps } from '@/pages/webOffice/weboffice0609';
 import ReviewReportUpload from '@/utils/ReviewReportUpload';
 import { getFileListByBid } from '@/utils/DownloadUtils';
+import MACAddressPrompt from '@/pages/Evaluation/BidControl/BidControlManager/components/MACAddressPrompt';
 const { Panel } = Collapse;
 const { TextArea } = Input;
 const { Paragraph, Text } = Typography;
@@ -99,6 +100,26 @@ const Jury: React.FC = () => {
             title: '供应商名称',
             dataIndex: 'companyName',
             width: 110,
+            render: (_: any, record: any) => {
+                if (record.problemInfoList != null) {
+                    let count = 0;
+                    record.problemInfoList.forEach((ele: any) => {
+                        if (ele.problemType == 1) {//MAC地址重复
+                            count += 1;
+                        }
+                    });
+                    if (count > 0) {
+                        return (
+                            <>
+                                {_}
+                                {<MACAddressPrompt type='other' companyName={_} />}
+                            </>
+                        )
+                    }
+                    return _;
+                }
+                return _;
+            }
         },
         {
             title: `报价（${quotationMethod}）`,
@@ -205,6 +226,26 @@ const Jury: React.FC = () => {
             title: '供应商名称',
             dataIndex: 'companyName',
             width: 110,
+            render: (_: any, record: any) => {
+                if (record.problemInfoList != null) {
+                    let count = 0;
+                    record.problemInfoList.forEach((ele: any) => {
+                        if (ele.problemType == 1) {//MAC地址重复
+                            count += 1;
+                        }
+                    });
+                    if (count > 0) {
+                        return (
+                            <>
+                                {_}
+                                {<MACAddressPrompt type='other' companyName={_} />}
+                            </>
+                        )
+                    }
+                    return _;
+                }
+                return _;
+            }
         },
         {
             title: '商务分',
@@ -291,6 +332,26 @@ const Jury: React.FC = () => {
             title: '供应商名称',
             dataIndex: 'companyName',
             width: 210,
+            render: (_: any, record: any) => {
+                if (record.problemInfoList != null) {
+                    let count = 0;
+                    record.problemInfoList.forEach((ele: any) => {
+                        if (ele.problemType == 1) {//MAC地址重复
+                            count += 1;
+                        }
+                    });
+                    if (count > 0) {
+                        return (
+                            <>
+                                {_}
+                                {<MACAddressPrompt type='other' companyName={_} />}
+                            </>
+                        )
+                    }
+                    return _;
+                }
+                return _;
+            }
         },
         {
             title: '报价总金额净价（元）',
@@ -353,6 +414,26 @@ const Jury: React.FC = () => {
             title: '供应商名称',
             dataIndex: 'companyName',
             width: 110,
+            render: (_: any, record: any) => {
+                if (record.problemInfoList != null) {
+                    let count = 0;
+                    record.problemInfoList.forEach((ele: any) => {
+                        if (ele.problemType == 1) {//MAC地址重复
+                            count += 1;
+                        }
+                    });
+                    if (count > 0) {
+                        return (
+                            <>
+                                {_}
+                                {<MACAddressPrompt type='other' companyName={_} />}
+                            </>
+                        )
+                    }
+                    return _;
+                }
+                return _;
+            }
         },
         {
             title: '商务分',
diff --git a/src/pages/Evaluation/projectManager/ReviewResults/Manager/components/Manager.tsx b/src/pages/Evaluation/projectManager/ReviewResults/Manager/components/Manager.tsx
index 1ba5922..e088900 100644
--- a/src/pages/Evaluation/projectManager/ReviewResults/Manager/components/Manager.tsx
+++ b/src/pages/Evaluation/projectManager/ReviewResults/Manager/components/Manager.tsx
@@ -11,6 +11,7 @@ import { btnAuthority } from '@/utils/authority';
 import WebOffice0609, { WebOfficeRefProps } from '@/pages/webOffice/weboffice0609';
 import ReviewReportUpload from '@/utils/ReviewReportUpload';
 import { getFileListByBid } from '@/utils/DownloadUtils';
+import MACAddressPrompt from '@/pages/Evaluation/BidControl/BidControlManager/components/MACAddressPrompt';
 
 const { Panel } = Collapse;
 const { Paragraph, Text } = Typography;
@@ -101,6 +102,26 @@ const Manager: React.FC = () => {
             title: '供应商名称',
             dataIndex: 'companyName',
             width: 110,
+            render: (_: any, record: any) => {
+                if (record.problemInfoList != null) {
+                    let count = 0;
+                    record.problemInfoList.forEach((ele: any) => {
+                        if (ele.problemType == 1) {//MAC地址重复
+                            count += 1;
+                        }
+                    });
+                    if (count > 0) {
+                        return (
+                            <>
+                                {_}
+                                {<MACAddressPrompt type='other' companyName={_} />}
+                            </>
+                        )
+                    }
+                    return _;
+                }
+                return _;
+            }
         },
         {
             title: `报价（${quotationMethod}）`,
@@ -207,6 +228,26 @@ const Manager: React.FC = () => {
             title: '供应商名称',
             dataIndex: 'companyName',
             width: 110,
+            render: (_: any, record: any) => {
+                if (record.problemInfoList != null) {
+                    let count = 0;
+                    record.problemInfoList.forEach((ele: any) => {
+                        if (ele.problemType == 1) {//MAC地址重复
+                            count += 1;
+                        }
+                    });
+                    if (count > 0) {
+                        return (
+                            <>
+                                {_}
+                                {<MACAddressPrompt type='other' companyName={_} />}
+                            </>
+                        )
+                    }
+                    return _;
+                }
+                return _;
+            }
         },
         {
             title: '商务分',
@@ -293,6 +334,26 @@ const Manager: React.FC = () => {
             title: '供应商名称',
             dataIndex: 'companyName',
             width: 210,
+            render: (_: any, record: any) => {
+                if (record.problemInfoList != null) {
+                    let count = 0;
+                    record.problemInfoList.forEach((ele: any) => {
+                        if (ele.problemType == 1) {//MAC地址重复
+                            count += 1;
+                        }
+                    });
+                    if (count > 0) {
+                        return (
+                            <>
+                                {_}
+                                {<MACAddressPrompt type='other' companyName={_} />}
+                            </>
+                        )
+                    }
+                    return _;
+                }
+                return _;
+            }
         },
         {
             title: '报价总金额净价（元）',
@@ -355,6 +416,26 @@ const Manager: React.FC = () => {
             title: '供应商名称',
             dataIndex: 'companyName',
             width: 110,
+            render: (_: any, record: any) => {
+                if (record.problemInfoList != null) {
+                    let count = 0;
+                    record.problemInfoList.forEach((ele: any) => {
+                        if (ele.problemType == 1) {//MAC地址重复
+                            count += 1;
+                        }
+                    });
+                    if (count > 0) {
+                        return (
+                            <>
+                                {_}
+                                {<MACAddressPrompt type='other' companyName={_} />}
+                            </>
+                        )
+                    }
+                    return _;
+                }
+                return _;
+            }
         },
         {
             title: '商务分',
diff --git a/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx b/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx
new file mode 100644
index 0000000..dc12e65
--- /dev/null
+++ b/src/pages/Project/ProjectManage/Examination/components/ProjectManage.tsx
@@ -0,0 +1,175 @@
+import { getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnum } from '@/utils/CommonUtils';
+import { followUpAProjectManager, getDicData, setPurchaseCanOperate } from '@/utils/session';
+import ProTable, { ProColumns } from '@ant-design/pro-table';
+import { Button, Spin } from 'antd';
+import React, { useState } from 'react';
+import { useHistory } from 'umi';
+import { getPage } from '../service';
+
+interface ProjectManageProps {
+    projectName?: string | null,
+    bidMethodDict?: string | null,
+    current?: string | null
+}
+/**
+ * 项目管理列表
+ * @param props 
+ * @returns 
+ */
+const ProjectManage: React.FC<ProjectManageProps> = (props) => {
+    const { projectName, bidMethodDict, current } = props
+
+    const [spin, spinSet] = useState<boolean>(false);
+    //查询分页数据
+    const [pageData, pageDataSet] = useState<any>({
+        pageNo: isNotEmpty(current) ? Number(current) : 1,
+        pageSize: 10
+    });
+    //项目列表参数
+    const [projectParams, setProjectParams] = useState<string>("");
+    //获取字典
+    const getDict: any = getDicData();
+    const dictData = JSON.parse(getDict);
+    //标的类型
+    const procurementTypeEntrust = 'procurement_type=entrust';
+    //采购方式
+    const procurementModeEntrust = 'procurement_mode=entrust';
+    const history = useHistory();
+
+    const columns: ProColumns<any>[] = [
+        {
+            title: '序号',
+            valueType: 'index',
+            width: 50,
+        },
+        {
+            title: '采购方式',
+            dataIndex: 'bidMethodDict',
+            width: '8%',
+            valueEnum: proTableValueEnum(dictData[procurementModeEntrust]),
+            initialValue:  isNotEmpty(bidMethodDict) ? bidMethodDict : null ,
+        },
+        {
+            title: '项目名称',
+            dataIndex: 'projectName',
+            initialValue: isNotEmpty(projectName) ? projectName : null ,
+        },
+        {
+            title: '项目编号',
+            dataIndex: 'ebpProjectNumber',
+            search: false,
+            width: '10%',
+        },
+        {
+            title: '采购人',
+            dataIndex: 'tendereeOrgName',
+            search: false,
+            width: '15%',
+        },
+        {
+            title: '建档时间',
+            dataIndex: 'createDate',
+            search: false,
+            width: '10%',
+        },
+        {
+            title: '标的类型',
+            dataIndex: 'procurementType',
+            width: '8%',
+            search: false,
+            valueEnum: proTableValueEnum(dictData[procurementTypeEntrust]),
+        },
+        {
+            title: '所属区域',
+            dataIndex: 'regionDictName',
+            search: false,
+            width: '10%',
+        },
+        {
+            title: '操作',
+            valueType: 'option',
+            width: 150,
+            render: (_: any, record: any) =>
+            (
+                <>
+                    <Button
+                        key="followUpProject"
+                        type="text"
+                        onClick={() =>
+                            followUpProject(record)
+                        }
+                    >
+                        项目跟进
+                    </Button>
+                </>
+            )
+        },
+    ]
+
+    /**
+       * 项目跟进
+       * @param data
+       */
+    const followUpProject = async (data: any) => {
+        data.returnURL = getReturnURL();
+        await followUpAProjectManager(data);
+        setPurchaseCanOperate();
+        history.push('/ProjectLayout/Manager/HomePageSectionList');
+    };
+
+    /**
+   * 获取返回路径
+   * @returns 
+   */
+    const getReturnURL = () => {
+        let projectURLParams = JSON.parse(projectParams);
+        let params = `${'?current=' + projectURLParams.current}${isEmpty(projectURLParams.projectName) ? '' : '&projectName=' + projectURLParams.projectName}${isEmpty(projectURLParams.bidMethodDict) ? '' : '&bidMethodDict=' + projectURLParams.bidMethodDict}&tabs=projectList`;
+        return getUrlRelativePath() + params;
+    }
+
+    return (
+        <Spin spinning={spin}>
+            <div className="zjl-entrust confirm">
+                <ProTable
+                    columns={columns}
+                    options={false}
+                    bordered={false}
+                    size='small'
+                    search={{ labelWidth: 'auto', span: 6 }}
+                    loading={false}
+                    request={async (params) => {
+                        setProjectParams(JSON.stringify(params));
+                        spinSet(true);
+                        return await getPage({
+                            ...params,
+                            basePageRequest: { pageNo: pageData.pageNo, pageSize: pageData.pageSize },
+                        }).then((res) => {
+                            const result = {
+                                data: res.data.records,
+                                total: res.data.total,
+                                success: res.success,
+                                pageSize: res.data.size,
+                                current: res.data.current
+                            }
+                            return result;
+                        }).finally(() => {
+                            isNotEmpty(window.location.search) && history.push(window.location.pathname);
+                            spinSet(false);
+                        })
+                    }
+                    }
+                    pagination={{
+                        defaultPageSize: 10,
+                        defaultCurrent:  isNotEmpty(current) ? Number(current) : 1 ,
+                        size: "small",
+                        showSizeChanger: false,
+                        onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
+                        onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
+                    }}
+                    onReset={() => { pageDataSet({ pageNo: 1, pageSize: 10 }) }}
+                />
+            </div>
+        </Spin>
+    )
+}
+export default ProjectManage;
\ No newline at end of file
diff --git a/src/pages/Project/ProjectManage/Examination/index.tsx b/src/pages/Project/ProjectManage/Examination/index.tsx
new file mode 100644
index 0000000..c57ef86
--- /dev/null
+++ b/src/pages/Project/ProjectManage/Examination/index.tsx
@@ -0,0 +1,33 @@
+import { getURLInformation, getUrlParam } from '@/utils/CommonUtils';
+import { Card } from 'antd';
+import React from 'react';
+import ProjectManage from './components/ProjectManage';
+/**
+ * 监督项目管理
+ * @returns 
+ */
+const Index: React.FC<{}> = () => {
+  //url项目名称
+  const projectName = getUrlParam("projectName");
+  //url采购方式
+  const bidMethodDict = getURLInformation("bidMethodDict");
+  //url分页信息
+  const current = getURLInformation("current");
+  //url标签信息
+  // const tabs = getURLInformation("tabs");
+  // //radio value
+  // const [mode, setMode] = useState<string>(isNotEmpty(tabs) ? String(tabs) : 'projectList');
+
+  // const handleModeChange = (e: any) => {
+  //   const mode = e.target.value;
+  //   setMode(mode);
+  // };
+
+  return (
+    <Card style={{ borderRadius: 6 }} bodyStyle={{ padding: '16px 24px 0px' }}>
+        <ProjectManage projectName={projectName} bidMethodDict={bidMethodDict} current={current} />
+    </Card>
+
+  )
+}
+export default Index;
\ No newline at end of file
diff --git a/src/pages/Project/ProjectManage/Examination/service.ts b/src/pages/Project/ProjectManage/Examination/service.ts
new file mode 100644
index 0000000..11d2fcb
--- /dev/null
+++ b/src/pages/Project/ProjectManage/Examination/service.ts
@@ -0,0 +1,11 @@
+import request from '@/utils/request';
+/**
+ * 查询数据并分页
+ * @param params 
+ */
+export async function getPage(params?: any) {
+  return request('/api/biz-service-ebtp-project/v1/projectRecord/examination/getPage', {
+    method: 'POST',
+    data: params,
+  });
+}
\ No newline at end of file
diff --git a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationChoose.tsx b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationChoose.tsx
index 6a8cf7e..e862b3d 100644
--- a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationChoose.tsx
+++ b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationChoose.tsx
@@ -3,6 +3,7 @@ import { Button, Form, Input, Modal, Select, Spin } from 'antd';
 import { PackageInformationProps } from '../data';
 import SelectProcess from './SelectProcess';
 import { getChooseProcess } from '../service';
+import { trim } from '@/utils/CommonUtils';
 
 /**
  * 公开比选编辑
@@ -64,15 +65,15 @@ const PackageInformationChoose: React.FC<PackageInformationProps> = (props) => {
     //判断评审规则是否存在（比选多阶段）
     if (values?.reviewRules == null) {
       //判断资格审查方法是否存在（比选一阶段预审）
-      if (values?.ptcpMode == null) {} else {
+      if (values?.ptcpMode == null) { } else {
         params['levelFour'] = values?.ptcpMode;
       }
     } else {
       params['levelThree'] = values?.reviewRules;
     }
     //判断应不应该显示选择流程按钮
-    if(projectItems?.biddingSignDict == 'selection_method_1') {//比选一阶段
-      if(projectItems?.examinationMethodDict == 'examination_method_2') {//资格后审
+    if (projectItems?.biddingSignDict == 'selection_method_1') {//比选一阶段
+      if (projectItems?.examinationMethodDict == 'examination_method_2') {//资格后审
         values?.evalMethodDict == null ? setShowSelect(true) : setShowSelect(false);
       } else {
         values?.evalMethodDict == null || values?.ptcpMode == null ? setShowSelect(true) : setShowSelect(false);
@@ -143,18 +144,18 @@ const PackageInformationChoose: React.FC<PackageInformationProps> = (props) => {
     //判断评审规则是否存在（比选多阶段）
     if (form.getFieldValue('reviewRules') == null || form.getFieldValue('reviewRules') == '') {
       //判断资格审查方法是否存在（比选一阶段预审）
-      if (form.getFieldValue('ptcpMode') == null || form.getFieldValue('ptcpMode') == '') {} else {
+      if (form.getFieldValue('ptcpMode') == null || form.getFieldValue('ptcpMode') == '') { } else {
         params['levelFour'] = form.getFieldValue('ptcpMode');
       }
     } else {
       params['levelThree'] = form.getFieldValue('reviewRules');
     }
-     //判断应不应该显示选择流程按钮
-     if(projectItems?.biddingSignDict == 'selection_method_1') {//比选一阶段
-      if(projectItems?.examinationMethodDict == 'examination_method_2') {//资格后审
+    //判断应不应该显示选择流程按钮
+    if (projectItems?.biddingSignDict == 'selection_method_1') {//比选一阶段
+      if (projectItems?.examinationMethodDict == 'examination_method_2') {//资格后审
         form.getFieldValue('evalMethodDict') == null || form.getFieldValue('evalMethodDict') == '' ? setShowSelect(true) : setShowSelect(false);
       } else {
-        form.getFieldValue('evalMethodDict') == null || form.getFieldValue('evalMethodDict') == ''|| form.getFieldValue('ptcpMode') == null || form.getFieldValue('ptcpMode') == '' ? setShowSelect(true) : setShowSelect(false);
+        form.getFieldValue('evalMethodDict') == null || form.getFieldValue('evalMethodDict') == '' || form.getFieldValue('ptcpMode') == null || form.getFieldValue('ptcpMode') == '' ? setShowSelect(true) : setShowSelect(false);
       }
     } else {
       form.getFieldValue('evalMethodDict') == null || form.getFieldValue('evalMethodDict') == '' || form.getFieldValue('reviewRules') == null || form.getFieldValue('reviewRules') == '' ? setShowSelect(true) : setShowSelect(false);
@@ -228,13 +229,13 @@ const PackageInformationChoose: React.FC<PackageInformationProps> = (props) => {
           !controlDisplay
             ? false
             : [
-                <Button key="back" onClick={onCancel}>
-                  取消
-                </Button>,
-                <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
-                  保存
-                </Button>,
-              ]
+              <Button key="back" onClick={onCancel}>
+                取消
+              </Button>,
+              <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
+                保存
+              </Button>,
+            ]
         }
       >
         <Spin spinning={saveLoading} delay={300}>
@@ -255,6 +256,7 @@ const PackageInformationChoose: React.FC<PackageInformationProps> = (props) => {
               name="bidSectName"
               label="采购包名称"
               rules={[{ required: controlDisplay }, { max: 100, message: '最大不能超过100字' }]}
+              normalize={(value) => trim(value)}
             >
               <Input disabled={!controlDisplay} placeholder="请填写采购包名称" />
             </Form.Item>
@@ -279,7 +281,7 @@ const PackageInformationChoose: React.FC<PackageInformationProps> = (props) => {
               </Select>
             </Form.Item>
             {projectItems?.biddingSignDict == 'selection_method_1' &&
-            projectItems?.examinationMethodDict == 'examination_method_1' ? (
+              projectItems?.examinationMethodDict == 'examination_method_1' ? (
               <Form.Item
                 name="ptcpMode"
                 label="资格审查方法"
diff --git a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationEnquiry.tsx b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationEnquiry.tsx
index 0ce9a7f..4c5d34e 100644
--- a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationEnquiry.tsx
+++ b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationEnquiry.tsx
@@ -3,6 +3,7 @@ import { Button, Form, Input, Modal, Select } from 'antd';
 import { PackageInformationProps } from '@/pages/Project/ProjectManage/PackageDivided/data';
 import { getChooseProcess } from '@/pages/Project/ProjectManage/PackageDivided/service';
 import SelectProcess from '@/pages/Project/ProjectManage/PackageDivided/components/SelectProcess';
+import { trim } from '@/utils/CommonUtils';
 /*
  *
  * 询价编辑
@@ -130,13 +131,13 @@ const PackageInformationEnquiry: React.FC<PackageInformationProps> = (props) =>
         !controlDisplay
           ? false
           : [
-              <Button key="back" onClick={onCancel}>
-                取消
-              </Button>,
-              <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
-                保存
-              </Button>,
-            ]
+            <Button key="back" onClick={onCancel}>
+              取消
+            </Button>,
+            <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
+              保存
+            </Button>,
+          ]
       }
     >
       <Form
@@ -156,6 +157,7 @@ const PackageInformationEnquiry: React.FC<PackageInformationProps> = (props) =>
           name="bidSectName"
           label="采购包名称"
           rules={[{ required: controlDisplay }, { max: 100, message: '最大不能超过100字' }]}
+          normalize={(value) => trim(value)}
         >
           <Input disabled={!controlDisplay} placeholder="请填写采购包名称" />
         </Form.Item>
diff --git a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationInvite.tsx b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationInvite.tsx
index 0b6f098..78ea436 100644
--- a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationInvite.tsx
+++ b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationInvite.tsx
@@ -3,6 +3,7 @@ import { Button, Form, Input, Modal, Select, Spin } from 'antd';
 import { PackageInformationProps } from '../data';
 import { getChooseProcess } from '../service';
 import SelectProcess from './SelectProcess';
+import { trim } from '@/utils/CommonUtils';
 /**
  * 邀请招标编辑
  *
@@ -139,7 +140,7 @@ const PackageInformationInvite: React.FC<PackageInformationProps> = (props) => {
     });
     if (form.getFieldValue('evalMethodDict') == null) {
     } else {
-       (false);
+      (false);
     }
   };
   return (
@@ -157,13 +158,13 @@ const PackageInformationInvite: React.FC<PackageInformationProps> = (props) => {
         !controlDisplay
           ? false
           : [
-              <Button key="back" onClick={onCancel}>
-                取消
-              </Button>,
-              <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
-                保存
-              </Button>,
-            ]
+            <Button key="back" onClick={onCancel}>
+              取消
+            </Button>,
+            <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
+              保存
+            </Button>,
+          ]
       }
     >
       <Spin spinning={saveLoading} delay={300}>
@@ -184,6 +185,7 @@ const PackageInformationInvite: React.FC<PackageInformationProps> = (props) => {
             name="bidSectName"
             label="标段名称"
             rules={[{ required: controlDisplay }, { max: 100, message: '最大不能超过100字' }]}
+            normalize={(value) => trim(value)}
           >
             <Input disabled={!controlDisplay} placeholder="请填写标段名称" />
           </Form.Item>
diff --git a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationInviteBid.tsx b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationInviteBid.tsx
index 6985591..bee3b9c 100644
--- a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationInviteBid.tsx
+++ b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationInviteBid.tsx
@@ -3,6 +3,7 @@ import { Button, Form, Input, Modal, Select, Spin } from 'antd';
 import { PackageInformationProps } from '../data';
 import { getChooseProcess } from '../service';
 import SelectProcess from './SelectProcess';
+import { trim } from '@/utils/CommonUtils';
 /**
  * 公开招标编辑
  *
@@ -146,7 +147,7 @@ const PackageInformationInviteBid: React.FC<PackageInformationProps> = (props) =
         setChooseProcessList(res.data);
       }
     }).finally(() => {
-      setSpinningload(false);   
+      setSpinningload(false);
     });
   };
   //评价方法
@@ -238,13 +239,13 @@ const PackageInformationInviteBid: React.FC<PackageInformationProps> = (props) =
         !controlDisplay
           ? false
           : [
-              <Button key="back" onClick={onCancel}>
-                取消
-              </Button>,
-              <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
-                保存
-              </Button>,
-            ]
+            <Button key="back" onClick={onCancel}>
+              取消
+            </Button>,
+            <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
+              保存
+            </Button>,
+          ]
       }
     >
       <Spin spinning={saveLoading} delay={300}>
@@ -265,6 +266,7 @@ const PackageInformationInviteBid: React.FC<PackageInformationProps> = (props) =
             name="bidSectName"
             label="标段名称"
             rules={[{ required: controlDisplay }, { max: 100, message: '最大不能超过100字' }]}
+            normalize={(value) => trim(value)}
           >
             <Input disabled={!controlDisplay} placeholder="请填写标段名称" />
           </Form.Item>
diff --git a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationNegotiate.tsx b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationNegotiate.tsx
index 6c0770b..8334924 100644
--- a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationNegotiate.tsx
+++ b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationNegotiate.tsx
@@ -3,6 +3,7 @@ import { Button, Form, Input, Modal, Select, Spin } from 'antd';
 import { PackageInformationProps } from '../data';
 import { getChooseProcess } from '../service';
 import SelectProcess from './SelectProcess';
+import { trim } from '@/utils/CommonUtils';
 
 /**
  * 竞争性谈判编辑
@@ -46,7 +47,6 @@ const PackageInformationNegotiate: React.FC<PackageInformationProps> = (props) =
   const [spinningload, setSpinningload] = useState<boolean>(false);
   //保存loading
   const [saveLoading, setSaveLoading] = useState<boolean>(false);
-
   useEffect(() => {
     if (values.status == 0 || values.status == 1) {
       setStatus(false);
@@ -148,13 +148,13 @@ const PackageInformationNegotiate: React.FC<PackageInformationProps> = (props) =
         !controlDisplay
           ? false
           : [
-              <Button key="back" onClick={onCancel}>
-                取消
-              </Button>,
-              <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
-                保存
-              </Button>,
-            ]
+            <Button key="back" onClick={onCancel}>
+              取消
+            </Button>,
+            <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
+              保存
+            </Button>,
+          ]
       }
     >
       <Spin spinning={saveLoading} delay={300}>
@@ -175,6 +175,7 @@ const PackageInformationNegotiate: React.FC<PackageInformationProps> = (props) =
             name="bidSectName"
             label="采购包名称"
             rules={[{ required: controlDisplay }, { max: 100, message: '最大不能超过100字' }]}
+            normalize={(value) => trim(value)}
           >
             <Input disabled={!controlDisplay} placeholder="请填写采购包名称" />
           </Form.Item>
diff --git a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationOnly.tsx b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationOnly.tsx
index f96acb6..7c4bff0 100644
--- a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationOnly.tsx
+++ b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationOnly.tsx
@@ -3,6 +3,7 @@ import { Button, Form, Input, Modal, Select, Spin } from 'antd';
 import { PackageInformationProps } from '../data';
 import { getChooseProcess } from '../service';
 import SelectProcess from './SelectProcess';
+import { trim } from '@/utils/CommonUtils';
 /**
  * 单一来源编辑
  *
@@ -43,7 +44,6 @@ const PackageInformationOnly: React.FC<PackageInformationProps> = (props) => {
   const [spinningload, setSpinningload] = useState<boolean>(false);
   //保存loading
   const [saveLoading, setSaveLoading] = useState<boolean>(false);
-
   useEffect(() => {
     if (values.status == 0 || values.status == 1) {
       setStatus(false);
@@ -143,7 +143,7 @@ const PackageInformationOnly: React.FC<PackageInformationProps> = (props) => {
           <Form.Item name="bidSectBizNum" label="采购包编号">
             <Input disabled />
           </Form.Item>
-          <Form.Item name="bidSectName" label="采购包名称" rules={[{ required: controlDisplay }, { max: 100, message: "最大不能超过100字" }]}>
+          <Form.Item name="bidSectName" label="采购包名称" rules={[{ required: controlDisplay }, { max: 100, message: "最大不能超过100字" }]} normalize={(value) => trim(value)}>
             <Input disabled={!controlDisplay} placeholder="请填写采购包名称" />
           </Form.Item>
           <Form.Item name="bidSectContractPrice" label="采购包预算">
diff --git a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationRecruit.tsx b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationRecruit.tsx
index ecf911d..42c2faf 100644
--- a/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationRecruit.tsx
+++ b/src/pages/Project/ProjectManage/PackageDivided/components/PackageInformationRecruit.tsx
@@ -3,6 +3,7 @@ import { Button, Form, Input, Modal, Select, Spin } from 'antd';
 import { PackageInformationProps } from '../data';
 import SelectProcess from './SelectProcess';
 import { getChooseProcess } from '../service';
+import { trim } from '@/utils/CommonUtils';
 /**
  * 公开招募编辑
  *
@@ -68,7 +69,7 @@ const PackageInformationRecruit: React.FC<PackageInformationProps> = (props) =>
         }
       }
     }).finally(() => {
-        setSpinningload(false);
+      setSpinningload(false);
     });
     values?.reviewRules == null ? setShowSelect(true) : setShowSelect(false);
     form.setFieldsValue({
@@ -159,13 +160,13 @@ const PackageInformationRecruit: React.FC<PackageInformationProps> = (props) =>
         !controlDisplay
           ? false
           : [
-              <Button key="back" onClick={onCancel}>
-                取消
-              </Button>,
-              <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
-                保存
-              </Button>,
-            ]
+            <Button key="back" onClick={onCancel}>
+              取消
+            </Button>,
+            <Button key="submit" type="primary" loading={saveLoading} onClick={onSubmit}>
+              保存
+            </Button>,
+          ]
       }
     >
       <Spin spinning={saveLoading} delay={300}>
@@ -186,6 +187,7 @@ const PackageInformationRecruit: React.FC<PackageInformationProps> = (props) =>
             name="bidSectName"
             label="包件名称"
             rules={[{ required: controlDisplay }, { max: 100, message: '最大不能超过100字' }]}
+            normalize={(value) => trim(value)}
           >
             <Input disabled={!controlDisplay} placeholder="请填写包件名称" />
           </Form.Item>
diff --git a/src/pages/Project/ProjectManage/PackageDivided/utils.ts b/src/pages/Project/ProjectManage/PackageDivided/utils.ts
index ebf0042..51f063c 100644
--- a/src/pages/Project/ProjectManage/PackageDivided/utils.ts
+++ b/src/pages/Project/ProjectManage/PackageDivided/utils.ts
@@ -1,3 +1,4 @@
+import { trim } from '@/utils/CommonUtils';
 import { message } from 'antd';
 import { updateForm } from './service';
 
@@ -22,6 +23,7 @@ export const changeDict = (dictList: any[], code: any) => {
  */
 
 export const handleUpdate = async (fields: any) => {
+  fields.bidSectName = trim(fields.bidSectName);
   const success = await updateForm(fields).then((res) => {
     if (res.code == 200) {
       message.success('编辑成功');
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..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,4 +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';
@@ -67,17 +69,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 +195,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 +239,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 +311,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 +323,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 +336,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,52 +348,54 @@ 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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
             <Popconfirm
               title="确定要删除吗？"
               onConfirm={() => toDelete(record)}
               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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
             <Popconfirm
               title="确定要删除吗？"
               onConfirm={() => toDelete(record)}
               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,54 +404,56 @@ 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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
             <Popconfirm
               title="确定要删除吗？"
               onConfirm={() => toDelete(record)}
               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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
+            <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,12 +461,13 @@ 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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
           </>
         ) : record.status == 0 && record.sendMessageStatus == 6 ? ( //草稿-公告发布失败
           <>
@@ -470,7 +477,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,17 +486,18 @@ 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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
             <Popconfirm
               title="确定要删除吗？"
               onConfirm={() => toDelete(record)}
               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,9 +510,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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
           </>
         ) : null,
     },
@@ -538,7 +547,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 +569,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 +643,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/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod1.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod1.tsx
index d500861..4c18c87 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod1.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod1.tsx
@@ -7,7 +7,7 @@ import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
 import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
 import { getDicData } from '@/utils/session';
 import '@/assets/lq_style.less';
-import { isEmpty } from '@/utils/CommonUtils';
+import { isEmpty, trim } from '@/utils/CommonUtils';
 import { btnAuthority } from '@/utils/authority';
 
 const { Option } = Select;
@@ -203,6 +203,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
                 values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
             }
             values.regionDictName = regionDictName;
+            values.projectName = trim(values.projectName);
             !isIPassDecode && (values['isIPassDecode'] = '1');
             updateUtils(values);
             //tab标段页解除禁用
@@ -303,6 +304,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
                             label="项目名称"
                             name="projectName"
                             rules={[{ required: true }]}
+                            normalize={(value) => trim(value)}
                         >
                             <Input disabled={whetherReadonly} readOnly={whetherReadonly} maxLength={150} />
                         </Form.Item>
@@ -355,12 +357,12 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
                             <Form.Item
                                 label="代理机构项目编号"
                                 name="agencyCompanyProjectNum"
-                                // rules={[
-                                //     {
-                                //         validator: (_, value) =>
-                                //             /[\u4E00-\u9FA5]/i.test(value) ? Promise.reject('不能输入汉字') : Promise.resolve()
-                                //     }
-                                // ]}
+                            // rules={[
+                            //     {
+                            //         validator: (_, value) =>
+                            //             /[\u4E00-\u9FA5]/i.test(value) ? Promise.reject('不能输入汉字') : Promise.resolve()
+                            //     }
+                            // ]}
                             >
                                 <Input maxLength={49} disabled={whetherReadonly} readOnly={whetherReadonly} />
                             </Form.Item>
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod2.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod2.tsx
index eb64a81..05d3de9 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod2.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod2.tsx
@@ -7,7 +7,7 @@ import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
 import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
 import { getDicData } from '@/utils/session';
 import '@/assets/lq_style.less';
-import { isEmpty } from '@/utils/CommonUtils';
+import { isEmpty, trim } from '@/utils/CommonUtils';
 import { btnAuthority } from '@/utils/authority';
 const { Option } = Select;
 
@@ -194,6 +194,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
                 values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
             }
             values.regionDictName = regionDictName;
+            values.projectName = trim(values.projectName);
             updateUtils(values);
             //tab标段页解除禁用
             setTabFlag(false);
@@ -293,6 +294,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
                             label="项目名称"
                             name="projectName"
                             rules={[{ required: true }]}
+                            normalize={(value) => trim(value)}
                         >
                             <Input disabled={whetherReadonly} readOnly={whetherReadonly} maxLength={150} />
                         </Form.Item>
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod3.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod3.tsx
index ec74deb..08e567e 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod3.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod3.tsx
@@ -7,7 +7,7 @@ import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
 import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
 import { getDicData } from '@/utils/session';
 import '@/assets/lq_style.less';
-import { isEmpty } from '@/utils/CommonUtils';
+import { isEmpty, trim } from '@/utils/CommonUtils';
 import { btnAuthority } from '@/utils/authority';
 const { Option } = Select;
 
@@ -34,10 +34,10 @@ function createSelect(data: any) {
 function createSelectArea(data: any) {
   let value = [];
   for (let i = 0; i < data.length; i++) {
-      if (i === 0 && data[i].pid !== '0') {
-          value.push(<Option value="">全部</Option>)
-      }
-      value.push(<Option key={data[i].id} value={data[i].id}>{data[i].name}</Option>)
+    if (i === 0 && data[i].pid !== '0') {
+      value.push(<Option value="">全部</Option>)
+    }
+    value.push(<Option key={data[i].id} value={data[i].id}>{data[i].name}</Option>)
   }
   return value;
 }
@@ -202,6 +202,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
         values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
       }
       values.regionDictName = regionDictName;
+      values.projectName = trim(values.projectName);
       !isIPassDecode && (values['isIPassDecode'] = '1');
       updateUtils(values);
       //tab标段页解除禁用
@@ -254,15 +255,15 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
    */
   const onSecondCityChange = (value: any) => {
     form.resetFields(["regionDictId"]);
-        if (value) {
-            getProvinces(value).then(res => {
-                if (res.code === 200) {
-                    setDistrict(createSelectArea(res.data));
-                }
-            })
-        } else {
-            setDistrict(createSelectArea([]));
+    if (value) {
+      getProvinces(value).then(res => {
+        if (res.code === 200) {
+          setDistrict(createSelectArea(res.data));
         }
+      })
+    } else {
+      setDistrict(createSelectArea([]));
+    }
   };
   /**
    * 区回调
@@ -306,6 +307,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
               label="项目名称"
               name="projectName"
               rules={[{ required: true }]}
+              normalize={(value) => trim(value)}
             >
               <Input disabled={whetherReadonly} readOnly={whetherReadonly} maxLength={100} />
             </Form.Item>
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod4.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod4.tsx
index 32952fc..7663330 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod4.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod4.tsx
@@ -7,7 +7,7 @@ import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
 import { getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
 import { getDicData } from '@/utils/session';
 import '@/assets/lq_style.less';
-import { isEmpty } from '@/utils/CommonUtils';
+import { isEmpty, trim } from '@/utils/CommonUtils';
 import { btnAuthority } from '@/utils/authority';
 const { Option } = Select;
 
@@ -200,6 +200,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
             values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
         }
         values.regionDictName = regionDictName;
+        values.projectName = trim(values.projectName);
         !isIPassDecode && (values['isIPassDecode'] = '1');
         updateUtils(values);
         //tab标段页解除禁用
@@ -279,6 +280,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
                             label="项目名称"
                             name="projectName"
                             rules={[{ required: true }]}
+                            normalize={(value) => trim(value)}
                         >
                             <Input disabled={whetherReadonly} readOnly={whetherReadonly} maxLength={100} />
                         </Form.Item>
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod5.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod5.tsx
index 356881c..82c17ed 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod5.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod5.tsx
@@ -7,7 +7,7 @@ import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
 import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
 import { getDicData } from '@/utils/session';
 import '@/assets/lq_style.less';
-import { isEmpty } from '@/utils/CommonUtils';
+import { isEmpty, trim } from '@/utils/CommonUtils';
 import { btnAuthority } from '@/utils/authority';
 const { Option } = Select;
 
@@ -204,6 +204,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
                 values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
             }
             values.regionDictName = regionDictName;
+            values.projectName = trim(values.projectName);
             !isIPassDecode && (values['isIPassDecode'] = '1');
             updateUtils(values);
             //tab标段页解除禁用
@@ -304,6 +305,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
                             label="项目名称"
                             name="projectName"
                             rules={[{ required: true }]}
+                            normalize={(value) => trim(value)}
                         >
                             <Input disabled={whetherReadonly} readOnly={whetherReadonly} maxLength={150} />
                         </Form.Item>
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod6.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod6.tsx
index f6515ad..5de2020 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod6.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod6.tsx
@@ -5,7 +5,7 @@ import React, { useEffect, useState } from 'react';
 import { Form, Input, Button, Select, Radio, Col, Row, Modal } from 'antd';
 import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
 import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
-import { isEmpty } from '@/utils/CommonUtils';
+import { isEmpty, trim } from '@/utils/CommonUtils';
 import { getDicData } from '@/utils/session';
 import '@/assets/lq_style.less';
 import { btnAuthority } from '@/utils/authority';
@@ -203,6 +203,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
                 values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
             }
             values.regionDictName = regionDictName;
+            values.projectName = trim(values.projectName);
             !isIPassDecode && (values['isIPassDecode'] = '1');
             updateUtils(values);
             //tab标段页解除禁用
@@ -303,6 +304,7 @@ const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
                             label="项目名称"
                             name="projectName"
                             rules={[{ required: true }]}
+                            normalize={(value) => trim(value)}
                         >
                             <Input disabled={whetherReadonly} readOnly={whetherReadonly} maxLength={150} />
                         </Form.Item>
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod9.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod9.tsx
index cd83338..6f9e174 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod9.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod9.tsx
@@ -1,540 +1,542 @@
 /**
  * 单一来源-简化流程
  */
- import React, { useEffect, useState } from 'react';
- import { Form, Input, Button, Select, Radio, Col, Row, Modal } from 'antd';
- import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
- import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
- import { isEmpty } from '@/utils/CommonUtils';
- import { getDicData } from '@/utils/session';
- import '@/assets/lq_style.less';
+import React, { useEffect, useState } from 'react';
+import { Form, Input, Button, Select, Radio, Col, Row, Modal } from 'antd';
+import { getSelectName, ProcurementMethodItem, updateUtils } from '../utils';
+import { getBudgetAmountById, getByProvincesNumber, getDictRegion, getId, getProvince, getProvinces } from '../service';
+import { isEmpty, trim } from '@/utils/CommonUtils';
+import { getDicData } from '@/utils/session';
+import '@/assets/lq_style.less';
 import { btnAuthority } from '@/utils/authority';
- const { Option } = Select;
- 
- const layout = {
-     labelCol: { span: 10 },
-     wrapperCol: { span: 13 },
- };
- /**
-  * 加载Option
-  * @param data 数据源
-  */
- function createSelect(data: any) {
-     let value = [];
-     for (const item of data) {
-         value.push(
-             <Option key={item.code} value={item.code}>{item.dicName}</Option>
-         )
-     }
-     return value;
- }
- 
- function createSelectArea(data: any) {
-     let value = [];
-     for (let i = 0; i < data.length; i++) {
-         if (i === 0 && data[i].pid !== '0') {
-             value.push(<Option value="">全部</Option>)
-         }
-         value.push(<Option key={data[i].id} value={data[i].id}>{data[i].name}</Option>)
-     }
-     return value;
- }
- 
- const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
-     const { id, whetherReadonly, status, setTabFlag, setActiveKey, setCurrentPage } = props;
-     //获取字典
-     const getDict: any = getDicData();
-     const dictData = JSON.parse(getDict);
-     //表单数据
-     const [formData, setFormData] = useState<any>(null);
-     //省数据
-     const [province, setProvince] = useState<any[]>([]);
-     //区下拉选数据
-     const [district, setDistrict] = useState<any[]>([]);
-     //市下拉选数据
-     const [city, setCity] = useState<any[]>([]);
- 
-     const [form] = Form.useForm();
-     //省默认值
-     const [initialProvince, setInitialProvince] = useState<any>(null);
-     //组织方式字典项
-     const bidOrgDictSelect = createSelect(dictData['organization=entrust']);
-     //采购类型字典项
-     const procurementTypeSelect = createSelect(dictData['procurement_type=entrust']);
-     //采购方式
-     const bidMethodDictSelect = createSelect(dictData['procurement_mode=entrust']);
-     //资金来源
-     const fundsProviderDictSelect = createSelect(dictData['funds_provider=record']);
-     //业务类型
-     const bidMethodSubDictSelect = createSelect(dictData['bid_method_sub=record']);
-     //标段信息禁用标识
-     const [noInformationFlag, setNoInformationFlag] = useState<boolean>(String(status) === '0');
-     //是否需要供应商ipass解密显隐
-     const [isIPassDecode, isIPassDecodeSet] = useState<boolean>(false);
-     function onChangeIpass(e: any) {//是否使用ipass制作
-         isIPassDecodeSet(e.target.value === '0');
-     }
-     useEffect(() => {
-         /**
-         * 根据id获取数据
-         */
-         getId(id).then(res => {
-             if (res.code === 200) {
-                 let data = res.data;
-                 if (data.isIPassFile === '0') {//是否需要供应商ipass解密显隐
-                     isIPassDecodeSet(true)
-                 }
-                 setFormData(data);
-                 // data.isApproval = isEmpty(data.isApproval) ? '0' : data.isApproval;
-                 data.isApproval = '1';
-                 data.isIPassDecode = isEmpty(data.isIPassDecode) ? '1' : data.isIPassDecode;
-                 form.setFieldsValue(data);
-                 //查询省份
-                 getByProvincesNumber(data.province).then(res => {
-                     if (res.code === 200) {
-                         let data = res.data;
-                         form.setFieldsValue({ provinceName: data?.provincesName });
-                     }
-                 })
-                 //回显省市区
-                 getProvinceCityDistrict(data.regionDictId);
- 
-             }
-         })
-         /**
-          * 获取省份
-          */
-         getProvince().then(res => {
-             if (res.code === 200) {
-                 setProvince(createSelectArea(res.data));
-             }
-         })
- 
-     }, []);
- 
-     /**
-    * 获取省市区数据
-    * @param regionDictId 
-    * @returns 
-    */
-     const getProvinceCityDistrict = (regionDictId: string) => {
-         if (isEmpty(regionDictId)) {
-             return;
-         }
-         //省
-         if (regionDictId.substring(regionDictId.length - 4) === '0000') {
-             setInitialProvince(regionDictId);
-             form.setFieldsValue({
-                 regionDictId: null,
-                 regionDictProvince: regionDictId
-             });
-             getProvinces(regionDictId).then(res => {
-                 if (res.code === 200) {
-                     setCity(createSelectArea(res.data));
-                 }
-             })
-             //市
-         } else if (regionDictId.substring(regionDictId.length - 1) === '0') {
-             let pId = regionDictId.substring(0, regionDictId.length - 4) + '0000';
-             //获取省数据
-             getProvinces(pId).then(res => {
-                 if (res.code === 200) {
-                     setCity(createSelectArea(res.data));
-                     form.setFieldsValue({
-                         regionDictCity: regionDictId,
-                         regionDictId: null,
-                         regionDictProvince: pId
-                     });
-                     setInitialProvince(pId);
-                     //获取区数据
-                     getProvinces(regionDictId).then(res => {
-                         if (res.code === 200) {
-                             setDistrict(createSelectArea(res.data));
-                         }
-                     })
-                 }
-             })
-             //区
-         } else {
-             //回显省市区数据
-             getDictRegion(regionDictId).then(response => {
-                 let region = response.data;
-                 //获取区数据
-                 getProvinces(region.pid).then(res => {
-                     if (res.code === 200) {
-                         setDistrict(createSelectArea(res.data));
-                         let pid = '';
-                         pid = res.data[0].pid;
-                         pid = pid.substring(0, pid.length - 3) + '000';
-                         setInitialProvince(pid);
-                         form.setFieldsValue({
-                             regionDictCity: region.pid,
-                             regionDictProvince: pid
-                         });
-                         //获取市数据
-                         getProvinces(pid).then(res => {
-                             if (res.code === 200) {
-                                 setCity(createSelectArea(res.data));
-                             }
-                         })
-                     }
-                 })
-             })
-         }
-     }
- 
- 
- 
-     //提交表单
-     const onFinish = (values: any) => {
-         const submit = () => {
-             //获取行政区域名称
-             let regionDictName =
-                 getSelectName(values.regionDictProvince, province) + '-' +
-                 getSelectName(values.regionDictCity, city) + '-' +
-                 getSelectName(values.regionDictId, district);
-             regionDictName = regionDictName.replaceAll('全部', '');
-             regionDictName = regionDictName.replace(/(-){2,}/, '');
-             regionDictName = regionDictName.endsWith("-") ? regionDictName.substring(0, regionDictName.length - 1) : regionDictName;
-             //获取省市区的值存入regionDictId
-             if (isEmpty(values.regionDictCity)) {
-                 values.regionDictId = values.regionDictProvince;
-             } else {
-                 values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
-             }
-             values.regionDictName = regionDictName;
-             !isIPassDecode && (values['isIPassDecode'] = '1');
-             updateUtils(values);
-             //tab标段页解除禁用
-             setTabFlag(false);
-             setNoInformationFlag(false);
-             noInformation();
-         }
-         //验证
-         getBudgetAmountById(id).then(res => {
-             if (res.code === 200) {
-                 let data = res.data;
-                 let budgetAmount = form.getFieldValue("budgetAmount");
-                 if (Number(data) === Number(budgetAmount)) {
-                     submit();
-                 } else {
-                     Modal.confirm({
-                         content: `您输入的项目预算金额（${budgetAmount}）与标段预算总金额（${data}）不符！请确认！`,
-                         okText: '确认',
-                         cancelText: '取消',
-                         keyboard: false,
-                         centered: true,
-                         onCancel: () => { },
-                         onOk: () => submit()
-                     });
-                 }
-             }
-         })
-     };
- 
-     const onFinishFailed = (errorInfo: any) => {
- 
-     };
-     /**
-      * 省回调
-      */
-     const handleProvinceChange = (value: any) => {
-         setInitialProvince(value);
-         form.resetFields(["regionDictId"]);
-         form.resetFields(["regionDictCity"]);
-         getProvinces(value).then(res => {
-             if (res.code === 200) {
-                 setCity(createSelectArea(res.data));
-             }
-         })
-     };
-     /**
-      * 市回调
-      * @param value 
-      */
-     const onSecondCityChange = (value: any) => {
-         form.resetFields(["regionDictId"]);
-         if (value) {
-             getProvinces(value).then(res => {
-                 if (res.code === 200) {
-                     setDistrict(createSelectArea(res.data));
-                 }
-             })
-         } else {
-             setDistrict(createSelectArea([]));
-         }
-     };
-     /**
-      * 区回调
-      * @param value 
-      */
-     const handleCityChange = (value: any) => {
- 
-     };
- 
- 
-     /**
-      * 标段信息
-      */
-     const noInformation = () => {
-         setActiveKey('2');
-         setCurrentPage('2');
-     }
- 
-     //项目基本信息 招标
-     const formEditBidding = () => {
-         return (
-             <Form
-                 {...layout}
-                 onFinish={onFinish}
-                 onFinishFailed={onFinishFailed}
-                 form={form}
-                 className={whetherReadonly ? "" : "form-style"}
-             >
-                 <Row>
-                     <Col span={12}>
-                         <Form.Item hidden={true} name="id">
-                             <Input />
-                         </Form.Item>
-                         <Form.Item hidden={true} name="status">
-                             <Input />
-                         </Form.Item>
-                         <Form.Item
-                             label="项目名称"
-                             name="projectName"
-                             rules={[{ required: true }]}
-                         >
-                             <Input disabled={whetherReadonly} readOnly={whetherReadonly} maxLength={150} />
-                         </Form.Item>
-                     </Col>
-                     <Col span={12}>
-                         <Form.Item
-                             label="项目编号"
-                             name="ebpProjectNumber"
-                         >
-                             <Input readOnly disabled />
-                         </Form.Item>
-                     </Col>
-                 </Row>
- 
- 
- 
-                 <Row>
-                     <Col span={12}>
-                         <Form.Item
-                             label="项目流水号"
-                             name="projectBizNum"
-                         >
-                             <Input readOnly disabled />
-                         </Form.Item>
-                     </Col>
-                     <Col span={12}>
-                         <Form.Item hidden={true} name="tendereeId">
-                             <Input />
-                         </Form.Item>
-                         <Form.Item
-                             label="采购人:"
-                             name="tendereeOrgName"
-                         >
-                             <Input readOnly disabled />
-                         </Form.Item>
-                     </Col>
-                 </Row>
- 
-                 <Row>
-                     <Col span={12}>
-                         <Form.Item
-                             label="组织方式(谈判组织形式)"
-                             name="bidOrgDict"
-                         >
-                             <Select placeholder="请选择" allowClear disabled>
-                                 {bidOrgDictSelect}
-                             </Select>
-                         </Form.Item>
-                     </Col>
-                     <Col span={12}>
-                         {formData !== null && formData.bidOrgDict === 'organization_1' ? (
-                             <Form.Item
-                                 label="代理机构项目编号"
-                                 name="agencyCompanyProjectNum"
-                             >
-                                 <Input disabled={whetherReadonly} readOnly={whetherReadonly} maxLength={49} />
-                             </Form.Item>
-                         ) : (<></>)
-                         }
-                     </Col>
-                 </Row>
- 
-                 <Row>
-                     <Col span={12}>
-                         <Form.Item hidden name="province">
-                             <Input />
-                         </Form.Item>
-                         <Form.Item label="所属省分" name="provinceName">
-                             <Input disabled readOnly />
-                         </Form.Item>
-                     </Col>
-                     <Col span={12}>
-                         <Form.Item label="项目所在行政区域" name='xmszqy' rules={[{ required: true, transform: () => { return '1' } }]}>
-                             <Input.Group compact>
-                                 <Form.Item
-                                     noStyle
-                                     name="regionDictProvince"
-                                     rules={[{ required: true, message: '请选择项目所在行政区域' }]}
-                                 >
-                                     <Select disabled={whetherReadonly} style={{ width: '32%' }} value={initialProvince} placeholder="请选择" onChange={handleProvinceChange}>
-                                         {province}
-                                     </Select>
-                                 </Form.Item>
-                                 <Form.Item
-                                     noStyle
-                                     name="regionDictCity"
-                                 >
-                                     <Select disabled={whetherReadonly} style={{ width: '32%', marginLeft: '2%' }} placeholder={initialProvince !== null ? '全部' : '请选择'} onChange={onSecondCityChange}>
-                                         {city}
-                                     </Select>
-                                 </Form.Item>
- 
-                                 <Form.Item
-                                     name="regionDictId"
-                                     noStyle
-                                 >
-                                     <Select disabled={whetherReadonly} style={{ width: '32%', float: 'right' }} placeholder={initialProvince !== null ? '全部' : '请选择'} onChange={handleCityChange}>
-                                         {district}
-                                     </Select>
-                                 </Form.Item>
-                             </Input.Group>
-                         </Form.Item>
-                     </Col>
-                 </Row>
- 
-                 <Row>
-                     <Col span={12}>
-                         <Form.Item
-                             label="资金来源"
-                             name="fundsProviderDict"
-                         >
-                             <Select placeholder="请选择" disabled>
-                                 {fundsProviderDictSelect}
-                             </Select>
-                         </Form.Item>
-                     </Col>
-                     <Col span={12}>
-                         <Form.Item
-                             label="预算金额（不含税）"
-                             name="budgetAmount"
-                             rules={[{ required: true }, {
-                                 type: 'number',
-                                 message: '请输入数字',
-                                 transform: (value) => Number(value)
-                             },
-                             {
-                                 pattern: /^\d+.?\d{0,4}$/,
-                                 message: '小数点后最多只能输入四位'
-                             },
-                             {
-                                 pattern: /^[0-9]/,
-                                 message: '请输入正确的数字金额'
-                             },
-                             ]}
-                         >
-                             <Input maxLength={13} disabled={whetherReadonly} readOnly={whetherReadonly} addonAfter="元" />
-                         </Form.Item>
-                     </Col>
-                 </Row>
- 
-                 <Row>
-                     <Col span={12}>
-                         <Form.Item hidden={true} name="ownerContactId">
-                             <Input />
-                         </Form.Item>
-                         <Form.Item
-                             label="采购经理"
-                             name="ownerContactName"
-                         >
-                             <Input readOnly disabled />
-                         </Form.Item>
-                     </Col>
-                     <Col span={12}>
-                         <Form.Item
-                             label="采购经理联系电话"
-                             name="ownerContactTel"
-                         >
-                             <Input readOnly disabled />
-                         </Form.Item>
-                     </Col>
-                 </Row>
- 
- 
-                 <Row>
-                     <Col span={12}>
-                         <Form.Item
-                             label="采购实施部门"
-                             name="tendereeName"
-                         >
-                             <Input readOnly disabled />
-                         </Form.Item>
-                     </Col>
-                     <Col span={12}>
-                         <Form.Item label="采购方式" name="bidMethodDict">
-                             <Select placeholder="请选择" disabled>
-                                 {bidMethodDictSelect}
-                             </Select>
-                         </Form.Item>
-                     </Col>
-                 </Row>
- 
-                 <Row>
-                     <Col span={12}>
-                         <Form.Item label="标的类型" name="procurementType">
-                             <Select placeholder="请选择" disabled>
-                                 {procurementTypeSelect}
-                             </Select>
-                         </Form.Item>
-                     </Col>
-                     <Col span={12}>
-                         <Form.Item label="业务类型" name="bidMethodSubDict" >
-                             <Select placeholder="请选择" disabled>
-                                 {bidMethodSubDictSelect}
-                             </Select>
-                         </Form.Item>
-                     </Col>
-                 </Row>
- 
-                 <Row>
-                     <Col span={12}>
-                         <Form.Item label="是否使用简化流程" name="isApproval" rules={[{ required: true }]}>
-                             <Radio.Group disabled>
-                                 <Radio value="1">是</Radio>
-                                 <Radio value="0">否</Radio>
-                             </Radio.Group>
-                         </Form.Item>
-                     </Col>
-                 </Row>
+const { Option } = Select;
 
-                 <Row>
-                     <Col span={12}>
-                         <Form.Item wrapperCol={{ offset: 10 }}>
-                             {
-                                 whetherReadonly ? null :
-                                     (<Button hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])} type="primary" htmlType="submit" style={{ margin: '0px 8px 0px 0px' }} >
-                                         保存
-                                     </Button>)
-                             }
- 
-                             <Button disabled={noInformationFlag} onClick={() => noInformation()}>
-                                 采购包信息
-                             </Button>
-                         </Form.Item>
-                     </Col>
-                 </Row>
- 
-             </Form>
-         )
-     }
- 
-     return formEditBidding();
- 
- }
- 
- export default ProjectDocumentation;
\ No newline at end of file
+const layout = {
+    labelCol: { span: 10 },
+    wrapperCol: { span: 13 },
+};
+/**
+ * 加载Option
+ * @param data 数据源
+ */
+function createSelect(data: any) {
+    let value = [];
+    for (const item of data) {
+        value.push(
+            <Option key={item.code} value={item.code}>{item.dicName}</Option>
+        )
+    }
+    return value;
+}
+
+function createSelectArea(data: any) {
+    let value = [];
+    for (let i = 0; i < data.length; i++) {
+        if (i === 0 && data[i].pid !== '0') {
+            value.push(<Option value="">全部</Option>)
+        }
+        value.push(<Option key={data[i].id} value={data[i].id}>{data[i].name}</Option>)
+    }
+    return value;
+}
+
+const ProjectDocumentation: React.FC<ProcurementMethodItem> = (props) => {
+    const { id, whetherReadonly, status, setTabFlag, setActiveKey, setCurrentPage } = props;
+    //获取字典
+    const getDict: any = getDicData();
+    const dictData = JSON.parse(getDict);
+    //表单数据
+    const [formData, setFormData] = useState<any>(null);
+    //省数据
+    const [province, setProvince] = useState<any[]>([]);
+    //区下拉选数据
+    const [district, setDistrict] = useState<any[]>([]);
+    //市下拉选数据
+    const [city, setCity] = useState<any[]>([]);
+
+    const [form] = Form.useForm();
+    //省默认值
+    const [initialProvince, setInitialProvince] = useState<any>(null);
+    //组织方式字典项
+    const bidOrgDictSelect = createSelect(dictData['organization=entrust']);
+    //采购类型字典项
+    const procurementTypeSelect = createSelect(dictData['procurement_type=entrust']);
+    //采购方式
+    const bidMethodDictSelect = createSelect(dictData['procurement_mode=entrust']);
+    //资金来源
+    const fundsProviderDictSelect = createSelect(dictData['funds_provider=record']);
+    //业务类型
+    const bidMethodSubDictSelect = createSelect(dictData['bid_method_sub=record']);
+    //标段信息禁用标识
+    const [noInformationFlag, setNoInformationFlag] = useState<boolean>(String(status) === '0');
+    //是否需要供应商ipass解密显隐
+    const [isIPassDecode, isIPassDecodeSet] = useState<boolean>(false);
+    function onChangeIpass(e: any) {//是否使用ipass制作
+        isIPassDecodeSet(e.target.value === '0');
+    }
+    useEffect(() => {
+        /**
+        * 根据id获取数据
+        */
+        getId(id).then(res => {
+            if (res.code === 200) {
+                let data = res.data;
+                if (data.isIPassFile === '0') {//是否需要供应商ipass解密显隐
+                    isIPassDecodeSet(true)
+                }
+                setFormData(data);
+                // data.isApproval = isEmpty(data.isApproval) ? '0' : data.isApproval;
+                data.isApproval = '1';
+                data.isIPassDecode = isEmpty(data.isIPassDecode) ? '1' : data.isIPassDecode;
+                form.setFieldsValue(data);
+                //查询省份
+                getByProvincesNumber(data.province).then(res => {
+                    if (res.code === 200) {
+                        let data = res.data;
+                        form.setFieldsValue({ provinceName: data?.provincesName });
+                    }
+                })
+                //回显省市区
+                getProvinceCityDistrict(data.regionDictId);
+
+            }
+        })
+        /**
+         * 获取省份
+         */
+        getProvince().then(res => {
+            if (res.code === 200) {
+                setProvince(createSelectArea(res.data));
+            }
+        })
+
+    }, []);
+
+    /**
+   * 获取省市区数据
+   * @param regionDictId 
+   * @returns 
+   */
+    const getProvinceCityDistrict = (regionDictId: string) => {
+        if (isEmpty(regionDictId)) {
+            return;
+        }
+        //省
+        if (regionDictId.substring(regionDictId.length - 4) === '0000') {
+            setInitialProvince(regionDictId);
+            form.setFieldsValue({
+                regionDictId: null,
+                regionDictProvince: regionDictId
+            });
+            getProvinces(regionDictId).then(res => {
+                if (res.code === 200) {
+                    setCity(createSelectArea(res.data));
+                }
+            })
+            //市
+        } else if (regionDictId.substring(regionDictId.length - 1) === '0') {
+            let pId = regionDictId.substring(0, regionDictId.length - 4) + '0000';
+            //获取省数据
+            getProvinces(pId).then(res => {
+                if (res.code === 200) {
+                    setCity(createSelectArea(res.data));
+                    form.setFieldsValue({
+                        regionDictCity: regionDictId,
+                        regionDictId: null,
+                        regionDictProvince: pId
+                    });
+                    setInitialProvince(pId);
+                    //获取区数据
+                    getProvinces(regionDictId).then(res => {
+                        if (res.code === 200) {
+                            setDistrict(createSelectArea(res.data));
+                        }
+                    })
+                }
+            })
+            //区
+        } else {
+            //回显省市区数据
+            getDictRegion(regionDictId).then(response => {
+                let region = response.data;
+                //获取区数据
+                getProvinces(region.pid).then(res => {
+                    if (res.code === 200) {
+                        setDistrict(createSelectArea(res.data));
+                        let pid = '';
+                        pid = res.data[0].pid;
+                        pid = pid.substring(0, pid.length - 3) + '000';
+                        setInitialProvince(pid);
+                        form.setFieldsValue({
+                            regionDictCity: region.pid,
+                            regionDictProvince: pid
+                        });
+                        //获取市数据
+                        getProvinces(pid).then(res => {
+                            if (res.code === 200) {
+                                setCity(createSelectArea(res.data));
+                            }
+                        })
+                    }
+                })
+            })
+        }
+    }
+
+
+
+    //提交表单
+    const onFinish = (values: any) => {
+        const submit = () => {
+            //获取行政区域名称
+            let regionDictName =
+                getSelectName(values.regionDictProvince, province) + '-' +
+                getSelectName(values.regionDictCity, city) + '-' +
+                getSelectName(values.regionDictId, district);
+            regionDictName = regionDictName.replaceAll('全部', '');
+            regionDictName = regionDictName.replace(/(-){2,}/, '');
+            regionDictName = regionDictName.endsWith("-") ? regionDictName.substring(0, regionDictName.length - 1) : regionDictName;
+            //获取省市区的值存入regionDictId
+            if (isEmpty(values.regionDictCity)) {
+                values.regionDictId = values.regionDictProvince;
+            } else {
+                values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
+            }
+            values.regionDictName = regionDictName;
+            values.projectName = trim(values.projectName);
+            !isIPassDecode && (values['isIPassDecode'] = '1');
+            updateUtils(values);
+            //tab标段页解除禁用
+            setTabFlag(false);
+            setNoInformationFlag(false);
+            noInformation();
+        }
+        //验证
+        getBudgetAmountById(id).then(res => {
+            if (res.code === 200) {
+                let data = res.data;
+                let budgetAmount = form.getFieldValue("budgetAmount");
+                if (Number(data) === Number(budgetAmount)) {
+                    submit();
+                } else {
+                    Modal.confirm({
+                        content: `您输入的项目预算金额（${budgetAmount}）与标段预算总金额（${data}）不符！请确认！`,
+                        okText: '确认',
+                        cancelText: '取消',
+                        keyboard: false,
+                        centered: true,
+                        onCancel: () => { },
+                        onOk: () => submit()
+                    });
+                }
+            }
+        })
+    };
+
+    const onFinishFailed = (errorInfo: any) => {
+
+    };
+    /**
+     * 省回调
+     */
+    const handleProvinceChange = (value: any) => {
+        setInitialProvince(value);
+        form.resetFields(["regionDictId"]);
+        form.resetFields(["regionDictCity"]);
+        getProvinces(value).then(res => {
+            if (res.code === 200) {
+                setCity(createSelectArea(res.data));
+            }
+        })
+    };
+    /**
+     * 市回调
+     * @param value 
+     */
+    const onSecondCityChange = (value: any) => {
+        form.resetFields(["regionDictId"]);
+        if (value) {
+            getProvinces(value).then(res => {
+                if (res.code === 200) {
+                    setDistrict(createSelectArea(res.data));
+                }
+            })
+        } else {
+            setDistrict(createSelectArea([]));
+        }
+    };
+    /**
+     * 区回调
+     * @param value 
+     */
+    const handleCityChange = (value: any) => {
+
+    };
+
+
+    /**
+     * 标段信息
+     */
+    const noInformation = () => {
+        setActiveKey('2');
+        setCurrentPage('2');
+    }
+
+    //项目基本信息 招标
+    const formEditBidding = () => {
+        return (
+            <Form
+                {...layout}
+                onFinish={onFinish}
+                onFinishFailed={onFinishFailed}
+                form={form}
+                className={whetherReadonly ? "" : "form-style"}
+            >
+                <Row>
+                    <Col span={12}>
+                        <Form.Item hidden={true} name="id">
+                            <Input />
+                        </Form.Item>
+                        <Form.Item hidden={true} name="status">
+                            <Input />
+                        </Form.Item>
+                        <Form.Item
+                            label="项目名称"
+                            name="projectName"
+                            rules={[{ required: true }]}
+                            normalize={(value) => trim(value)}
+                        >
+                            <Input disabled={whetherReadonly} readOnly={whetherReadonly} maxLength={150} />
+                        </Form.Item>
+                    </Col>
+                    <Col span={12}>
+                        <Form.Item
+                            label="项目编号"
+                            name="ebpProjectNumber"
+                        >
+                            <Input readOnly disabled />
+                        </Form.Item>
+                    </Col>
+                </Row>
+
+
+
+                <Row>
+                    <Col span={12}>
+                        <Form.Item
+                            label="项目流水号"
+                            name="projectBizNum"
+                        >
+                            <Input readOnly disabled />
+                        </Form.Item>
+                    </Col>
+                    <Col span={12}>
+                        <Form.Item hidden={true} name="tendereeId">
+                            <Input />
+                        </Form.Item>
+                        <Form.Item
+                            label="采购人:"
+                            name="tendereeOrgName"
+                        >
+                            <Input readOnly disabled />
+                        </Form.Item>
+                    </Col>
+                </Row>
+
+                <Row>
+                    <Col span={12}>
+                        <Form.Item
+                            label="组织方式(谈判组织形式)"
+                            name="bidOrgDict"
+                        >
+                            <Select placeholder="请选择" allowClear disabled>
+                                {bidOrgDictSelect}
+                            </Select>
+                        </Form.Item>
+                    </Col>
+                    <Col span={12}>
+                        {formData !== null && formData.bidOrgDict === 'organization_1' ? (
+                            <Form.Item
+                                label="代理机构项目编号"
+                                name="agencyCompanyProjectNum"
+                            >
+                                <Input disabled={whetherReadonly} readOnly={whetherReadonly} maxLength={49} />
+                            </Form.Item>
+                        ) : (<></>)
+                        }
+                    </Col>
+                </Row>
+
+                <Row>
+                    <Col span={12}>
+                        <Form.Item hidden name="province">
+                            <Input />
+                        </Form.Item>
+                        <Form.Item label="所属省分" name="provinceName">
+                            <Input disabled readOnly />
+                        </Form.Item>
+                    </Col>
+                    <Col span={12}>
+                        <Form.Item label="项目所在行政区域" name='xmszqy' rules={[{ required: true, transform: () => { return '1' } }]}>
+                            <Input.Group compact>
+                                <Form.Item
+                                    noStyle
+                                    name="regionDictProvince"
+                                    rules={[{ required: true, message: '请选择项目所在行政区域' }]}
+                                >
+                                    <Select disabled={whetherReadonly} style={{ width: '32%' }} value={initialProvince} placeholder="请选择" onChange={handleProvinceChange}>
+                                        {province}
+                                    </Select>
+                                </Form.Item>
+                                <Form.Item
+                                    noStyle
+                                    name="regionDictCity"
+                                >
+                                    <Select disabled={whetherReadonly} style={{ width: '32%', marginLeft: '2%' }} placeholder={initialProvince !== null ? '全部' : '请选择'} onChange={onSecondCityChange}>
+                                        {city}
+                                    </Select>
+                                </Form.Item>
+
+                                <Form.Item
+                                    name="regionDictId"
+                                    noStyle
+                                >
+                                    <Select disabled={whetherReadonly} style={{ width: '32%', float: 'right' }} placeholder={initialProvince !== null ? '全部' : '请选择'} onChange={handleCityChange}>
+                                        {district}
+                                    </Select>
+                                </Form.Item>
+                            </Input.Group>
+                        </Form.Item>
+                    </Col>
+                </Row>
+
+                <Row>
+                    <Col span={12}>
+                        <Form.Item
+                            label="资金来源"
+                            name="fundsProviderDict"
+                        >
+                            <Select placeholder="请选择" disabled>
+                                {fundsProviderDictSelect}
+                            </Select>
+                        </Form.Item>
+                    </Col>
+                    <Col span={12}>
+                        <Form.Item
+                            label="预算金额（不含税）"
+                            name="budgetAmount"
+                            rules={[{ required: true }, {
+                                type: 'number',
+                                message: '请输入数字',
+                                transform: (value) => Number(value)
+                            },
+                            {
+                                pattern: /^\d+.?\d{0,4}$/,
+                                message: '小数点后最多只能输入四位'
+                            },
+                            {
+                                pattern: /^[0-9]/,
+                                message: '请输入正确的数字金额'
+                            },
+                            ]}
+                        >
+                            <Input maxLength={13} disabled={whetherReadonly} readOnly={whetherReadonly} addonAfter="元" />
+                        </Form.Item>
+                    </Col>
+                </Row>
+
+                <Row>
+                    <Col span={12}>
+                        <Form.Item hidden={true} name="ownerContactId">
+                            <Input />
+                        </Form.Item>
+                        <Form.Item
+                            label="采购经理"
+                            name="ownerContactName"
+                        >
+                            <Input readOnly disabled />
+                        </Form.Item>
+                    </Col>
+                    <Col span={12}>
+                        <Form.Item
+                            label="采购经理联系电话"
+                            name="ownerContactTel"
+                        >
+                            <Input readOnly disabled />
+                        </Form.Item>
+                    </Col>
+                </Row>
+
+
+                <Row>
+                    <Col span={12}>
+                        <Form.Item
+                            label="采购实施部门"
+                            name="tendereeName"
+                        >
+                            <Input readOnly disabled />
+                        </Form.Item>
+                    </Col>
+                    <Col span={12}>
+                        <Form.Item label="采购方式" name="bidMethodDict">
+                            <Select placeholder="请选择" disabled>
+                                {bidMethodDictSelect}
+                            </Select>
+                        </Form.Item>
+                    </Col>
+                </Row>
+
+                <Row>
+                    <Col span={12}>
+                        <Form.Item label="标的类型" name="procurementType">
+                            <Select placeholder="请选择" disabled>
+                                {procurementTypeSelect}
+                            </Select>
+                        </Form.Item>
+                    </Col>
+                    <Col span={12}>
+                        <Form.Item label="业务类型" name="bidMethodSubDict" >
+                            <Select placeholder="请选择" disabled>
+                                {bidMethodSubDictSelect}
+                            </Select>
+                        </Form.Item>
+                    </Col>
+                </Row>
+
+                <Row>
+                    <Col span={12}>
+                        <Form.Item label="是否使用简化流程" name="isApproval" rules={[{ required: true }]}>
+                            <Radio.Group disabled>
+                                <Radio value="1">是</Radio>
+                                <Radio value="0">否</Radio>
+                            </Radio.Group>
+                        </Form.Item>
+                    </Col>
+                </Row>
+
+                <Row>
+                    <Col span={12}>
+                        <Form.Item wrapperCol={{ offset: 10 }}>
+                            {
+                                whetherReadonly ? null :
+                                    (<Button hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])} type="primary" htmlType="submit" style={{ margin: '0px 8px 0px 0px' }} >
+                                        保存
+                                    </Button>)
+                            }
+
+                            <Button disabled={noInformationFlag} onClick={() => noInformation()}>
+                                采购包信息
+                            </Button>
+                        </Form.Item>
+                    </Col>
+                </Row>
+
+            </Form>
+        )
+    }
+
+    return formEditBidding();
+
+}
+
+export default ProjectDocumentation;
\ No newline at end of file
diff --git a/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx b/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx
index 14c24fe..e76352a 100644
--- a/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx
+++ b/src/pages/Project/ProjectManage/Supervision/components/FavoritesList.tsx
@@ -1,10 +1,10 @@
 import { getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnum } from '@/utils/CommonUtils';
 import { followUpAProjectManager, getDicData, setPurchaseCanOperate } from '@/utils/session';
 import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
-import { Button, message, Popconfirm, Spin } from 'antd';
+import { Button, message, Popconfirm, Spin, Space, Tag } from 'antd';
 import React, { useRef, useState } from 'react';
 import { useHistory } from 'umi';
-import { getFavoritesList, updateReadStatus } from '../service';
+import { getFavoritesList, removePublic, toPublic, updateReadStatus } from '../service';
 
 interface FavoritesListProps {
     projectName?: string | null,
@@ -35,14 +35,13 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
     const procurementTypeEntrust = 'procurement_type=entrust';
     //采购方式
     const procurementModeEntrust = 'procurement_mode=entrust';
+    //选中
+    const [selectedRows, setSelectedRows] = useState<any[]>([]);
+
+
     const history = useHistory();
     const ref = useRef<ActionType>();
     const columns: ProColumns<any>[] = [
-        {
-            title: '序号',
-            valueType: 'index',
-            width: 50,
-        },
         {
             title: '采购方式',
             dataIndex: 'bidMethodDict',
@@ -50,6 +49,27 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
             valueEnum: proTableValueEnum(dictData[procurementModeEntrust]),
             initialValue: tabs === 'favoritesList' ? isNotEmpty(bidMethodDict) ? bidMethodDict : null : null,
         },
+        {
+            title: '项目阶段',
+            dataIndex: 'businessModule',
+            hideInTable: true,
+            valueType: 'select',
+            valueEnum: proTableValueEnum(dictData['business_module=procurement_mode_1'])
+            // {
+            // 1: <Tag color={getTagColor(1)}>建档</Tag>,
+            // 2: <Tag color={getTagColor(2)}>资审招标</Tag>,
+            // 3: <Tag color={getTagColor(3)}>资审投标</Tag>,
+            // 4: <Tag color={getTagColor(4)}>资审开标</Tag>,
+            // 5: <Tag color={getTagColor(5)}>资审评标</Tag>,
+            // 6: <Tag color={getTagColor(6)}>资审定标</Tag>,
+            // 7: <Tag color={getTagColor(7)}>招标</Tag>,
+            // 8: <Tag color={getTagColor(8)}>投标</Tag>,
+            // 9: <Tag color={getTagColor(9)}>开标</Tag>,
+            // 10: <Tag color={getTagColor(10)}>评标</Tag>,
+            // 11: <Tag color={getTagColor(11)}>定标</Tag>,
+            // 12: <Tag color={getTagColor(12)}>归档</Tag>,
+            // }
+        },
         {
             title: '项目名称',
             dataIndex: 'projectName',
@@ -86,6 +106,20 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
             search: false,
             width: '10%',
         },
+        {
+            title: '公开状态',
+            dataIndex: 'isPublic',
+            width: '10%',
+            valueEnum: {
+                0: {
+                    text: <Tag color='green'>未公开</Tag>
+                },
+                1: {
+                    text: <Tag color='orange'>已公开</Tag>
+                },
+            }
+
+        },
         {
             title: '操作',
             valueType: 'option',
@@ -147,6 +181,31 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
         })
     };
 
+    /**
+       * 取消公开
+       */
+    const removePublicProject = async () => {
+        spinSet(true);
+        await removePublic(selectedRows).then(res => {
+            if (res?.code == 200) {
+                message.success('取消成功');
+                ref.current?.reload();
+            }
+        })
+    };
+
+    /**
+       * 项目公开
+       */
+    const toPublicProject = async () => {
+        spinSet(true);
+        await toPublic(selectedRows).then(res => {
+            if (res?.code == 200) {
+                message.success('设置成功');
+                ref.current?.reload();
+            }
+        })
+    };
     /**
      * 获取返回路径
      * @returns 
@@ -191,13 +250,37 @@ const FavoritesList: React.FC<FavoritesListProps> = (props) => {
                     }
                     pagination={{
                         defaultPageSize: 10,
+                        pageSizeOptions: [10, 20, 30, 50],
                         defaultCurrent: tabs === 'favoritesList' ? isNotEmpty(current) ? Number(current) : 1 : 1,
                         size: "small",
-                        showSizeChanger: false,
+                        showSizeChanger: true,
                         onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
                         onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
                     }}
                     onReset={() => { pageDataSet({ pageNo: 1, pageSize: 10 }) }}
+                    rowKey={"id"}
+                    rowSelection={{
+                        selectedRowKeys: selectedRows,
+                        onChange: (_, selectedRows) => setSelectedRows(_),
+                    }}
+                    tableAlertRender={({ selectedRowKeys, selectedRows, onCleanSelected }) => (
+                        <Space size={24}>
+                            <span>
+                                已选 {selectedRowKeys.length} 项
+                                <a style={{ marginLeft: 8 }} onClick={onCleanSelected}>
+                                    取消选择
+                                </a>
+                            </span>
+                        </Space>
+                    )}
+                    tableAlertOptionRender={({ selectedRowKeys, selectedRows, onCleanSelected }) => {
+                        return (
+                            <Space size={16}>
+                                <a onClick={() => { toPublicProject(); onCleanSelected() }}>公开项目</a>
+                                <a onClick={() => { removePublicProject(); onCleanSelected() }}>取消公开</a>
+                            </Space>
+                        );
+                    }}
                 />
             </div>
         </Spin>
diff --git a/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx b/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx
index e556efa..d46fa28 100644
--- a/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx
+++ b/src/pages/Project/ProjectManage/Supervision/components/ProjectManage.tsx
@@ -1,10 +1,10 @@
 import { getUrlRelativePath, isEmpty, isNotEmpty, proTableValueEnum } from '@/utils/CommonUtils';
 import { followUpAProjectManager, getDicData, setPurchaseCanOperate } from '@/utils/session';
-import ProTable, { ProColumns } from '@ant-design/pro-table';
-import { Button, Spin } from 'antd';
-import React, { useState } from 'react';
+import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
+import { Button, message, Space, Spin, Tag } from 'antd';
+import React, { useRef, useState } from 'react';
 import { useHistory } from 'umi';
-import { getPage } from '../service';
+import { getPage, removePublic, toPublic } from '../service';
 
 interface ProjectManageProps {
     projectName?: string | null,
@@ -35,14 +35,13 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
     const procurementTypeEntrust = 'procurement_type=entrust';
     //采购方式
     const procurementModeEntrust = 'procurement_mode=entrust';
-    const history = useHistory();
+    //选中
+    const [selectedRows, setSelectedRows] = useState<any[]>([]);
 
+    const history = useHistory();
+    const ref = useRef<ActionType>();
     const columns: ProColumns<any>[] = [
-        {
-            title: '序号',
-            valueType: 'index',
-            width: 50,
-        },
+
         {
             title: '采购方式',
             dataIndex: 'bidMethodDict',
@@ -50,6 +49,13 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
             valueEnum: proTableValueEnum(dictData[procurementModeEntrust]),
             initialValue: tabs === 'projectList' ? isNotEmpty(bidMethodDict) ? bidMethodDict : null : null,
         },
+        {
+            title: '项目阶段',
+            dataIndex: 'businessModule',
+            hideInTable: true,
+            valueType: 'select',
+            valueEnum: proTableValueEnum(dictData['business_module=procurement_mode_1'])
+        },
         {
             title: '项目名称',
             dataIndex: 'projectName',
@@ -86,6 +92,20 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
             search: false,
             width: '10%',
         },
+        {
+            title: '公开状态',
+            dataIndex: 'isPublic',
+            width: '10%',
+            valueEnum: {
+                0: {
+                    text: <Tag color='green'>未公开</Tag>
+                },
+                1: {
+                    text: <Tag color='orange'>已公开</Tag>
+                },
+            }
+
+        },
         {
             title: '操作',
             valueType: 'option',
@@ -127,7 +147,31 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
         let params = `${'?current=' + projectURLParams.current}${isEmpty(projectURLParams.projectName) ? '' : '&projectName=' + projectURLParams.projectName}${isEmpty(projectURLParams.bidMethodDict) ? '' : '&bidMethodDict=' + projectURLParams.bidMethodDict}&tabs=projectList`;
         return getUrlRelativePath() + params;
     }
+    /**
+           * 取消公开
+           */
+    const removePublicProject = async () => {
+        spinSet(true);
+        await removePublic(selectedRows).then(res => {
+            if (res?.code == 200) {
+                message.success('取消成功');
+                ref.current?.reload();
+            }
+        })
+    };
 
+    /**
+       * 项目公开
+       */
+    const toPublicProject = async () => {
+        spinSet(true);
+        await toPublic(selectedRows).then(res => {
+            if (res?.code == 200) {
+                message.success('设置成功');
+                ref.current?.reload();
+            }
+        })
+    };
     return (
         <Spin spinning={spin}>
             <div className="zjl-entrust confirm">
@@ -136,6 +180,7 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
                     options={false}
                     bordered={false}
                     size='small'
+                    actionRef={ref}
                     search={{ labelWidth: 'auto', span: 6 }}
                     loading={false}
                     request={async (params) => {
@@ -161,13 +206,37 @@ const ProjectManage: React.FC<ProjectManageProps> = (props) => {
                     }
                     pagination={{
                         defaultPageSize: 10,
+                        pageSizeOptions: [10, 20, 30, 50],
                         defaultCurrent: tabs === 'projectList' ? isNotEmpty(current) ? Number(current) : 1 : 1,
                         size: "small",
-                        showSizeChanger: false,
+                        showSizeChanger: true,
                         onChange: (page, pageSize) => pageDataSet({ pageNo: page, pageSize: pageSize }),
                         onShowSizeChange: (current, size) => pageDataSet({ pageNo: current, pageSize: size }),
                     }}
                     onReset={() => { pageDataSet({ pageNo: 1, pageSize: 10 }) }}
+                    rowKey={"id"}
+                    rowSelection={{
+                        selectedRowKeys: selectedRows,
+                        onChange: (_, selectedRows) => setSelectedRows(_),
+                    }}
+                    tableAlertRender={({ selectedRowKeys, selectedRows, onCleanSelected }) => (
+                        <Space size={24}>
+                            <span>
+                                已选 {selectedRowKeys.length} 项
+                                <a style={{ marginLeft: 8 }} onClick={onCleanSelected}>
+                                    取消选择
+                                </a>
+                            </span>
+                        </Space>
+                    )}
+                    tableAlertOptionRender={({ selectedRowKeys, selectedRows, onCleanSelected }) => {
+                        return (
+                            <Space size={16}>
+                                <a onClick={() => { toPublicProject(); onCleanSelected() }}>公开项目</a>
+                                <a onClick={() => { removePublicProject(); onCleanSelected() }}>取消公开</a>
+                            </Space>
+                        );
+                    }}
                 />
             </div>
         </Spin>
diff --git a/src/pages/Project/ProjectManage/Supervision/service.ts b/src/pages/Project/ProjectManage/Supervision/service.ts
index 2b3a22f..d2c6462 100644
--- a/src/pages/Project/ProjectManage/Supervision/service.ts
+++ b/src/pages/Project/ProjectManage/Supervision/service.ts
@@ -29,4 +29,27 @@ export async function updateReadStatus(params: any) {
     method: 'POST',
     data: { ...params },
   });
+}
+/**
+ * 取消公开项目
+ * @param params 
+ * @returns 
+ */
+export async function removePublic(params: any) {
+  return request('/api/biz-service-ebtp-project/v1/projectRecord/examination/private', {
+    method: 'POST',
+    data: params,
+  });
+}
+
+/**
+ * 公开项目
+ * @param params 
+ * @returns 
+ */
+export async function toPublic(params: any) {
+  return request('/api/biz-service-ebtp-project/v1/projectRecord/examination/public', {
+    method: 'POST',
+    data: params,
+  });
 }
\ No newline at end of file
diff --git a/src/pages/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx b/src/pages/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx
index 4ad878e..ccca394 100644
--- a/src/pages/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx
+++ b/src/pages/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx
@@ -477,9 +477,10 @@ const ClarifyTheList: React.FC<{}> = () => {
     }
     function afterSave() {
         let packageIds = isNotEmpty(form.getFieldValue('packageId')) ? String(form.getFieldValue('packageId')).split(',') : [];
+        let params = { roomType };
         if (isNotEmpty(packageIds) && packageIds.length !== 0) {
             //获取公告信息 判断文件的获取和截止时间与应答截止时间的关系
-            getClarifyAnnoList(packageIds).then(res => {
+            getClarifyAnnoList(packageIds, params).then(res => {
                 if (res.code === 200) {
                     //招标文件获取开始时间
                     let docStartTimes = res.data.map((item: any) => item.docStartTime);
diff --git a/src/pages/Tender/ProjectManager/ClarifyTheList/service.ts b/src/pages/Tender/ProjectManager/ClarifyTheList/service.ts
index 16e7696..48c94f7 100644
--- a/src/pages/Tender/ProjectManager/ClarifyTheList/service.ts
+++ b/src/pages/Tender/ProjectManager/ClarifyTheList/service.ts
@@ -98,7 +98,7 @@ export async function clarifyReply(id: any) {
  * 查询标段
  * @param projectId 
  */
-export function getSections(projectId: any, roomType:any) {
+export function getSections(projectId: any, roomType: any) {
     return request('/api/biz-service-ebtp-tender/v1/clarifydissent/packages/' + projectId + '?roomType=' + roomType, {
         method: 'put'
     });
@@ -107,9 +107,10 @@ export function getSections(projectId: any, roomType:any) {
  * 根据标段id查询公告
  * @param data 
  */
-export function getClarifyAnnoList(data: any) {
+export function getClarifyAnnoList(data: any, params: any) {
     return request('/api/biz-service-ebtp-bid/v1/anno/clarifyAnnoList', {
         method: 'post',
-        data: data
+        data: data,
+        params: params,
     });
 }
\ No newline at end of file
diff --git a/src/pages/Tender/UploadResponse/components/SupplierCommitment.tsx b/src/pages/Tender/UploadResponse/components/SupplierCommitment.tsx
new file mode 100644
index 0000000..7b78849
--- /dev/null
+++ b/src/pages/Tender/UploadResponse/components/SupplierCommitment.tsx
@@ -0,0 +1,98 @@
+import React, { useEffect, useState } from 'react';
+import { Modal, Typography } from 'antd';
+import { createMACInfo, getMACInfo } from '../service';
+
+interface SupplierCommitmentProps {
+    projectId: string;
+    callback: () => void;
+}
+/**
+ * 上传应答文件-供应商承诺书同意
+ * @param props 
+ * @returns 
+ */
+const SupplierCommitment: React.FC<SupplierCommitmentProps> = (props) => {
+    const { projectId, callback } = props;
+    const { warning } = Modal;
+    const { Text } = Typography;
+    const [time, setTime] = useState<number>(10);
+    const [btnLoading, setBtnLoading] = useState<boolean>(false);
+    const [visible, setVisible] = useState<boolean>(false);
+    useEffect(() => {
+        //查询供应商承诺书状态
+        getMACInfo({ tpId: projectId }).then(res => {
+            if (res?.code == 200) {
+                const data = res?.data;
+                if (data) {//已同意
+                    callback();
+                } else {
+                    setVisible(true);//未同意
+                }
+            }
+        })
+    }, []);
+
+    useEffect(() => {
+        let timeInteval: any
+        if (visible) {
+            timeInteval = setInterval(() => { // 倒计时
+                setTime(n => {
+                    if (n == 1) {
+                        clearInterval(timeInteval)
+                    }
+                    return n - 1;
+                })
+            }, 1000);
+        } else {
+            clearInterval(timeInteval);
+        }
+        return () => {
+            clearInterval(timeInteval);
+        }
+    }, [visible]);
+
+    const onCancel = () => {
+        warning({
+            title: '请先同意承诺书内容',
+            content: null,
+            centered: true,
+        });
+    }
+
+    const onOk = () => {
+        setBtnLoading(true);
+        //同意承诺书
+        createMACInfo({ projectId: projectId }).then(res => {
+            if (res?.code == 200) {
+                setVisible(false);
+                callback();
+            }
+        }).finally(() => {
+            setBtnLoading(false);
+        })
+    }
+
+    return (
+        <Modal
+            destroyOnClose
+            visible={visible}
+            maskClosable={false}
+            keyboard={false}
+            closable={false}
+            centered
+            width={600}
+            onOk={onOk}
+            okText={time !== 0 ? "同意(" + time + "s)" : "同意"}
+            okButtonProps={{
+                disabled: time !== 0,
+                loading: btnLoading,
+            }}
+            bodyStyle={{ padding: 40 }}
+            onCancel={onCancel}
+        >
+            <Text strong style={{ fontSize: 16 }}>已阅读并承诺在采购招标过程中，不存在围标、串标行为。同意中国联通公司对参与供应商进行IP、MAC地址校验，如不同供应商的MAC地址相同，评标/评审委员会（或采购人）将按围标、串标处理。</Text>
+        </Modal>
+    );
+};
+
+export default SupplierCommitment;
diff --git a/src/pages/Tender/UploadResponse/index.tsx b/src/pages/Tender/UploadResponse/index.tsx
index b843fdb..703e501 100644
--- a/src/pages/Tender/UploadResponse/index.tsx
+++ b/src/pages/Tender/UploadResponse/index.tsx
@@ -11,6 +11,7 @@ import { btnAuthority } from '@/utils/authority';
 import { verificationSupplier } from '@/utils/IpassVerification'
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { getStatusByProId } from '@/services/downLoad';
+import SupplierCommitment from './components/SupplierCommitment';
 
 const { confirm } = Modal;
 
@@ -51,6 +52,7 @@ const Index: React.FC<{}> = () => {
   const [isModalVisible, setIsModalVisible] = useState<boolean>(false);
   const [timeDateList, setTimeDateList] = useState([]);
   const [currentDateList, setCurrentDateList] = useState<any>();
+  const [isInit, setIsInit] = useState<boolean>(false);//是否初始化列表-供应商承诺书用
 
   const columns: any[] = [  // 列表数据
     {
@@ -289,7 +291,7 @@ const Index: React.FC<{}> = () => {
     idArr.push(id)
     getCodeInfo(idArr).then((res) => {
       if (res.code == 200) {
-        if(res?.data[0]){
+        if (res?.data[0]) {
           setIpassCode(res.data[0].organizationCode)
         }
       }
@@ -404,7 +406,7 @@ const Index: React.FC<{}> = () => {
   const onUploadError = (resumable: any) => {
     if (resumable == '超过截止时间') {
       message.error('已超过截止时间')
-    } else if(resumable == '撤销后再上传'){
+    } else if (resumable == '撤销后再上传') {
       message.error('您已上传应答文件，需撤销后再上传！')
       setUploadVisible(false)
       getList()
@@ -427,7 +429,7 @@ const Index: React.FC<{}> = () => {
   const getCurrent = () => {
     getCurrentTime().then((res) => {
       if (res.code == 200) {
-        let currentTiem = new Date(res.data.replace(/-/g,'/')).getTime()
+        let currentTiem = new Date(res.data.replace(/-/g, '/')).getTime()
         setTimestamp(currentTiem)
       }
     })
@@ -447,12 +449,12 @@ const Index: React.FC<{}> = () => {
     })
   }
 
-  const handleTimeInterval= ()=>{ // 倒计时
-    if(dateList.length>0 && timestamp>0){
-      setTimestamp(timestamp+1000);
+  const handleTimeInterval = () => { // 倒计时
+    if (dateList.length > 0 && timestamp > 0) {
+      setTimestamp(timestamp + 1000);
       let newTimeDateList: any = [];
-      dateList.map((item:any,index:any)=>{
-        if(item?.endDate && item?.endDate!=""&&item?.endDate!=null){
+      dateList.map((item: any, index: any) => {
+        if (item?.endDate && item?.endDate != "" && item?.endDate != null) {
           newTimeDateList.push(showTimeDetail(item?.endDate));
         }
       })
@@ -466,22 +468,24 @@ const Index: React.FC<{}> = () => {
   });
 
   useEffect(() => {
-    getList();
-    getCurrent(); 
-    timeInteval = setInterval(()=>{ // 倒计时
-      savedCallback.current();
-    },1000);
+    if (isInit) {
+      getList();
+      getCurrent();
+      timeInteval = setInterval(() => { // 倒计时
+        savedCallback.current();
+      }, 1000);
+    }
 
-    return ()=>{
+    return () => {
       clearInterval(timeInteval);
-      if(task){
+      if (task) {
         clearInterval(task)
       }
     }
-  }, []);
+  }, [isInit]);
 
   const showTimeDetail = (endDate: any) => {
-    let endtime = new Date(endDate.replace(/-/g,'/'));  //定义结束时间
+    let endtime = new Date(endDate.replace(/-/g, '/'));  //定义结束时间
     let lefttime = endtime.getTime() - timestamp;  //距离结束时间的毫秒数
     let returnResult = "";
     if (lefttime > 0) {
@@ -522,9 +526,9 @@ const Index: React.FC<{}> = () => {
                   <Panel header={item.sectionName} key={index}>
                     <div className="table-mess">
                       <span className="f12 mess">应答截止时间：{item.endDate}</span>
-                      <span className="f12 mess">国家授时中心标准时间：{ currentDateList }</span>
+                      <span className="f12 mess">国家授时中心标准时间：{currentDateList}</span>
                       <span className="tr f12 mess">
-                      <span className="red">{timeDateList.length>0 ? timeDateList[index]:null}</span>
+                        <span className="red">{timeDateList.length > 0 ? timeDateList[index] : null}</span>
                         {
                           item.state == '0' && timestamp > 0 && new Date(item.startDate.replaceAll("-", "/")).getTime() < timestamp && new Date(item.endDate.replaceAll("-", "/")).getTime() > timestamp ?
                             <Button
@@ -564,32 +568,32 @@ const Index: React.FC<{}> = () => {
         }
       </div>
       {
-        uploadVisible?
-        <Modal // 批量上传
-          title="文件上传"
-          visible={uploadVisible}
-          onCancel={closeModal}
-          width={800}
-          centered
-          style={{ maxHeight: modalHeight }}
-          bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
-          footer={[<Button onClick={() => closeModal()}>关闭</Button>]}
-        >
-          <ReactResumableJs
-            query={{ 'relativePath': filePath, 'Tfile': Tfile, 'Tuid': uuid }}
-            maxFiles={1}
-            fileAccept={fileT}
-            endTime={endTime}
-            currentDate={currentDate}
-            onUploadSuccess={onUploadSuccess.bind(this)}
-            onUploadError={onUploadError.bind(this)}
-            onFileAdded={(file: any, resumable: any) => { onFileAdded(file, resumable) }}
-            onPauseUpload={(file: any, resumable: any) => { onPauseUpload(file, resumable) }}
-            onResumeUpload={(file: any, resumable: any) => { onResumeUpload(file, resumable) }}
-            onCancelUpload={(file: any, resumable: any) => { onCancelUpload(file, resumable) }}
-            service="/api/core-service-ebtp-updownload/v1/hulk/upload"
-          />
-        </Modal>:null
+        uploadVisible ?
+          <Modal // 批量上传
+            title="文件上传"
+            visible={uploadVisible}
+            onCancel={closeModal}
+            width={800}
+            centered
+            style={{ maxHeight: modalHeight }}
+            bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
+            footer={[<Button onClick={() => closeModal()}>关闭</Button>]}
+          >
+            <ReactResumableJs
+              query={{ 'relativePath': filePath, 'Tfile': Tfile, 'Tuid': uuid }}
+              maxFiles={1}
+              fileAccept={fileT}
+              endTime={endTime}
+              currentDate={currentDate}
+              onUploadSuccess={onUploadSuccess.bind(this)}
+              onUploadError={onUploadError.bind(this)}
+              onFileAdded={(file: any, resumable: any) => { onFileAdded(file, resumable) }}
+              onPauseUpload={(file: any, resumable: any) => { onPauseUpload(file, resumable) }}
+              onResumeUpload={(file: any, resumable: any) => { onResumeUpload(file, resumable) }}
+              onCancelUpload={(file: any, resumable: any) => { onCancelUpload(file, resumable) }}
+              service="/api/core-service-ebtp-updownload/v1/hulk/upload"
+            />
+          </Modal> : null
       }
       <Modal // 撤回
         width={300}
@@ -626,6 +630,7 @@ const Index: React.FC<{}> = () => {
       >
         <p>友情提示：您已被列入联通供应商黑名单，黑名单期间您可能被拒绝中标，请您谨慎操作。</p>
       </Modal>
+      <SupplierCommitment projectId={projectId} callback={() => { setIsInit(true) }} />
     </>
   )
 }
diff --git a/src/pages/Tender/UploadResponse/service.ts b/src/pages/Tender/UploadResponse/service.ts
index 995afab..0cbf4e5 100644
--- a/src/pages/Tender/UploadResponse/service.ts
+++ b/src/pages/Tender/UploadResponse/service.ts
@@ -45,22 +45,35 @@ export async function saveUploadLog(data: any) { // 开始上传给后台做记
  * @param data 
  * @returns 
  */
- export async function getSupplierBlack(data: any) {
+export async function getSupplierBlack(data: any) {
   return request('/api/biz-service-ebtp-bid/v1/supplier/info/getSupplierBlack', {
-      method: 'post',
-      data: data
+    method: 'post',
+    data: data
   });
 }
 
-export async function getCurrentTime() { // 获取当前时间戳
-  return request('/api/biz-service-ebtp-extend/v1/timeService/getServiceTime', {
-    method: 'get',
-  });
+export async function getCurrentTime() { // 获取当前时间戳
+  return request('/api/biz-service-ebtp-extend/v1/timeService/getServiceTime', {
+    method: 'get',
+  });
 }
-  
-export async function getTendererFileStatus(data: any) { // 查看是否已经上传投标文件
-  return request('/api/biz-service-ebtp-resps/v1/tfile/getTendererFileStatus', {
-    method: 'post',
-    data: data
-  });
+
+export async function getTendererFileStatus(data: any) { // 查看是否已经上传投标文件
+  return request('/api/biz-service-ebtp-resps/v1/tfile/getTendererFileStatus', {
+    method: 'post',
+    data: data
+  });
+}
+
+export async function getMACInfo(params: any) { //查询供应商承诺书同意状态
+  return request('/api/biz-service-ebtp-tender/v1/confirmMacInfo/queryCheck', {
+    method: 'post',
+    params: params,
+  });
+}
+export async function createMACInfo(data: any) { //供应商承诺书同意
+  return request('/api/biz-service-ebtp-tender/v1/confirmMacInfo/create', {
+    method: 'post',
+    data: data
+  });
 }
\ No newline at end of file
diff --git a/src/pages/Tender/supplier/SupplierQuestionsOrObjections/components/SupplierQuestionsOrObjections.tsx b/src/pages/Tender/supplier/SupplierQuestionsOrObjections/components/SupplierQuestionsOrObjections.tsx
index 31efac2..cee82de 100644
--- a/src/pages/Tender/supplier/SupplierQuestionsOrObjections/components/SupplierQuestionsOrObjections.tsx
+++ b/src/pages/Tender/supplier/SupplierQuestionsOrObjections/components/SupplierQuestionsOrObjections.tsx
@@ -209,6 +209,7 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => {
         setBid(data.dissentDatasetId);
         setResultsDatasetId(data.resultsDatasetId);
         setWhetherToDisplayTheReply(String(data.dissentStatus) === '3');
+        data.packageId = data.packageId?.split(',');
         form.setFieldsValue(data);
         setVisible(true);
     }
@@ -220,6 +221,7 @@ const SupplierQuestionsOrObjections: React.FC<{}> = () => {
     const edit = (data: any) => {
         setVisible(true);
         setBid(data.dissentDatasetId);
+        data.packageId = data.packageId?.split(',');
         form.setFieldsValue(data);
     }
     /**
diff --git a/src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx b/src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx
index 9a2bdb3..5c27e42 100644
--- a/src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx
+++ b/src/pages/ZXunJia/EvaluationRoom/Sing/index.tsx
@@ -2,8 +2,9 @@ import React, { useRef, useState } from 'react';
 import '@/assets/xsy_style.less';
 import { Button, Card, message, Spin } from 'antd';
 import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
-import { getPage, getProjectById } from './service';
+import { getOfferUrl, getPage, getProjectById } from './service';
 import { getURLInformation } from '@/utils/CommonUtils';
+import { getSessionRoleData } from '@/utils/session';
 
 const Sing: React.FC<{}> = () => {
   //表格控制
@@ -12,17 +13,25 @@ const Sing: React.FC<{}> = () => {
   const reviewTurnId = getURLInformation('turnId') == undefined ? '' : getURLInformation('turnId');
   //loading
   const [loading, setLoading] = useState<boolean>(false)
-
+  //当前登录人角色
+  const roleCode = getSessionRoleData()?.roleCode;
   const toViewOffer = async (record: any) => {
-    if(record.decryptStatus == "1") {
-      message.info("应答文件未解密，无法查看报价详情，请先到【应答文件查看】中进行解密")
+    if (record.decryptStatus == "1") {
+      message.info("应答文件未解密，无法查看报价详情，请先到【应答文件查看】中进行解密");
     } else {
       setLoading(true)
       await getProjectById(record?.projectId).then((res) => {
         if (res?.code == 200 && res?.success == true) {
           const data = res?.data;
-          const url = `${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${data?.ebpProjectNumber}&offer_no=${record?.offerOrderNo}`
-          window.open(url);
+          // const url = `${REACT_APP_XUNJIA_REDIRECT}/inquiryoffer/ztbViewOffer.do?inquiry_no=${data?.ebpProjectNumber}&offer_no=${record?.offerOrderNo}`
+          // window.open(url);
+          const page = `quote-ztbIndex&inqueryNo=${data?.ebpProjectNumber}&offNo=${record?.offerOrderNo}`;
+          const userId = roleCode == "ebtp-supplier" ? record.bidUserId : REACT_APP_XUNJIA_UID;
+          getOfferUrl({ userId, page }).then(response => {
+            if (response?.code == 200) {
+              window.open(response?.data);
+            }
+          })
         }
       }).finally(() => {
         setLoading(false)
@@ -68,25 +77,25 @@ const Sing: React.FC<{}> = () => {
   return (
     <Card bordered={false} bodyStyle={{ padding: '24px 64px 24px 0px' }}>
       <Spin spinning={loading} delay={300}>
-      <ProTable
-        columns={columns}
-        actionRef={actionRef}
-        search={false}
-        options={false}
-        size="small"
-        pagination={false}
-        request={async () =>
-          await getPage(reviewTurnId).then((res) => {
-            // 表单搜索项会从 params 传入，传递给后端接口。
-            return {
-              data: res?.data,
-              success: res?.success,
-            };
-          })
-        }
-        rowKey="id"
-        dateFormatter="string"
-      />
+        <ProTable
+          columns={columns}
+          actionRef={actionRef}
+          search={false}
+          options={false}
+          size="small"
+          pagination={false}
+          request={async () =>
+            await getPage(reviewTurnId).then((res) => {
+              // 表单搜索项会从 params 传入，传递给后端接口。
+              return {
+                data: res?.data,
+                success: res?.success,
+              };
+            })
+          }
+          rowKey="id"
+          dateFormatter="string"
+        />
       </Spin>
     </Card>
   );
diff --git a/src/pages/ZXunJia/EvaluationRoom/Sing/service.ts b/src/pages/ZXunJia/EvaluationRoom/Sing/service.ts
index beab5ee..c71c607 100644
--- a/src/pages/ZXunJia/EvaluationRoom/Sing/service.ts
+++ b/src/pages/ZXunJia/EvaluationRoom/Sing/service.ts
@@ -4,7 +4,7 @@ import request from '@/utils/request';
  * @param params 
  */
 export async function getPage(params?: any) {
-  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`,{
+  return request(`/api/biz-service-ebtp-tender/v1/supplier_register/get_register/${params}`, {
     method: 'GET',
   });
 }
@@ -13,6 +13,16 @@ export async function getPage(params?: any) {
  * 根据id查询项目信息
  * @param id 
  */
- export function getProjectById(id: any) {
-    return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
-  }
\ No newline at end of file
+export function getProjectById(id: any) {
+  return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
+}
+/**
+* 加密后的查看报价详情跳转地址
+* @param params 
+*/
+export function getOfferUrl(params: any) {
+  return request('/api/biz-service-ebtp-extend/v1/singlePoint/getSsoUrlByPage', {
+    method: 'GET',
+    params: params,
+  });
+}
\ No newline at end of file
diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index 07d3987..093d20f 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,13 @@ 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 { isEmpty } from "@/utils/CommonUtils"
+import { checkObjectId } from "@/utils/DownloadUtils"
 
 /*
 * 资审公告开始
@@ -124,55 +126,61 @@ 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={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</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={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</Button>
           </>
         );
 
@@ -201,12 +209,12 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
 
     },
   ];
-  const ChangeNoticeListcolumns:any = [
+  const ChangeNoticeListcolumns: any = [
     {
       title: '公告标题',
       dataIndex: 'annoTitle',
       align: 'left',
-      valueType:"text"
+      valueType: "text"
     },
     {
       title: '起草时间',
@@ -222,13 +230,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,53 +246,59 @@ 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={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</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={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</Button>
           </>
         );
 
@@ -328,7 +342,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 +360,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 +379,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 +493,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         }
       }
       setRefresh(Math.random() + 1);
-    }).finally(()=>setPageloading(false));
+    }).finally(() => setPageloading(false));
   };
   /**
    * 再次发布
@@ -526,9 +540,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 +563,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 +578,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 +619,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/ZYuShen/Bid/BiddingAnnouncement/components/BiddingDocument.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/components/BiddingDocument.tsx
index 7de69a9..b18c045 100644
--- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/components/BiddingDocument.tsx
+++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/components/BiddingDocument.tsx
@@ -1,14 +1,15 @@
-import {BarsOutlined, UploadOutlined} from "@ant-design/icons"
-import {Button, Card, Checkbox, Col, Collapse, Form, Input, message, Modal, Row, Spin, Upload} from "antd"
-import React, {useEffect, useRef, useState} from "react"
+import { BarsOutlined, UploadOutlined } from "@ant-design/icons"
+import { Button, Card, Checkbox, Col, Collapse, Form, Input, message, Modal, Row, Spin, Upload } from "antd"
+import React, { useEffect, useRef, useState } from "react"
 
-import {GetfileUsablePackage, GetfileMsg, creatfile, creatNotice} from "../service";
+import { GetfileUsablePackage, GetfileMsg, creatfile, creatNotice } from "../service";
 import Weboffice from "@/pages/webOffice/weboffice";
 
-import {deleteFileObjId, getFileBidList, SnowflakeID} from "@/services/untilService";
+import { deleteFileObjId, getFileBidList, SnowflakeID } from "@/services/untilService";
 import ExtendUpload from "@/utils/ExtendUpload";
-import {UploadProps} from "antd/lib/upload/interface";
+import { UploadProps } from "antd/lib/upload/interface";
 import WebOffice0609, { WebOfficeRefProps } from "@/pages/webOffice/weboffice0609";
+import { trim } from "@/utils/CommonUtils";
 
 interface BiddingDocumentProps {
   modalVisible: boolean;
@@ -21,12 +22,12 @@ interface BiddingDocumentProps {
 }
 
 const layout = {
-  labelCol: {span: 7},
-  wrapperCol: {span: 10},
+  labelCol: { span: 7 },
+  wrapperCol: { span: 10 },
 };
 const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
-  const {Panel} = Collapse;
-  const {titleName, modalVisible, onCancel, type, tpId, pkId, SX} = props;
+  const { Panel } = Collapse;
+  const { titleName, modalVisible, onCancel, type, tpId, pkId, SX } = props;
   const [TpPackageId, setTpPackageId] = useState<any[]>([]); //标包信息
   const [spinning, setSping] = useState<boolean>();//加载遮罩
   const [editInformation, setEditInformation] = useState<boolean>(false);//是否可编
@@ -38,7 +39,7 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
   const [UploadList, setUploadList] = useState<any>();		//存upload列表
   const [UploadID, setUploadID] = useState<any>("empty"); //upload 业务id
   const UploadProps: UploadProps = {
-    name:"file",
+    name: "file",
     disabled: editInformation
   }
 
@@ -51,7 +52,7 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
 
 
   useEffect(() => {
-      Int();
+    Int();
     form.resetFields();//清除form中数据
   }, [type, pkId]);
   const Int = () => {
@@ -67,7 +68,7 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
             onCancel();
           }
           for (const item of res.data) {
-            thisData.push({"label": item.bsName, "value": item.bsId})
+            thisData.push({ "label": item.bsName, "value": item.bsId })
           }
           setSping(false);
           setEditInformation(false);//可编辑
@@ -83,11 +84,11 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
       });
 
     } else if (type == "edit") {//=========================================================修改
-      GetfileUsablePackage(tpId,pkId).then(res => {
+      GetfileUsablePackage(tpId, pkId).then(res => {
         if (res.code == 200) {
           let thisData2 = [];
           for (const item of res.data) {
-            thisData2.push({"label": item.bsName, "value": item.bsId})
+            thisData2.push({ "label": item.bsName, "value": item.bsId })
           }
           setTpPackageId(thisData2);
         }
@@ -100,10 +101,10 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
             }
 
             form.setFieldsValue({
-                "documentName": data.documentName,
-                "documentSetId": data.documentSetId,
-                "sectionIds": defPak,
-              },
+              "documentName": data.documentName,
+              "documentSetId": data.documentSetId,
+              "sectionIds": defPak,
+            },
             )
             setUploadID(data.documentSetId);
             setSping(false);
@@ -125,15 +126,15 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
           let thisData1 = [];
           let defPak = [];
           for (const item of data.sections) {
-            thisData1.push({"label": item.bsName, "value": item.bsId})
+            thisData1.push({ "label": item.bsName, "value": item.bsId })
             defPak.push(item.bsId);
           }
           setTpPackageId(thisData1);
           form.setFieldsValue({
-              "documentName": data.documentName,
-              "documentSetId": data.documentSetId,
-              "sectionIds": defPak,
-            },
+            "documentName": data.documentName,
+            "documentSetId": data.documentSetId,
+            "sectionIds": defPak,
+          },
           )
 
 
@@ -167,12 +168,12 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
       for (const item of TpPackageId) {//包数据
         for (const item1 of form.getFieldValue("sectionIds"))
           if (item.value == item1)
-            packageMsg.push({"bsId": item.value, "bsName": item.label})
+            packageMsg.push({ "bsId": item.value, "bsName": item.label })
       }
 
       const fromData = {
         "tpId": tpId,
-        "documentName": form.getFieldValue("documentName"),
+        "documentName": trim(form.getFieldValue("documentName")),
         "documentSetId": form.getFieldValue("documentSetId"),
         "sections": packageMsg,
         "contentFileId": ref.current?.DocFileCode,
@@ -242,8 +243,9 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
                 message: '当前项不可为空',
               },
             ]}
+            normalize={(value) => trim(value)}
           >
-            <Input maxLength={200} readOnly={editInformation}/>
+            <Input maxLength={200} readOnly={editInformation} />
           </Form.Item>
           <Form.Item
             label="关联标段"
@@ -258,7 +260,7 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
             <Checkbox.Group
 
               options={TpPackageId}
-              style={{width: '100%'}}
+              style={{ width: '100%' }}
               disabled={editInformation}
             >
             </Checkbox.Group>
@@ -268,11 +270,11 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
             name="documentSetId"
             extra="单个附件最大30MB"
           >
-            {UploadID!="empty"? <ExtendUpload  uploadProps={UploadProps} bid={UploadID}/>:null}
+            {UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} bid={UploadID} /> : null}
           </Form.Item>
         </Form>
         <h3 className="first-title">资审文件内容</h3>
-        <Card style={{textAlign: "center"}}>
+        <Card style={{ textAlign: "center" }}>
           <div>
             {/* {docBtnName != "" ?
               <Weboffice memberBtnName={docBtnName} readonly={docReadOnly} btnStyle={docSaveBtn} btnName={"保存"}
@@ -280,12 +282,12 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
               : null
             } */}
             {docBtnName != "" ? (
-                <WebOffice0609 
+              <WebOffice0609
                 readOnly={docReadOnly}
                 DOCFileCode={docFileCode}
                 webOfficeRef={ref}
               />
-              ): null}
+            ) : null}
           </div>
         </Card>
       </Spin>
diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index 865bc6c..baa8fc1 100644
--- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
+++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
@@ -1,4 +1,4 @@
-import { UnorderedListOutlined } from "@ant-design/icons"
+import { ExclamationCircleOutlined, UnorderedListOutlined } from "@ant-design/icons"
 import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table"
 import { Button, Card, Divider, Drawer, message, Modal, Spin, Table, Tabs } from "antd"
 import React, { useEffect, useRef, useState } from "react"
@@ -19,6 +19,8 @@ import { checkConflict } from "@/pages/Bid/BiddingAnnouncement/service";
 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"
 
 /*
 * 招标公告开始
@@ -59,6 +61,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
   const { TabPane } = Tabs;
+  const { confirm } = Modal;
   const columns: ProColumns<DataItem>[] = [
     {
       title: '公告名称',
@@ -117,42 +120,47 @@ 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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
           <>
             <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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + 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 type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
             <Button 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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
             <Button type="text" onClick={() => toChange(record)}>变更</Button>
             {getProMethod() == "procurement_mode_4" ?
               <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleReleaseAgain(record)}>再次发布</Button> : null}
@@ -163,9 +171,10 @@ 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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 
@@ -254,51 +263,59 @@ 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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
           <>
             <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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + 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 type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
+            {getProMethod() == "procurement_mode_4" ?
+              <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleReleaseAgain(record)}>再次发布</Button> : null}
           </>
         );
         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 type="text" key="9" onClick={() => toApprovalFor(record)} hidden={!checkObjectId(record.id)}>
               查看审批流程
             </Button>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 
@@ -495,17 +512,32 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   /**
    * 再次发布
    * */
-  const handleReleaseAgain = async (record: any) => {
-    setPageloading(true);
-    await releaseNoticeAgain(record.id).then(res => {
-      if (res.code == 200) {
-        message.success('发布成功');
-        if (type == "change" || type == "changeNew") {
-          GetList(FpkId);
+  const handleReleaseAgain = (record: any) => {
+    const releaseAgain = async () => {
+      setPageloading(true);
+      await releaseNoticeAgain(record.id).then(res => {
+        if (res.code == 200) {
+          message.success('发布成功');
+          if (type == "change" || type == "changeNew") {
+            GetList(FpkId);
+          }
         }
-      }
-      setRefresh(Math.random() + 1)
-    }).finally(() => setPageloading(false));
+        setRefresh(Math.random() + 1)
+      }).finally(() => setPageloading(false));
+    }
+    if (record?.hasChangeAnno) {//存在处于已发布状态的变更公告
+      confirm({
+        title: '有已发布的变更公告，是否再次发布原公告？',
+        icon: <ExclamationCircleOutlined />,
+        centered: true,
+        okText: '发布',
+        onOk() {
+          releaseAgain();
+        },
+      });
+    } else {
+      releaseAgain();
+    }
   };
 
   /**
@@ -527,13 +559,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 fd4e4c1..6961ba1 100644
--- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
@@ -17,6 +17,8 @@ import { getProId } from "@/utils/session";
 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"
 
 /*
 * 招标公示开始
@@ -69,15 +71,15 @@ const BidPublicityResult: React.FC<{}> = (props) => {
       title: '起草时间',
       dataIndex: 'createDate',
       // dataIndex: 'annoStartTime',
-      key:"annoStartTime",
-      align:'left',
+      key: "annoStartTime",
+      align: 'left',
       valueType: 'dateTime',
     },
     {
       title: '公示状态',
       dataIndex: 'status',
-      key:"status",
-      align:'left',
+      key: "status",
+      align: 'left',
       // valueEnum: {
       //   1: { text: '起草', status: '' },
       //   2: { text: '已提交', status: '' },
@@ -110,51 +112,57 @@ 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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
           <>
             <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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn4 = (
           <>
             <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={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
             <Button 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 hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn6 = (
           <>
             <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>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 
@@ -219,7 +227,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
         if (res.data.length == 0) {
           message.warn("没有可关联的包件！")
         } else {
-          setUpdateChange('新建中选候选人公示')
+          setUpdateChange('新增招募结果公示')
           setType("new");
           setUpdateVisible(true);
         }
@@ -231,14 +239,14 @@ const BidPublicityResult: React.FC<{}> = (props) => {
   }
   /*编辑招标公示*/
   const toEdit = (props: any) => {
-    setUpdateChange('编辑中选候选人公示')
+    setUpdateChange('编辑招募结果公示')
     setPkId(props.id);
     setType("edit");
     setUpdateVisible(true);
   }
   /*查看招标公示*/
   const toRead = (props: any) => {
-    setUpdateChange('查看中选候选人公示')
+    setUpdateChange('查看招募结果公示')
     setType("read");
     setPkId(props.id);
     setUpdateVisible(true);
@@ -317,9 +325,9 @@ const BidPublicityResult: 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)
@@ -358,7 +366,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           size={"small"}
           loading={pageloading}
           toolBarRender={() => [
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>新建中选候选人公示</Button>,
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"1"} type="primary" onClick={() => toEditAdd([])}>新增招募结果公示</Button>,
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} key={"2"} onClick={() => { handleRemoveMore() }}>批量删除</Button>,
           ]}
           search={false}
diff --git a/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx b/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx
index 29920dc..8a7b301 100644
--- a/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx
+++ b/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/components/ClarifyTheList.tsx
@@ -477,9 +477,10 @@ const ClarifyTheList: React.FC<{}> = () => {
                 return;
             }
             let packageIds = isNotEmpty(form.getFieldValue('packageId')) ? String(form.getFieldValue('packageId')).split(',') : [];
+            let params = { roomType };
             if (isNotEmpty(packageIds) && packageIds.length !== 0) {
                 //获取公告信息 判断文件的获取和截止时间与应答截止时间的关系
-                getClarifyAnnoList(packageIds).then(res => {
+                getClarifyAnnoList(packageIds, params).then(res => {
                     if (res.code == 200) {
                         getRoomList({ sectionIdList: packageIds }).then((res2) => {
                             if (res2.code == 200) {
diff --git a/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts b/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts
index 6686bee..77f7470 100644
--- a/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts
+++ b/src/pages/ZZhaoMu/Tender/ProjectManager/ClarifyTheList/service.ts
@@ -107,10 +107,11 @@ export function getSections(projectId: any, roomType: any) {
  * 根据标段id查询公告
  * @param data 
  */
-export function getClarifyAnnoList(data: any) {
+export function getClarifyAnnoList(data: any, params: any) {
     return request('/api/biz-service-ebtp-bid/v1/anno/clarifyAnnoList', {
         method: 'post',
-        data: data
+        data: data,
+        params: params,
     });
 }
 /**
diff --git a/src/pages/ZZhaoMu/Tender/UploadResponse/TableLook.tsx b/src/pages/ZZhaoMu/Tender/UploadResponse/TableLook.tsx
index e4f28e9..c521ed4 100644
--- a/src/pages/ZZhaoMu/Tender/UploadResponse/TableLook.tsx
+++ b/src/pages/ZZhaoMu/Tender/UploadResponse/TableLook.tsx
@@ -488,7 +488,7 @@ const Index: React.FC<IndexProps> = (props) => {
         clearInterval(task)
       }
     }
-  }, []);
+  }, [messProp.roomId]);
 
   const showTimeDetail = (endDate: any) => {
     let endtime = new Date(endDate.replace(/-/g, '/'));  //定义结束时间
diff --git a/src/pages/ZZhaoMu/Tender/UploadResponse/index.tsx b/src/pages/ZZhaoMu/Tender/UploadResponse/index.tsx
index 1bc7026..f39a75f 100644
--- a/src/pages/ZZhaoMu/Tender/UploadResponse/index.tsx
+++ b/src/pages/ZZhaoMu/Tender/UploadResponse/index.tsx
@@ -8,15 +8,17 @@ import ProList from '@ant-design/pro-list';
 import TableLook from './TableLook';
 import { getStatusByProId } from '@/services/downLoad';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
+import SupplierCommitment from '@/pages/Tender/UploadResponse/components/SupplierCommitment';
 
 const Index: React.FC<{}> = () => {
-  const [dateList, setDateList] = useState([]);
   let projectId = getProId()
   const [expandedRowKeys, setExpandedRowKeys] = useState<ReactText[]>([0]);
   //供应商资质库显示状态
   const [supplierStatus, setSupplierStatus] = useState<boolean>(false);
   // 提示信息显隐
   const [tip, setTip] = useState<boolean>(true);
+  //是否初始化列表-供应商承诺书用
+  const [isInit, setIsInit] = useState<boolean>(false);
 
   /**
    * 根据项目id获取供应商资质库信息引用状态
@@ -24,19 +26,19 @@ const Index: React.FC<{}> = () => {
    * @returns true-有供应商资质库信息 false-无供应商资质库信息
    */
   const getSupplierStatus = async (id: string) => {
-    await getStatusByProId({id: id}).then(res => {
-        setTip(false)
-        if(res?.code == 200) {
-            setSupplierStatus(res?.data)
-        }
+    await getStatusByProId({ id: id }).then(res => {
+      setTip(false)
+      if (res?.code == 200) {
+        setSupplierStatus(res?.data)
+      }
     })
   }
 
-  let listDate = dateList?.map((item: any, index: any) => ({
+  let listRender = (list: any[]) => list?.map((item: any, index: any) => ({
     title: item.packageName + '—第' + item.roomSort + '轮',
     description: (
       <div>
-        <TableLook messProp={item} itemIndex={index} supplierStatus={supplierStatus}/>
+        <TableLook messProp={item} itemIndex={index} supplierStatus={supplierStatus} />
         {/* {expandedRowKeys.includes(item.sectionVO.bsId) ? <TableLook messProp={item} itemIndex={index} /> : null} */}
       </div>
     )
@@ -55,52 +57,55 @@ const Index: React.FC<{}> = () => {
         <div>
           <div>
             <Row>
-                <Col span="24">
-                    <div className="first-title">分包分段信息</div>
-                </Col>
-                <Col span="24" hidden={tip}>
-                  <div><Tag hidden={!supplierStatus} style={{ marginBottom: "10px", marginLeft: "20px" }} icon={<ExclamationCircleOutlined />} color="warning"> 为确保制作应答文件环节顺利进行，请您提前维护好供应商库信息，具体操作步骤可参照系统菜单-【我的工作台】-【共享文档下载】-【招标采购中心引用供应商信息库信息操作手册】 </Tag></div>
-                  <div><Tag hidden={getSessionProjectData().isIPassFile == '1' ? true : false} style={{ marginBottom: "20px" }} icon={<ExclamationCircleOutlined />} color="warning"> 依照代理设置，您在客户端制作应答文件及上传应答文件时需要插入ipass，请您提前知晓。</Tag></div>
-                </Col>
+              <Col span="24">
+                <div className="first-title">分包分段信息</div>
+              </Col>
+              <Col span="24" hidden={tip}>
+                <div><Tag hidden={!supplierStatus} style={{ marginBottom: "10px", marginLeft: "20px" }} icon={<ExclamationCircleOutlined />} color="warning"> 为确保制作应答文件环节顺利进行，请您提前维护好供应商库信息，具体操作步骤可参照系统菜单-【我的工作台】-【共享文档下载】-【招标采购中心引用供应商信息库信息操作手册】 </Tag></div>
+                <div><Tag hidden={getSessionProjectData().isIPassFile == '1' ? true : false} style={{ marginBottom: "20px" }} icon={<ExclamationCircleOutlined />} color="warning"> 依照代理设置，您在客户端制作应答文件及上传应答文件时需要插入ipass，请您提前知晓。</Tag></div>
+              </Col>
             </Row>
           </div>
         </div>
-        <ProList
-          className="pro-list"
-          rowKey="bsId"
-          params={{ "projectId": projectId }}
-          request={async (params) =>
-            await getPackages(params).then((res) => {
-              if (res.code == 200) {
-                let data = res.data;
-                setDateList(res.data.records)
+        {isInit && (
+          <ProList
+            className="pro-list"
+            rowKey="bsId"
+            params={{ "projectId": projectId }}
+            request={async (params) =>
+              await getPackages(params).then((res) => {
+                if (res.code == 200) {
+                  let data = res.data;
+                  // setDateList(res.data.records)
+                  return Promise.resolve({
+                    data: listRender(data.records),
+                    success: res.success,
+                    total: res.data.total,
+                    current: res.data.current,
+                  });
+                }
                 return Promise.resolve({
-                  data: data.records,
-                  success: res.success,
-                  total: res.data.total,
-                  current: res.data.current,
+                  data: [],
+                  success: false,
+                  total: 0,
+                  current: 1,
                 });
-              }
-              return Promise.resolve({
-                data: [],
-                success: false,
-                total: 0,
-                current: 1,
-              });
-            })
-          }
-          pagination={{
-            defaultPageSize: 10,
-            showSizeChanger: true,
-          }}
-          expandable={{ expandedRowKeys, onExpandedRowsChange: setExpandedRowKeys, onExpand: changeList }}
-          dataSource={listDate}
-          metas={{
-            title: {},
-            content: {},
-            description: {}
-          }}
-        />
+              })
+            }
+            pagination={{
+              defaultPageSize: 10,
+              showSizeChanger: true,
+            }}
+            expandable={{ expandedRowKeys, onExpandedRowsChange: setExpandedRowKeys, onExpand: changeList }}
+            // dataSource={listDate}
+            metas={{
+              title: {},
+              content: {},
+              description: {}
+            }}
+          />
+        )}
+        <SupplierCommitment projectId={projectId} callback={() => { setIsInit(true) }} />
       </div>
     </>
   )
diff --git a/src/services/bidev.js b/src/services/bidev.js
index cc30a8e..c8d0c7b 100644
--- a/src/services/bidev.js
+++ b/src/services/bidev.js
@@ -18,7 +18,7 @@ export async function zmmultiOpenBizassessroom(params) {
 
 export async function resetVerificationCode(params) {
   return request(`/api/biz-service-ebtp-process/v1/bizassessroom/update/captcha/${params.id}`,
-  {method: 'put'});
+  {method: 'post'});
 }
 
 export async function fetchJuryList(params) {
diff --git a/src/typings.d.ts b/src/typings.d.ts
index 86fb366..33e3ba7 100644
--- a/src/typings.d.ts
+++ b/src/typings.d.ts
@@ -49,4 +49,6 @@ declare const REACT_APP_PASSWORD_PUBLICKEY: string
 /**ENV-环境参数 */
 declare const START_ENV: string
 /**ENV-询价查看报价跳转地址 */
-declare const REACT_APP_XUNJIA_REDIRECT: string
\ No newline at end of file
+// declare const REACT_APP_XUNJIA_REDIRECT: string
+/**ENV-询价查看报价跳转地址 */
+declare const REACT_APP_XUNJIA_UID: string
diff --git a/src/utils/CommonUtils.ts b/src/utils/CommonUtils.ts
index c82ecc3..ed36dd2 100644
--- a/src/utils/CommonUtils.ts
+++ b/src/utils/CommonUtils.ts
@@ -11,7 +11,7 @@
  * 判断是否等于空
  * @param value
  */
- export function isEmpty(value: any) {
+export function isEmpty(value: any) {
   return value === null || value === void 0 || value === '';
 }
 /**
@@ -223,7 +223,7 @@ projectTypeCodeMaps.set("/Comparison", ["procurement_mode_3"]);
 //招募
 projectTypeCodeMaps.set("/Recruit", ["procurement_mode_4"]);
 //谈判
-projectTypeCodeMaps.set("/Negotiation", ["procurement_mode_5", "procurement_mode_6", ]);
+projectTypeCodeMaps.set("/Negotiation", ["procurement_mode_5", "procurement_mode_6",]);
 //询价
 projectTypeCodeMaps.set("/Inquiry", ["procurement_mode_7"]);
 
@@ -265,40 +265,65 @@ export const numberToChinese = (num: any) => {
   var AA = new Array("零", "一", "二", "三", "四", "五", "六", "七", "八", "九", "十");
   var BB = new Array("", "十", "百", "仟", "萬", "億", "点", "");
   var a = ("" + num).replace(/(^0*)/g, "").split("."),
-      k = 0,
-      re = "";
+    k = 0,
+    re = "";
   for (var i = a[0].length - 1; i >= 0; i--) {
-      switch (k) {
-          case 0:
-              re = BB[7] + re;
-              break;
-          case 4:
-              if (!new RegExp("0{4}//d{" + (a[0].length - i - 1) + "}$")
-                  .test(a[0]))
-                  re = BB[4] + re;
-              break;
-          case 8:
-              re = BB[5] + re;
-              BB[7] = BB[5];
-              k = 0;
-              break;
-      }
-      if (k % 4 == 2 && a[0].charAt(i + 2) != '0' && a[0].charAt(i + 1) == '0')
-          re = AA[0] + re;
-      if (a[0].charAt(i) != '0')
-          re = AA[a[0].charAt(i)] + BB[k % 4] + re;
-      k++;
+    switch (k) {
+      case 0:
+        re = BB[7] + re;
+        break;
+      case 4:
+        if (!new RegExp("0{4}//d{" + (a[0].length - i - 1) + "}$")
+          .test(a[0]))
+          re = BB[4] + re;
+        break;
+      case 8:
+        re = BB[5] + re;
+        BB[7] = BB[5];
+        k = 0;
+        break;
+    }
+    if (k % 4 == 2 && a[0].charAt(i + 2) != '0' && a[0].charAt(i + 1) == '0')
+      re = AA[0] + re;
+    if (a[0].charAt(i) != '0')
+      re = AA[a[0].charAt(i)] + BB[k % 4] + re;
+    k++;
   }
 
   if (a.length > 1) // 加上小数部分(如果有小数部分)
   {
-      re += BB[6];
-      for (var i = 0; i < a[1].length; i++)
-          re += AA[a[1].charAt(i)];
+    re += BB[6];
+    for (var i = 0; i < a[1].length; i++)
+      re += AA[a[1].charAt(i)];
   }
   if (re == '一十')
-      re = "十";
+    re = "十";
   if (re.match(/^一/) && re.length == 3)
-      re = re.replace("一", "");
+    re = re.replace("一", "");
   return re;
+}
+/**
+ * 页面内锚点滚动方法
+ * @param anchorName 
+ */
+export const scrollToAnchor = (anchorName: string) => {
+  if (anchorName) {
+    // 找到锚点
+    let anchorElement = document.getElementById(anchorName);
+    // 如果对应id的锚点存在，就跳转到锚点
+    if (anchorElement) { anchorElement.scrollIntoView({ block: 'start', behavior: 'smooth' }); }
+  }
+}
+/**
+ * 删除行首行尾的空白字符方法（包括空格、制表符、换页符等等）
+ * @param str 
+ * @returns 
+ */
+export const trim = (str: string): string => {
+  if (isNotEmpty(str)) {
+    let _str = str.replace(/(^\s*)|(\s*$)/g, "");
+    _str = _str.replace(/[<>|\\/?？:：*""“”\s\r\n\t]/g, "");
+    return _str;
+  }
+  return '';
 }
\ No newline at end of file
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);
 }