From 78f1b2e2a35339ca18c13c2ff6cdaa0d3f2b0888 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Wed, 13 Apr 2022 16:51:43 +0800
Subject: [PATCH 01/16] =?UTF-8?q?4.13=20=E5=A2=9E=E5=8A=A0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/ZhaoBiao/router_menucBid.config.ts     |  5 ++
 .../components/PublicPlatform.tsx             | 87 +++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx

diff --git a/config/ZhaoBiao/router_menucBid.config.ts b/config/ZhaoBiao/router_menucBid.config.ts
index 39ee12f..410da96 100644
--- a/config/ZhaoBiao/router_menucBid.config.ts
+++ b/config/ZhaoBiao/router_menucBid.config.ts
@@ -24,6 +24,11 @@ export default [//招标  投标邀请
     path: '/ProjectLayout/NoticeFileStruct/List',
     component: './Bid/NoticeFileStruct/list',
   },
+  //公共服务平台
+  {
+    path: '/ProjectLayout/PublicPlatform',
+    component: './Bid/BiddingAnnouncement/components/PublicPlatform',
+  },
 
   //应答格式开始
   {
diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
new file mode 100644
index 0000000..90135e4
--- /dev/null
+++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
@@ -0,0 +1,87 @@
+import { Form, Input, InputNumber, Button, Card } from 'antd';
+import React from 'react';
+
+interface PublicPlatformProps {
+    modalVisible: boolean;
+    onCancel: () => void;
+}
+
+const layout = {
+    labelCol: {
+        span: 6,
+    },
+    wrapperCol: {
+        span: 16,
+    },
+};
+/* eslint-disable no-template-curly-in-string */
+
+const validateMessages = {
+    required: '${label} is required!',
+    types: {
+        email: '${label} is not a valid email!',
+        number: '${label} is not a valid number!',
+    },
+    number: {
+        range: '${label} must be between ${min} and ${max}',
+    },
+};
+/* eslint-enable no-template-curly-in-string */
+
+const PublicPlatform: React.FC<PublicPlatformProps> = (props) => {
+    // const { modalVisible, onCancel } = props;
+
+    const onFinish = (values: any) => {
+        console.log(values);
+    };
+
+    return (
+        <Card>
+            <Form {...layout} name="nest-messages" onFinish={onFinish} validateMessages={validateMessages}>
+                <h3 className="first-title">项目信息</h3>
+                <Form.Item name={['user', 'Projectsize']} label="项目规模">
+                    <Input.TextArea />
+                </Form.Item>
+                <Form.Item name={['user', 'introduction']} label="招标内容与范围及招标方案说明">
+                    <Input.TextArea />
+                </Form.Item>
+                <h3 className="first-title">标段信息</h3>
+                <Form.Item name={['user', 'website']} label="标段（包）内容">
+                    <Input.TextArea />
+                </Form.Item>
+                <Form.Item name={['user', 'website']} label="投标人资格条件">
+                    <Input.TextArea />
+                </Form.Item>
+                <h3 className="first-title">中标候选人信息</h3>
+                <Form.Item name={['user', 'website']} label="质量">
+                    <Input.TextArea />
+                </Form.Item>
+                <Form.Item name={['user', 'website']} label="评标情况">
+                    <Input.TextArea />
+                </Form.Item>
+                <Form.Item name={['user', 'website']} label="中标候选人响应招标文件的资格能力条件">
+                    <Input.TextArea />
+                </Form.Item>
+                <Form.Item name={['user', 'age']} label="工期/交货期/服务期" rules={[{ type: 'number', min: 0, max: 99 }]}>
+                    <InputNumber />
+                </Form.Item>
+                <Form.Item name={['user', 'website']} label="项目负责人姓名">
+                    <Input />
+                </Form.Item>
+                <Form.Item name={['user', 'website']} label="项目负责人证件号码">
+                    <Input />
+                </Form.Item>
+                <Form.Item name={['user', 'website']} label="项目负责人相关证书和编号">
+                    <Input />
+                </Form.Item>
+                {/* <Form.Item wrapperCol={{ ...layout.wrapperCol, offset: 8 }}>
+                    <Button type="primary" htmlType="submit">
+                        Submit
+                    </Button>
+                </Form.Item> */}
+            </Form>
+        </Card>
+    );
+};
+
+export default PublicPlatform
\ No newline at end of file

From 0595d4e33922d1470412b81bc2f6321df41d33da Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Sun, 17 Apr 2022 21:05:11 +0800
Subject: [PATCH 02/16] =?UTF-8?q?4.17=20=E6=A0=87=E6=AE=B5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=B8=83=E5=B1=80=EF=BC=8C=E5=9B=BA?=
 =?UTF-8?q?=E9=92=89=EF=BC=8C=E9=94=9A=E7=82=B9=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PublicPlatform.tsx             | 196 ++++++++++++++----
 src/utils/CommonUtils.ts                      |  70 ++++---
 2 files changed, 201 insertions(+), 65 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
index 90135e4..56caedc 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
@@ -1,5 +1,7 @@
-import { Form, Input, InputNumber, Button, Card } from 'antd';
-import React from 'react';
+import { scrollToAnchor } from '@/utils/CommonUtils';
+import ProCard from '@ant-design/pro-card';
+import { Form, Input, InputNumber, Button, Card, Row, Col, Typography, Tooltip, Space, Radio, Affix, List, Tag } from 'antd';
+import React, { useState } from 'react';
 
 interface PublicPlatformProps {
     modalVisible: boolean;
@@ -11,9 +13,44 @@ const layout = {
         span: 6,
     },
     wrapperCol: {
-        span: 16,
+        span: 17,
     },
 };
+const bidLayout = {
+    labelCol: {
+        span: 4,
+    },
+    wrapperCol: {
+        span: 20,
+    },
+};
+const candidateLayout = {
+    labelCol: {
+        span: 7,
+    },
+    wrapperCol: {
+        span: 17,
+    },
+};
+
+const data = [
+    {
+        title: '标段一',
+        description: 'XY92632011202',
+    },
+    {
+        title: '标段二',
+        description: 'XY92632011202',
+    },
+    {
+        title: '标段三',
+        description: 'XY92632011202',
+    },
+    {
+        title: '标段四',
+        description: 'XY92632011202',
+    },
+];
 /* eslint-disable no-template-curly-in-string */
 
 const validateMessages = {
@@ -30,57 +67,144 @@ const validateMessages = {
 
 const PublicPlatform: React.FC<PublicPlatformProps> = (props) => {
     // const { modalVisible, onCancel } = props;
+    const { Text } = Typography;
+    const { TextArea } = Input;
+    const [container, setContainer] = useState<HTMLDivElement | null>(null);
 
     const onFinish = (values: any) => {
         console.log(values);
     };
 
     return (
-        <Card>
-            <Form {...layout} name="nest-messages" onFinish={onFinish} validateMessages={validateMessages}>
+        <div ref={setContainer} className="zjl-entrust" style={{ height: '100%', overflowY: 'auto', padding: '24px' }}>
+            <Form {...layout} name="public-platform" onFinish={onFinish} validateMessages={validateMessages}>
                 <h3 className="first-title">项目信息</h3>
                 <Form.Item name={['user', 'Projectsize']} label="项目规模">
-                    <Input.TextArea />
+                    <TextArea autoSize />
                 </Form.Item>
                 <Form.Item name={['user', 'introduction']} label="招标内容与范围及招标方案说明">
-                    <Input.TextArea />
+                    <TextArea autoSize />
                 </Form.Item>
+                <h3 className="first-title">公告信息</h3>
+                <h3 className="first-title">公示信息</h3>
                 <h3 className="first-title">标段信息</h3>
-                <Form.Item name={['user', 'website']} label="标段（包）内容">
-                    <Input.TextArea />
-                </Form.Item>
-                <Form.Item name={['user', 'website']} label="投标人资格条件">
-                    <Input.TextArea />
-                </Form.Item>
-                <h3 className="first-title">中标候选人信息</h3>
-                <Form.Item name={['user', 'website']} label="质量">
-                    <Input.TextArea />
-                </Form.Item>
-                <Form.Item name={['user', 'website']} label="评标情况">
-                    <Input.TextArea />
-                </Form.Item>
-                <Form.Item name={['user', 'website']} label="中标候选人响应招标文件的资格能力条件">
-                    <Input.TextArea />
-                </Form.Item>
-                <Form.Item name={['user', 'age']} label="工期/交货期/服务期" rules={[{ type: 'number', min: 0, max: 99 }]}>
-                    <InputNumber />
-                </Form.Item>
-                <Form.Item name={['user', 'website']} label="项目负责人姓名">
-                    <Input />
-                </Form.Item>
-                <Form.Item name={['user', 'website']} label="项目负责人证件号码">
-                    <Input />
-                </Form.Item>
-                <Form.Item name={['user', 'website']} label="项目负责人相关证书和编号">
-                    <Input />
-                </Form.Item>
+                <ProCard split="vertical">
+                    <ProCard colSpan="15%" bodyStyle={{ padding: 0 }}>
+                        <Affix target={() => container}>
+                            <div style={{ height: innerHeight - 240, overflow: 'auto', }}>
+                                <List
+                                    itemLayout="horizontal"
+                                    dataSource={data}
+                                    renderItem={item => (
+                                        <List.Item>
+                                            <List.Item.Meta
+                                                title={
+                                                    <Space>
+                                                        <a onClick={() => scrollToAnchor("name1")}>{item.title}</a>
+                                                        <Tag color="success">已完成</Tag>
+                                                    </Space>
+                                                }
+                                                description={item.description}
+                                            />
+                                        </List.Item>
+                                    )}
+                                />
+                            </div>
+                        </Affix>
+                    </ProCard>
+                    <ProCard bodyStyle={{ padding: 8 }}>
+                        <Space direction="vertical" style={{ display: 'flex' }}>
+                            <Card
+                                title={
+                                    <Space>
+                                        <Tooltip title="标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段1">
+                                            <span>XY92632011202</span>
+                                        </Tooltip>
+                                        <Text>标段一</Text>
+                                        <Tag color="success">已完成</Tag>
+                                    </Space>
+                                }
+                                id="name1"
+                            >
+                                <Form {...bidLayout}>
+                                    <Form.Item name={['user', 'website']} label="标段（包）名称">
+                                        <TextArea autoSize />
+                                    </Form.Item>
+                                    <Form.Item name={['user', 'website']} label="标段（包）编号">
+                                        <Input />
+                                    </Form.Item>
+                                    <Form.Item name={['user', 'website']} label="标段（包）内容">
+                                        <TextArea autoSize />
+                                    </Form.Item>
+                                    <Form.Item name={['user', 'website']} label="投标人资格条件">
+                                        <TextArea autoSize />
+                                    </Form.Item>
+                                    <Form.Item label="中标候选人信息">
+                                        <Space direction="vertical" style={{ display: 'flex' }}>
+                                            <Card type="inner" title="中国邮政速递物流股份有限公司大连市分公司">
+                                                <Form {...candidateLayout}>
+                                                    <Form.Item name={['user', 'website']} label="质量">
+                                                        <TextArea autoSize />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'website']} label="评标情况">
+                                                        <TextArea autoSize />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'website']} label="中标候选人响应招标文件的资格能力条件">
+                                                        <TextArea rows={2} />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'age']} label="工期/交货期/服务期" rules={[{ type: 'number', min: 0, max: 99 }]}>
+                                                        <InputNumber />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'website']} label="项目负责人姓名">
+                                                        <Input />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'website']} label="项目负责人证件号码">
+                                                        <Input />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'website']} label="项目负责人相关证书和编号">
+                                                        <Input />
+                                                    </Form.Item>
+                                                </Form>
+                                            </Card>
+                                            <Card type="inner" title="北京人大金仓信息技术股份有限公司">
+                                                <Form {...candidateLayout}>
+                                                    <Form.Item name={['user', 'website']} label="质量">
+                                                        <TextArea autoSize />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'website']} label="评标情况">
+                                                        <TextArea autoSize />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'website']} label="中标候选人响应招标文件的资格能力条件">
+                                                        <TextArea rows={2} />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'age']} label="工期/交货期/服务期" rules={[{ type: 'number', min: 0, max: 99 }]}>
+                                                        <InputNumber />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'website']} label="项目负责人姓名">
+                                                        <Input />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'website']} label="项目负责人证件号码">
+                                                        <Input />
+                                                    </Form.Item>
+                                                    <Form.Item name={['user', 'website']} label="项目负责人相关证书和编号">
+                                                        <Input />
+                                                    </Form.Item>
+                                                </Form>
+                                            </Card>
+                                        </Space>
+                                    </Form.Item>
+                                </Form>
+                            </Card>
+                        </Space>
+                    </ProCard>
+                </ProCard>
                 {/* <Form.Item wrapperCol={{ ...layout.wrapperCol, offset: 8 }}>
                     <Button type="primary" htmlType="submit">
                         Submit
                     </Button>
                 </Form.Item> */}
             </Form>
-        </Card>
+        </div>
     );
 };
 
diff --git a/src/utils/CommonUtils.ts b/src/utils/CommonUtils.ts
index c82ecc3..d48c93d 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,52 @@ 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' }); }
+  }
 }
\ No newline at end of file

From 0e8de93f2fbed571c78102f26912ecd66211d909 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Mon, 18 Apr 2022 20:40:54 +0800
Subject: [PATCH 03/16] =?UTF-8?q?4.18=20=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PublicPlatform.tsx             | 178 ++++++++----------
 1 file changed, 79 insertions(+), 99 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
index 56caedc..63b0949 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
@@ -1,6 +1,6 @@
 import { scrollToAnchor } from '@/utils/CommonUtils';
 import ProCard from '@ant-design/pro-card';
-import { Form, Input, InputNumber, Button, Card, Row, Col, Typography, Tooltip, Space, Radio, Affix, List, Tag } from 'antd';
+import { Form, Input, InputNumber, Button, Card, Row, Col, Typography, Tooltip, Space, Radio, Affix, List, Tag, Collapse } from 'antd';
 import React, { useState } from 'react';
 
 interface PublicPlatformProps {
@@ -13,23 +13,7 @@ const layout = {
         span: 6,
     },
     wrapperCol: {
-        span: 17,
-    },
-};
-const bidLayout = {
-    labelCol: {
-        span: 4,
-    },
-    wrapperCol: {
-        span: 20,
-    },
-};
-const candidateLayout = {
-    labelCol: {
-        span: 7,
-    },
-    wrapperCol: {
-        span: 17,
+        span: 18,
     },
 };
 
@@ -68,6 +52,7 @@ const validateMessages = {
 const PublicPlatform: React.FC<PublicPlatformProps> = (props) => {
     // const { modalVisible, onCancel } = props;
     const { Text } = Typography;
+    const { Panel } = Collapse;
     const { TextArea } = Input;
     const [container, setContainer] = useState<HTMLDivElement | null>(null);
 
@@ -79,10 +64,10 @@ const PublicPlatform: React.FC<PublicPlatformProps> = (props) => {
         <div ref={setContainer} className="zjl-entrust" style={{ height: '100%', overflowY: 'auto', padding: '24px' }}>
             <Form {...layout} name="public-platform" onFinish={onFinish} validateMessages={validateMessages}>
                 <h3 className="first-title">项目信息</h3>
-                <Form.Item name={['user', 'Projectsize']} label="项目规模">
+                <Form.Item name="projectScale" label="项目规模">
                     <TextArea autoSize />
                 </Form.Item>
-                <Form.Item name={['user', 'introduction']} label="招标内容与范围及招标方案说明">
+                <Form.Item name="tenderContent" label="招标内容与范围及招标方案说明">
                     <TextArea autoSize />
                 </Form.Item>
                 <h3 className="first-title">公告信息</h3>
@@ -108,101 +93,96 @@ const PublicPlatform: React.FC<PublicPlatformProps> = (props) => {
                                             />
                                         </List.Item>
                                     )}
+                                    footer={
+                                        <>
+                                            <Button type='primary'>提交</Button>
+                                        </>
+                                    }
                                 />
                             </div>
                         </Affix>
                     </ProCard>
                     <ProCard bodyStyle={{ padding: 8 }}>
-                        <Space direction="vertical" style={{ display: 'flex' }}>
-                            <Card
-                                title={
+                        <Collapse defaultActiveKey={['1']}>
+                            <Panel
+                                header={
                                     <Space>
                                         <Tooltip title="标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段1">
-                                            <span>XY92632011202</span>
+                                            <Text>XY92632011202</Text>
                                         </Tooltip>
                                         <Text>标段一</Text>
                                         <Tag color="success">已完成</Tag>
                                     </Space>
                                 }
                                 id="name1"
+                                key="1"
                             >
-                                <Form {...bidLayout}>
-                                    <Form.Item name={['user', 'website']} label="标段（包）名称">
-                                        <TextArea autoSize />
-                                    </Form.Item>
-                                    <Form.Item name={['user', 'website']} label="标段（包）编号">
-                                        <Input />
-                                    </Form.Item>
-                                    <Form.Item name={['user', 'website']} label="标段（包）内容">
-                                        <TextArea autoSize />
-                                    </Form.Item>
-                                    <Form.Item name={['user', 'website']} label="投标人资格条件">
-                                        <TextArea autoSize />
-                                    </Form.Item>
-                                    <Form.Item label="中标候选人信息">
-                                        <Space direction="vertical" style={{ display: 'flex' }}>
-                                            <Card type="inner" title="中国邮政速递物流股份有限公司大连市分公司">
-                                                <Form {...candidateLayout}>
-                                                    <Form.Item name={['user', 'website']} label="质量">
-                                                        <TextArea autoSize />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'website']} label="评标情况">
-                                                        <TextArea autoSize />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'website']} label="中标候选人响应招标文件的资格能力条件">
-                                                        <TextArea rows={2} />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'age']} label="工期/交货期/服务期" rules={[{ type: 'number', min: 0, max: 99 }]}>
-                                                        <InputNumber />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'website']} label="项目负责人姓名">
-                                                        <Input />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'website']} label="项目负责人证件号码">
-                                                        <Input />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'website']} label="项目负责人相关证书和编号">
-                                                        <Input />
-                                                    </Form.Item>
-                                                </Form>
-                                            </Card>
-                                            <Card type="inner" title="北京人大金仓信息技术股份有限公司">
-                                                <Form {...candidateLayout}>
-                                                    <Form.Item name={['user', 'website']} label="质量">
-                                                        <TextArea autoSize />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'website']} label="评标情况">
-                                                        <TextArea autoSize />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'website']} label="中标候选人响应招标文件的资格能力条件">
-                                                        <TextArea rows={2} />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'age']} label="工期/交货期/服务期" rules={[{ type: 'number', min: 0, max: 99 }]}>
-                                                        <InputNumber />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'website']} label="项目负责人姓名">
-                                                        <Input />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'website']} label="项目负责人证件号码">
-                                                        <Input />
-                                                    </Form.Item>
-                                                    <Form.Item name={['user', 'website']} label="项目负责人相关证书和编号">
-                                                        <Input />
-                                                    </Form.Item>
-                                                </Form>
-                                            </Card>
-                                        </Space>
-                                    </Form.Item>
-                                </Form>
-                            </Card>
-                        </Space>
+                                <h3 className="scd-title">标段信息</h3>
+                                <Form.Item name={['user', 'bidSectName']} label="标段（包）名称">
+                                    <TextArea autoSize />
+                                </Form.Item>
+                                <Form.Item name={['user', 'bidSectBizNum']} label="标段（包）编号">
+                                    <Input />
+                                </Form.Item>
+                                <Form.Item name={['user', 'bidSectionContent']} label="标段（包）内容">
+                                    <TextArea autoSize />
+                                </Form.Item>
+                                <Form.Item name={['user', 'biddingEligbility']} label="投标人资格条件">
+                                    <TextArea autoSize />
+                                </Form.Item>
+                                <h3 className="scd-title">中标候选人信息</h3>
+                                <Collapse defaultActiveKey={['1', '2']}>
+                                    <Panel header="中国邮政速递物流股份有限公司大连市分公司" key="1">
+                                        <Form.Item name={['user', 'suppliers', 'quality']} label="质量">
+                                            <TextArea autoSize />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'evaluationStatus']} label="评标情况">
+                                            <TextArea autoSize />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'winCandidateQualification']} label="中标候选人响应招标文件的资格能力条件">
+                                            <TextArea rows={2} />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'timeLimit']} label="工期/交货期/服务期" rules={[{ type: 'number', min: 0, max: 99 }]}>
+                                            <InputNumber />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'pmName']} label="项目负责人姓名">
+                                            <Input />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'pmCode']} label="项目负责人证件号码">
+                                            <Input />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'pmCeritficates']} label="项目负责人相关证书和编号">
+                                            <Input />
+                                        </Form.Item>
+                                    </Panel>
+                                    <Panel header="北京人大金仓信息技术股份有限公司" key="2">
+                                        <Form.Item name={['user', 'suppliers', 'quality']} label="质量">
+                                            <TextArea autoSize />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'evaluationStatus']} label="评标情况">
+                                            <TextArea autoSize />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'winCandidateQualification']} label="中标候选人响应招标文件的资格能力条件">
+                                            <TextArea rows={2} />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'timeLimit']} label="工期/交货期/服务期" rules={[{ type: 'number', min: 0, max: 99 }]}>
+                                            <InputNumber />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'pmName']} label="项目负责人姓名">
+                                            <Input />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'pmCode']} label="项目负责人证件号码">
+                                            <Input />
+                                        </Form.Item>
+                                        <Form.Item name={['user', 'suppliers', 'pmCeritficates']} label="项目负责人相关证书和编号">
+                                            <Input />
+                                        </Form.Item>
+                                    </Panel>
+                                </Collapse>
+                            </Panel>
+                        </Collapse>
                     </ProCard>
                 </ProCard>
-                {/* <Form.Item wrapperCol={{ ...layout.wrapperCol, offset: 8 }}>
-                    <Button type="primary" htmlType="submit">
-                        Submit
-                    </Button>
-                </Form.Item> */}
             </Form>
         </div>
     );

From 77e8839ebd12f50ee5459338e0362b497bbf291e Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Fri, 22 Apr 2022 17:04:15 +0800
Subject: [PATCH 04/16] =?UTF-8?q?4.22=20=E5=85=AC=E5=85=B1=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/ZhaoBiao/router_menucBid.config.ts     |   5 -
 config/router.config.ts                       |   4 +
 .../components/PublicPlatform.tsx             | 470 +++++++++++-------
 .../BiddingAnnouncement/components/style.less | 135 +++--
 4 files changed, 369 insertions(+), 245 deletions(-)

diff --git a/config/ZhaoBiao/router_menucBid.config.ts b/config/ZhaoBiao/router_menucBid.config.ts
index 410da96..39ee12f 100644
--- a/config/ZhaoBiao/router_menucBid.config.ts
+++ b/config/ZhaoBiao/router_menucBid.config.ts
@@ -24,11 +24,6 @@ export default [//招标  投标邀请
     path: '/ProjectLayout/NoticeFileStruct/List',
     component: './Bid/NoticeFileStruct/list',
   },
-  //公共服务平台
-  {
-    path: '/ProjectLayout/PublicPlatform',
-    component: './Bid/BiddingAnnouncement/components/PublicPlatform',
-  },
 
   //应答格式开始
   {
diff --git a/config/router.config.ts b/config/router.config.ts
index a63478c..21a8efb 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,//审批单
diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
index 63b0949..b381d5a 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
@@ -1,191 +1,321 @@
-import { scrollToAnchor } from '@/utils/CommonUtils';
-import ProCard from '@ant-design/pro-card';
-import { Form, Input, InputNumber, Button, Card, Row, Col, Typography, Tooltip, Space, Radio, Affix, List, Tag, Collapse } from 'antd';
-import React, { useState } from 'react';
-
-interface PublicPlatformProps {
-    modalVisible: boolean;
-    onCancel: () => void;
-}
+import React, { useEffect, useState } from 'react';
+import logo from '@/images/opening/logo.svg';
+import styles from './style.less';
+import './style.less';
+import { Affix, Anchor, BackTop, Button, Checkbox, Col, Collapse, DatePicker, Descriptions, Divider, Form, Input, InputNumber, Layout, message, Modal, PageHeader, Radio, Row, Select, Space, Spin, Tag, Timeline, Tooltip, Typography } from 'antd';
+import { btnAuthority } from '@/utils/authority';
+import { ArrowUpOutlined, CaretRightOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
+import { isNotEmpty } from '@/utils/CommonUtils';
 
 const layout = {
     labelCol: {
         span: 6,
     },
     wrapperCol: {
-        span: 18,
+        span: 17,
     },
 };
 
-const data = [
-    {
-        title: '标段一',
-        description: 'XY92632011202',
-    },
-    {
-        title: '标段二',
-        description: 'XY92632011202',
-    },
-    {
-        title: '标段三',
-        description: 'XY92632011202',
-    },
-    {
-        title: '标段四',
-        description: 'XY92632011202',
-    },
-];
-/* eslint-disable no-template-curly-in-string */
-
 const validateMessages = {
-    required: '${label} is required!',
-    types: {
-        email: '${label} is not a valid email!',
-        number: '${label} is not a valid number!',
-    },
-    number: {
-        range: '${label} must be between ${min} and ${max}',
-    },
+    required: '请填写当前项内容',
 };
-/* eslint-enable no-template-curly-in-string */
 
-const PublicPlatform: React.FC<PublicPlatformProps> = (props) => {
-    // const { modalVisible, onCancel } = props;
-    const { Text } = Typography;
-    const { Panel } = Collapse;
-    const { TextArea } = Input;
+const defaultData = {
+    data: {
+        "project": {
+            "id": "",
+            "projectName": "",
+            "projectScale": "",
+            "tenderContent": "",
+            "tenderCode": "",
+            "readonly": false
+        },
+        "sections": [
+            {
+                "id": "",
+                "projectId": "",
+                "bidSectBizNum": "",
+                "bidSectCode": "",
+                "bidSectName": "",
+                "suppliers": [
+                    {
+                        "id": "",
+                        "projectId": "",
+                        "sectionId": "",
+                        "assessRoomId": "",
+                        "assessRoomSort": 0,
+                        "companyId": "",
+                        "companyName": "",
+                        "sort": "",
+                        "quality": "",
+                        "evaluationStatus": "",
+                        "winCandidateQualification": "",
+                        "timeLimit": 0,
+                        "pmName": "",
+                        "pmCode": "",
+                        "pmCeritficates": ""
+                    }
+                ]
+            }
+        ],
+        "anno": {
+            "id": "",
+            "annoNature": 0,
+            "hasCtpsp": false,
+            "ctpspFileid": "",
+            "status": 0
+        },
+        "tenderer": {
+            "id": "",
+            "code": "",
+            "name": ""
+        }
+    }
+}
+
+const PublicPlatform: React.FC<{}> = () => {
+    //loading
+    const [loading, setLoading] = useState<boolean>(false);
+    //右侧浮动层监听Dom
     const [container, setContainer] = useState<HTMLDivElement | null>(null);
+    //初始数据
+    const [initialData, setInitialData] = useState<any>({});
 
-    const onFinish = (values: any) => {
-        console.log(values);
+    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, 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 }}
+                    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) {
+        return (
+            <Form.Item
+                name={name}
+                label={label}
+                rules={rules}
+                extra={extra}
+                initialValue={initialValue}
+            >
+                <TextArea
+                    bordered={!readonly}
+                    readOnly={readonly}
+                    rows={3}
+                    autoSize={readonly}
+                    placeholder={placeholder}
+                />
+            </Form.Item>
+        )
+    }
+
+
+    //公示-中标候选人遍历
+    const suppliersRender = (suppliers: any[] | null, readonly: boolean) => {
+        if (isNotEmpty(suppliers)) {
+            const activeKeyList = (length: number) => {
+                const list: number[] = []
+                for (let i = 0; i < length; i++) {
+                    list.push(i);
+                }
+                return list;
+            }
+            return suppliers?.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} />}
+                        >
+                            {sectionsRender(item.suppliers, readonly)}
+                        </Collapse>
+                    </Descriptions.Item>
+                </Descriptions>
+            ))
+        }
+        return null;
+    }
+
+    //公示-标段（包）遍历
+    const sectionsRender = (sections: any[] | null, readonly: boolean) => {
+        if (isNotEmpty(sections)) {
+            return sections?.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 }], "项目负责人证件号码")}
+                    {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, item.timeLimit, [{ required: !readonly }], "工期/交货期/服务期", null, 200, "number", "天")}
+                </Panel>
+            ))
+        }
+        return null;
+    }
+    //项目
+    const projectRender = (project: any, readonly: boolean) => {
+        if (typeof project === 'object') {
+            return (
+                <>
+                    {returnInput("name", "纳税人名称", project.readonly, null, [{ required: true }], "纳税人名称")}
+                    {returnInput("code", "纳税人识别号", false, null, [{ required: true }], "纳税人识别号")}
+                    {returnArea("projectScale", "项目规模", false, null, [{ required: true }], "项目规模")}
+                    {returnArea("tenderContent", "招标内容与范围及招标方案说明", false, null, [{ required: true }], "招标内容与范围及招标方案说明")}
+                </>
+            )
+        }
+    }
+
+    const onSave = () => {
+        form.validateFields()
+            .then(values => {
+                console.log('success', values)
+                /*
+              values:
+                {
+                  username: 'username',
+                  password: 'password',
+                }
+              */
+            })
+            .catch(errorInfo => {
+                console.log('error', errorInfo)
+                /*
+                errorInfo:
+                  {
+                    values: {
+                      username: 'username',
+                      password: 'password',
+                    },
+                    errorFields: [
+                      { name: ['password'], errors: ['Please input your Password!'] },
+                    ],
+                    outOfDate: false,
+                  }
+                */
+            });
     };
 
+    const handleClick = (
+        e: React.MouseEvent<HTMLElement>,
+        link: {
+            title: React.ReactNode;
+            href: string;
+        },
+    ) => {
+        e.preventDefault();
+        console.log(link);
+    };
+
+    useEffect(() => {
+        setInitialData(defaultData);
+    }, []);
+
     return (
-        <div ref={setContainer} className="zjl-entrust" style={{ height: '100%', overflowY: 'auto', padding: '24px' }}>
-            <Form {...layout} name="public-platform" onFinish={onFinish} validateMessages={validateMessages}>
-                <h3 className="first-title">项目信息</h3>
-                <Form.Item name="projectScale" label="项目规模">
-                    <TextArea autoSize />
-                </Form.Item>
-                <Form.Item name="tenderContent" label="招标内容与范围及招标方案说明">
-                    <TextArea autoSize />
-                </Form.Item>
-                <h3 className="first-title">公告信息</h3>
-                <h3 className="first-title">公示信息</h3>
-                <h3 className="first-title">标段信息</h3>
-                <ProCard split="vertical">
-                    <ProCard colSpan="15%" bodyStyle={{ padding: 0 }}>
-                        <Affix target={() => container}>
-                            <div style={{ height: innerHeight - 240, overflow: 'auto', }}>
-                                <List
-                                    itemLayout="horizontal"
-                                    dataSource={data}
-                                    renderItem={item => (
-                                        <List.Item>
-                                            <List.Item.Meta
-                                                title={
-                                                    <Space>
-                                                        <a onClick={() => scrollToAnchor("name1")}>{item.title}</a>
-                                                        <Tag color="success">已完成</Tag>
-                                                    </Space>
-                                                }
-                                                description={item.description}
-                                            />
-                                        </List.Item>
-                                    )}
-                                    footer={
-                                        <>
-                                            <Button type='primary'>提交</Button>
-                                        </>
-                                    }
-                                />
-                            </div>
-                        </Affix>
-                    </ProCard>
-                    <ProCard bodyStyle={{ padding: 8 }}>
-                        <Collapse defaultActiveKey={['1']}>
-                            <Panel
-                                header={
-                                    <Space>
-                                        <Tooltip title="标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段标段1">
-                                            <Text>XY92632011202</Text>
-                                        </Tooltip>
-                                        <Text>标段一</Text>
-                                        <Tag color="success">已完成</Tag>
-                                    </Space>
-                                }
-                                id="name1"
-                                key="1"
-                            >
-                                <h3 className="scd-title">标段信息</h3>
-                                <Form.Item name={['user', 'bidSectName']} label="标段（包）名称">
-                                    <TextArea autoSize />
-                                </Form.Item>
-                                <Form.Item name={['user', 'bidSectBizNum']} label="标段（包）编号">
-                                    <Input />
-                                </Form.Item>
-                                <Form.Item name={['user', 'bidSectionContent']} label="标段（包）内容">
-                                    <TextArea autoSize />
-                                </Form.Item>
-                                <Form.Item name={['user', 'biddingEligbility']} label="投标人资格条件">
-                                    <TextArea autoSize />
-                                </Form.Item>
-                                <h3 className="scd-title">中标候选人信息</h3>
-                                <Collapse defaultActiveKey={['1', '2']}>
-                                    <Panel header="中国邮政速递物流股份有限公司大连市分公司" key="1">
-                                        <Form.Item name={['user', 'suppliers', 'quality']} label="质量">
-                                            <TextArea autoSize />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'evaluationStatus']} label="评标情况">
-                                            <TextArea autoSize />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'winCandidateQualification']} label="中标候选人响应招标文件的资格能力条件">
-                                            <TextArea rows={2} />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'timeLimit']} label="工期/交货期/服务期" rules={[{ type: 'number', min: 0, max: 99 }]}>
-                                            <InputNumber />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'pmName']} label="项目负责人姓名">
-                                            <Input />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'pmCode']} label="项目负责人证件号码">
-                                            <Input />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'pmCeritficates']} label="项目负责人相关证书和编号">
-                                            <Input />
-                                        </Form.Item>
+        <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>
+                            <Button type='primary' key='save' onClick={() => onSave()}>保存</Button>
+                            <Button key='close' onClick={() => { }}>关闭</Button>
+                        </Space>
+                    }
+                />
+                <div style={{ width: '100%', height: 16, backgroundColor: 'rgb(240,242,245)', }}></div>
+                <div style={{ padding: '0px 24px' }}>
+                    <div style={{ width: '85%', float: 'left', borderRadius: '8px', }}>
+                        <PageHeader
+                            title={<Text strong>公共服务平台</Text>}
+                        />
+                        <div style={{ height: innerHeight - 180, overflowY: 'auto' }} ref={setContainer}>
+                            <Form {...layout} form={form} scrollToFirstError name="public-platform" className="noticeFile-label" validateMessages={validateMessages}>
+                                <Collapse
+                                    defaultActiveKey={['1', '2', '3', '4']}
+                                    expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} />}
+                                >
+                                    <Panel
+                                        header={<Text strong>项目信息</Text>}
+                                        id="panel1"
+                                        key="1"
+                                    >
+
                                     </Panel>
-                                    <Panel header="北京人大金仓信息技术股份有限公司" key="2">
-                                        <Form.Item name={['user', 'suppliers', 'quality']} label="质量">
-                                            <TextArea autoSize />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'evaluationStatus']} label="评标情况">
-                                            <TextArea autoSize />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'winCandidateQualification']} label="中标候选人响应招标文件的资格能力条件">
-                                            <TextArea rows={2} />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'timeLimit']} label="工期/交货期/服务期" rules={[{ type: 'number', min: 0, max: 99 }]}>
-                                            <InputNumber />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'pmName']} label="项目负责人姓名">
-                                            <Input />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'pmCode']} label="项目负责人证件号码">
-                                            <Input />
-                                        </Form.Item>
-                                        <Form.Item name={['user', 'suppliers', 'pmCeritficates']} label="项目负责人相关证书和编号">
-                                            <Input />
-                                        </Form.Item>
+                                    <Panel
+                                        header={<Text strong>中标候选人信息</Text>}
+                                        id="panel2"
+                                        key="2"
+                                    >
+
+                                    </Panel>
+                                    <Panel
+                                        header={<Text strong>公告信息</Text>}
+                                        id="panel3"
+                                        key="3"
+                                    >
+
+                                    </Panel>
+                                    <Panel
+                                        header={<Text strong>公示信息</Text>}
+                                        id="panel4"
+                                        key="4"
+                                    >
+
                                     </Panel>
                                 </Collapse>
-                            </Panel>
-                        </Collapse>
-                    </ProCard>
-                </ProCard>
-            </Form>
+                            </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="项目信息" />
+                                    <Link href="#panel2" title="中标候选人信息" />
+                                    <Link href="#panel3" title="公告信息" />
+                                    <Link href="#panel4" title="公示信息" />
+                                </Anchor>
+                            )}
+                        </div>
+                        <BackTop style={{ right: '100vh-40px' }}>
+                            <div className='backtop'><ArrowUpOutlined /></div>
+                        </BackTop>
+                    </div>
+                </div>
+            </Spin>
         </div>
-    );
-};
-
-export default PublicPlatform
\ No newline at end of file
+    )
+}
+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..ad76772 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/style.less
+++ b/src/pages/Bid/BiddingAnnouncement/components/style.less
@@ -1,72 +1,5 @@
-//新增招标公告
-// .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;
-//     }
-// }
+@import '~antd/lib/style/themes/default.less';
+
 .card-onmouse{
     // margin:auto;
     .ant-image{
@@ -87,4 +20,66 @@
 }
 .card-onmouse:hover{
     box-shadow: 8px 8px 5px #9e9e9e;/*设置阴影,可以自定义参数*/
-}
\ No newline at end of file
+}
+.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: 134px !important;
+  }
+}
+.backtop {
+  width: 40px;
+  height: 40px;
+  color: #fff;
+  line-height: 40px;
+  text-align: center;
+  background-color: rgb(179, 0, 0);
+  border-radius: 4px;
+  font-size: 14px;
+}

From 1ef607a57b24b14442951b7e7f76db136f5df192 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Fri, 22 Apr 2022 19:54:34 +0800
Subject: [PATCH 05/16] =?UTF-8?q?4.22=20=E5=85=AC=E5=85=B1=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=B9=B3=E5=8F=B0=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PublicPlatform.tsx             | 75 ++++++++++++++-----
 src/pages/Bid/BiddingAnnouncement/service.ts  | 19 +++++
 2 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
index b381d5a..8b42f02 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
@@ -6,6 +6,8 @@ import { Affix, Anchor, BackTop, Button, Checkbox, Col, Collapse, DatePicker, De
 import { btnAuthority } from '@/utils/authority';
 import { ArrowUpOutlined, CaretRightOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 import { isNotEmpty } from '@/utils/CommonUtils';
+import ExtendUpload from '@/utils/ExtendUpload';
+import { getPublicData } from '../service';
 
 const layout = {
     labelCol: {
@@ -80,6 +82,8 @@ const PublicPlatform: React.FC<{}> = () => {
     const [container, setContainer] = useState<HTMLDivElement | null>(null);
     //初始数据
     const [initialData, setInitialData] = useState<any>({});
+    //只读状态readOnly 默认只读
+    const [readOnly, setReadOnly] = useState<boolean>(true);
 
     const { TextArea } = Input;
     const { Panel } = Collapse;
@@ -127,11 +131,24 @@ const PublicPlatform: React.FC<{}> = () => {
             </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={extra}
+            >
+                <ExtendUpload bid={initialValue} btnName="上传文件" uploadProps={{ disabled: readonly }} />
+            </Form.Item>
+        )
+    }
 
 
-    //公示-中标候选人遍历
-    const suppliersRender = (suppliers: any[] | null, readonly: boolean) => {
-        if (isNotEmpty(suppliers)) {
+    //公示-标段（包）遍历
+    const sectionsRender = (sections: any[] | null, readonly: boolean) => {
+        if (isNotEmpty(sections)) {
             const activeKeyList = (length: number) => {
                 const list: number[] = []
                 for (let i = 0; i < length; i++) {
@@ -139,7 +156,7 @@ const PublicPlatform: React.FC<{}> = () => {
                 }
                 return list;
             }
-            return suppliers?.map((item, index) => (
+            return sections?.map((item, index) => (
                 <Descriptions bordered key={index}>
                     <Descriptions.Item label="标段（包）名称" span={2} key="1">
                         {item.bidSectName}
@@ -152,7 +169,7 @@ const PublicPlatform: React.FC<{}> = () => {
                             defaultActiveKey={isNotEmpty(item.suppliers) ? activeKeyList(item.suppliers.length) : []}
                             expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} />}
                         >
-                            {sectionsRender(item.suppliers, readonly)}
+                            {suppliersRender(item.suppliers, readonly)}
                         </Collapse>
                     </Descriptions.Item>
                 </Descriptions>
@@ -161,10 +178,10 @@ const PublicPlatform: React.FC<{}> = () => {
         return null;
     }
 
-    //公示-标段（包）遍历
-    const sectionsRender = (sections: any[] | null, readonly: boolean) => {
-        if (isNotEmpty(sections)) {
-            return sections?.map((item, index) => (
+    //公示-中标候选人遍历
+    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 }], "项目负责人证件号码")}
@@ -178,18 +195,27 @@ const PublicPlatform: React.FC<{}> = () => {
         }
         return null;
     }
-    //项目
-    const projectRender = (project: any, readonly: boolean) => {
-        if (typeof project === 'object') {
+    //项目信息
+    const projectRender = (project: any, tenderer: any, readonly: boolean) => {
+        if (isNotEmpty(project) && isNotEmpty(tenderer)) {
+            const rel: boolean = readonly || project.readonly;
             return (
                 <>
-                    {returnInput("name", "纳税人名称", project.readonly, null, [{ required: true }], "纳税人名称")}
-                    {returnInput("code", "纳税人识别号", false, null, [{ required: true }], "纳税人识别号")}
-                    {returnArea("projectScale", "项目规模", false, null, [{ required: true }], "项目规模")}
-                    {returnArea("tenderContent", "招标内容与范围及招标方案说明", false, null, [{ required: true }], "招标内容与范围及招标方案说明")}
+                    {returnInput("name", "纳税人名称", rel, tenderer.name, [{ required: !rel }], "纳税人名称")}
+                    {returnInput("code", "纳税人识别号", rel, tenderer.code, [{ required: !rel }], "纳税人识别号")}
+                    {returnArea("projectScale", "项目规模", rel, project.projectScale, [{ required: !rel }], "项目规模")}
+                    {returnArea("tenderContent", "招标内容与范围及招标方案说明", rel, project.tenderContent, [{ required: !rel }], "招标内容与范围及招标方案说明")}
                 </>
             )
         }
+        return null;
+    }
+    //公告&公示信息
+    const annoRender = (anno: any, readonly: boolean) => {
+        if (isNotEmpty(anno)) {
+            return returnUpload("ctpspFileid", "PDF公示文件", readonly, anno.ctpspFileid, [{ required: !readonly }])
+        }
+        return null;
     }
 
     const onSave = () => {
@@ -234,7 +260,16 @@ const PublicPlatform: React.FC<{}> = () => {
     };
 
     useEffect(() => {
-        setInitialData(defaultData);
+        //获取公共服务平台数据
+        getPublicData('1516966126268026880').then(res => {
+            if (res?.code == 200) {
+                const data = res?.data
+                setInitialData(data);
+                if (isNotEmpty(data.anno)) {
+                    setReadOnly(data.anno.status != 1 && data.anno.status != 4)
+                }
+            }
+        })
     }, []);
 
     return (
@@ -271,14 +306,14 @@ const PublicPlatform: React.FC<{}> = () => {
                                         id="panel1"
                                         key="1"
                                     >
-
+                                        {projectRender(initialData?.project, initialData?.tenderer, readOnly)}
                                     </Panel>
                                     <Panel
                                         header={<Text strong>中标候选人信息</Text>}
                                         id="panel2"
                                         key="2"
                                     >
-
+                                        {sectionsRender(initialData?.sections, readOnly)}
                                     </Panel>
                                     <Panel
                                         header={<Text strong>公告信息</Text>}
@@ -292,7 +327,7 @@ const PublicPlatform: React.FC<{}> = () => {
                                         id="panel4"
                                         key="4"
                                     >
-
+                                        {annoRender(initialData?.anno, readOnly)}
                                     </Panel>
                                 </Collapse>
                             </Form>
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

From 94792e8b83bb511faf8491d6f328dcd45eff6116 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Sat, 23 Apr 2022 22:07:05 +0800
Subject: [PATCH 06/16] =?UTF-8?q?4.23=20=E8=B0=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PublicPlatform.tsx             | 162 +++++++-----------
 1 file changed, 63 insertions(+), 99 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
index 8b42f02..062435b 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
@@ -2,12 +2,12 @@ import React, { useEffect, useState } from 'react';
 import logo from '@/images/opening/logo.svg';
 import styles from './style.less';
 import './style.less';
-import { Affix, Anchor, BackTop, Button, Checkbox, Col, Collapse, DatePicker, Descriptions, Divider, Form, Input, InputNumber, Layout, message, Modal, PageHeader, Radio, Row, Select, Space, Spin, Tag, Timeline, Tooltip, Typography } from 'antd';
+import { Anchor, BackTop, Button, Collapse, Descriptions, Form, Input, message, PageHeader, Space, Spin, Typography } from 'antd';
 import { btnAuthority } from '@/utils/authority';
-import { ArrowUpOutlined, CaretRightOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
+import { ArrowUpOutlined, CaretRightOutlined } from '@ant-design/icons';
 import { isNotEmpty } from '@/utils/CommonUtils';
 import ExtendUpload from '@/utils/ExtendUpload';
-import { getPublicData } from '../service';
+import { getPublicData, savePublicData } from '../service';
 
 const layout = {
     labelCol: {
@@ -22,59 +22,6 @@ const validateMessages = {
     required: '请填写当前项内容',
 };
 
-const defaultData = {
-    data: {
-        "project": {
-            "id": "",
-            "projectName": "",
-            "projectScale": "",
-            "tenderContent": "",
-            "tenderCode": "",
-            "readonly": false
-        },
-        "sections": [
-            {
-                "id": "",
-                "projectId": "",
-                "bidSectBizNum": "",
-                "bidSectCode": "",
-                "bidSectName": "",
-                "suppliers": [
-                    {
-                        "id": "",
-                        "projectId": "",
-                        "sectionId": "",
-                        "assessRoomId": "",
-                        "assessRoomSort": 0,
-                        "companyId": "",
-                        "companyName": "",
-                        "sort": "",
-                        "quality": "",
-                        "evaluationStatus": "",
-                        "winCandidateQualification": "",
-                        "timeLimit": 0,
-                        "pmName": "",
-                        "pmCode": "",
-                        "pmCeritficates": ""
-                    }
-                ]
-            }
-        ],
-        "anno": {
-            "id": "",
-            "annoNature": 0,
-            "hasCtpsp": false,
-            "ctpspFileid": "",
-            "status": 0
-        },
-        "tenderer": {
-            "id": "",
-            "code": "",
-            "name": ""
-        }
-    }
-}
-
 const PublicPlatform: React.FC<{}> = () => {
     //loading
     const [loading, setLoading] = useState<boolean>(false);
@@ -84,6 +31,8 @@ const PublicPlatform: React.FC<{}> = () => {
     const [initialData, setInitialData] = useState<any>({});
     //只读状态readOnly 默认只读
     const [readOnly, setReadOnly] = useState<boolean>(true);
+    //公示or公告 true-公示 false-公告
+    const [annoType, setAnnoType] = useState<boolean>(false);
 
     const { TextArea } = Input;
     const { Panel } = Collapse;
@@ -144,8 +93,6 @@ const PublicPlatform: React.FC<{}> = () => {
             </Form.Item>
         )
     }
-
-
     //公示-标段（包）遍历
     const sectionsRender = (sections: any[] | null, readonly: boolean) => {
         if (isNotEmpty(sections)) {
@@ -177,7 +124,6 @@ const PublicPlatform: React.FC<{}> = () => {
         }
         return null;
     }
-
     //公示-中标候选人遍历
     const suppliersRender = (suppliers: any[] | null, readonly: boolean) => {
         if (isNotEmpty(suppliers)) {
@@ -213,38 +159,60 @@ const PublicPlatform: React.FC<{}> = () => {
     //公告&公示信息
     const annoRender = (anno: any, readonly: boolean) => {
         if (isNotEmpty(anno)) {
-            return returnUpload("ctpspFileid", "PDF公示文件", readonly, anno.ctpspFileid, [{ required: !readonly }])
+            return returnUpload("ctpspFileId", "PDF公示文件", readonly, anno.ctpspFileId, [{ required: !readonly }])
         }
         return null;
     }
-
+    //保存方法
     const onSave = () => {
         form.validateFields()
             .then(values => {
-                console.log('success', values)
-                /*
-              values:
-                {
-                  username: 'username',
-                  password: 'password',
+                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(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)
-                /*
-                errorInfo:
-                  {
-                    values: {
-                      username: 'username',
-                      password: 'password',
-                    },
-                    errorFields: [
-                      { name: ['password'], errors: ['Please input your Password!'] },
-                    ],
-                    outOfDate: false,
-                  }
-                */
             });
     };
 
@@ -260,15 +228,19 @@ const PublicPlatform: React.FC<{}> = () => {
     };
 
     useEffect(() => {
+        setLoading(true);
         //获取公共服务平台数据
         getPublicData('1516966126268026880').then(res => {
             if (res?.code == 200) {
-                const data = res?.data
+                const data = res?.data;
                 setInitialData(data);
                 if (isNotEmpty(data.anno)) {
-                    setReadOnly(data.anno.status != 1 && data.anno.status != 4)
+                    setAnnoType(data.anno.annoNature === 201);
+                    setReadOnly(data.anno.status != 1 && data.anno.status != 4);
                 }
             }
+        }).finally(() => {
+            setLoading(false);
         })
     }, []);
 
@@ -284,8 +256,8 @@ const PublicPlatform: React.FC<{}> = () => {
                 <PageHeader
                     title={
                         <Space>
-                            <Button type='primary' key='save' onClick={() => onSave()}>保存</Button>
-                            <Button key='close' onClick={() => { }}>关闭</Button>
+                            <Button type='primary' key='save' hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} onClick={() => onSave()}>保存</Button>
+                            <Button key='close' onClick={() => window.close()}>关闭</Button>
                         </Space>
                     }
                 />
@@ -296,7 +268,7 @@ const PublicPlatform: React.FC<{}> = () => {
                             title={<Text strong>公共服务平台</Text>}
                         />
                         <div style={{ height: innerHeight - 180, overflowY: 'auto' }} ref={setContainer}>
-                            <Form {...layout} form={form} scrollToFirstError name="public-platform" className="noticeFile-label" validateMessages={validateMessages}>
+                            <Form {...layout} form={form} scrollToFirstError name="public-platform" validateMessages={validateMessages}>
                                 <Collapse
                                     defaultActiveKey={['1', '2', '3', '4']}
                                     expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} />}
@@ -308,25 +280,18 @@ const PublicPlatform: React.FC<{}> = () => {
                                     >
                                         {projectRender(initialData?.project, initialData?.tenderer, readOnly)}
                                     </Panel>
-                                    <Panel
+                                    {annoType && <Panel
                                         header={<Text strong>中标候选人信息</Text>}
                                         id="panel2"
                                         key="2"
                                     >
                                         {sectionsRender(initialData?.sections, readOnly)}
-                                    </Panel>
+                                    </Panel>}
                                     <Panel
-                                        header={<Text strong>公告信息</Text>}
+                                        header={<Text strong>{annoType ? "公示信息" : "公告信息"}</Text>}
                                         id="panel3"
                                         key="3"
                                     >
-
-                                    </Panel>
-                                    <Panel
-                                        header={<Text strong>公示信息</Text>}
-                                        id="panel4"
-                                        key="4"
-                                    >
                                         {annoRender(initialData?.anno, readOnly)}
                                     </Panel>
                                 </Collapse>
@@ -338,9 +303,8 @@ const PublicPlatform: React.FC<{}> = () => {
                             {container && (
                                 <Anchor getContainer={() => container} style={{ overflow: 'hidden' }} onClick={handleClick}>
                                     <Link href="#panel1" title="项目信息" />
-                                    <Link href="#panel2" title="中标候选人信息" />
-                                    <Link href="#panel3" title="公告信息" />
-                                    <Link href="#panel4" title="公示信息" />
+                                    {annoType && <Link href="#panel2" title="中标候选人信息" />}
+                                    <Link href="#panel3" title={annoType ? "公示信息" : "公告信息"} />
                                 </Anchor>
                             )}
                         </div>

From d89fe1fe116e24cd36a5bf64b1e4439b9c83e8d2 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Mon, 25 Apr 2022 14:40:36 +0800
Subject: [PATCH 07/16] =?UTF-8?q?4.25=20=E5=85=AC=E5=85=B1=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=B9=B3=E5=8F=B0=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BiddingAnnouncementList.tsx    |  13 ++
 .../components/PublicPlatform.tsx             |  57 ++++--
 .../Calibration/BidPublicityResult/index.tsx  |   7 +
 .../ExceptionHandling/ExceptionHandling.tsx   | 132 +++++++------
 .../BiddingAnnouncementList.tsx               | 181 ++++++++++--------
 .../BiddingAnnouncementList.tsx               |  19 +-
 .../Calibration/BidPublicityResult/index.tsx  |  19 +-
 7 files changed, 253 insertions(+), 175 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
index fc23162..526a988 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
@@ -18,6 +18,7 @@ import { history } from "umi";
 import { btnAuthority } from "@/utils/authority";
 import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
+import { isEmpty } from "@/utils/CommonUtils"
 
 /*
 * 招标公告开始
@@ -157,6 +158,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -166,6 +168,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn3 = (
@@ -175,6 +178,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn4 = (
@@ -184,6 +188,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -193,6 +198,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button type="text" onClick={() => toChange(record)}>变更</Button>
           </>
         );
@@ -204,6 +210,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
 
@@ -271,6 +278,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -280,6 +288,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn3 = (
@@ -289,6 +298,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn4 = (
@@ -298,6 +308,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -307,6 +318,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn6 = (
@@ -316,6 +328,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
 
diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
index 062435b..cb5c29f 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
@@ -5,9 +5,10 @@ import './style.less';
 import { Anchor, BackTop, Button, Collapse, Descriptions, Form, Input, message, PageHeader, Space, Spin, Typography } from 'antd';
 import { btnAuthority } from '@/utils/authority';
 import { ArrowUpOutlined, CaretRightOutlined } from '@ant-design/icons';
-import { isNotEmpty } from '@/utils/CommonUtils';
+import { getURLInformation, isNotEmpty, returnDictVal } from '@/utils/CommonUtils';
 import ExtendUpload from '@/utils/ExtendUpload';
 import { getPublicData, savePublicData } from '../service';
+import { getDicData } from '@/utils/session';
 
 const layout = {
     labelCol: {
@@ -33,6 +34,11 @@ const PublicPlatform: React.FC<{}> = () => {
     const [readOnly, setReadOnly] = useState<boolean>(true);
     //公示or公告 true-公示 false-公告
     const [annoType, setAnnoType] = useState<boolean>(false);
+    //annoId
+    const annoId = getURLInformation("id");
+    //获取字典
+    const getDict: any = getDicData();
+    const dictData = JSON.parse(getDict);
 
     const { TextArea } = Input;
     const { Panel } = Collapse;
@@ -89,7 +95,7 @@ const PublicPlatform: React.FC<{}> = () => {
                 rules={rules}
                 extra={extra}
             >
-                <ExtendUpload bid={initialValue} btnName="上传文件" uploadProps={{ disabled: readonly }} />
+                <ExtendUpload bid={initialValue} btnName="上传文件" uploadProps={{ disabled: readonly, accept: ".pdf" }} />
             </Form.Item>
         )
     }
@@ -142,13 +148,20 @@ const PublicPlatform: React.FC<{}> = () => {
         return null;
     }
     //项目信息
-    const projectRender = (project: any, tenderer: any, readonly: boolean) => {
-        if (isNotEmpty(project) && isNotEmpty(tenderer)) {
+    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("name", "纳税人名称", rel, tenderer.name, [{ required: !rel }], "纳税人名称")}
-                    {returnInput("code", "纳税人识别号", rel, tenderer.code, [{ required: !rel }], "纳税人识别号")}
+                    {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 }], "项目规模")}
                     {returnArea("tenderContent", "招标内容与范围及招标方案说明", rel, project.tenderContent, [{ required: !rel }], "招标内容与范围及招标方案说明")}
                 </>
@@ -228,20 +241,24 @@ const PublicPlatform: React.FC<{}> = () => {
     };
 
     useEffect(() => {
-        setLoading(true);
-        //获取公共服务平台数据
-        getPublicData('1516966126268026880').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);
+        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);
-        })
+            }).finally(() => {
+                setLoading(false);
+            })
+        } else {
+            message.error('获取公共服务平台数据失败，请联系管理员');
+        }
     }, []);
 
     return (
@@ -278,7 +295,7 @@ const PublicPlatform: React.FC<{}> = () => {
                                         id="panel1"
                                         key="1"
                                     >
-                                        {projectRender(initialData?.project, initialData?.tenderer, readOnly)}
+                                        {projectRender(initialData?.project, initialData?.tenderer, initialData?.agency, initialData?.projectRecord, readOnly)}
                                     </Panel>
                                     {annoType && <Panel
                                         header={<Text strong>中标候选人信息</Text>}
diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx
index 9e957d4..26f5c62 100644
--- a/src/pages/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/Calibration/BidPublicityResult/index.tsx
@@ -18,6 +18,7 @@ import { btnAuthority } from "@/utils/authority";
 import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
 import { releaseNoticeOffline } from "@/pages/Bid/BiddingAnnouncement/service"
+import { isEmpty } from "@/utils/CommonUtils"
 
 /*
 * 招标公示开始
@@ -156,6 +157,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>&nbsp;&nbsp;
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>&nbsp;&nbsp;
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -165,6 +167,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn3 = (
@@ -174,6 +177,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn4 = (
@@ -183,6 +187,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -192,6 +197,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Popconfirm
               title={`确定要${name5}结束吗？`}
               onConfirm={async () => {
@@ -218,6 +224,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + 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..852317e 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
@@ -1,4 +1,5 @@
 import { btnAuthority } from '@/utils/authority';
+import { isEmpty } from '@/utils/CommonUtils';
 import SeleApprovalProcess from '@/utils/SeleApprovalProcess';
 import { getApprProcessList } from '@/utils/SeleApprovalProcess/service';
 import { getDicData, getProId } from '@/utils/session';
@@ -67,17 +68,17 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
     methodDict == 'procurement_mode_1' || methodDict == 'procurement_mode_2'
       ? '标段'
       : methodDict == 'procurement_mode_4'
-      ? '包件'
-      : '采购包';
+        ? '包件'
+        : '采购包';
   useEffect(() => {
-    if(drawerVisible) {
+    if (drawerVisible) {
       //初始化字典
       const data: any = getDicData();
       setDictData(JSON.parse(data));
       //存储项目数据
       setProjectData(values);
     }
-  }, [values?.id,drawerVisible]);
+  }, [values?.id, drawerVisible]);
 
   const getSectionList = async (param: any, id: any) => {
     let params = {
@@ -193,15 +194,15 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
   };
   //公告提交审批
   const toApproval = async (param: any) => {
-    if(param.sendMessageId == null) {
+    if (param.sendMessageId == null) {
       message.info("请先编辑失败公告")
     } else {
       setLoading(true);
       //获取流程列表
       getApprProcessList(param.sendMessageId).then(res => {
-        if(res?.code == 200) {
+        if (res?.code == 200) {
           const data = res?.data
-          if(data?.approval == true) {//打开选择流程界面
+          if (data?.approval == true) {//打开选择流程界面
             setRecordData(param)
             setApprovalData(data?.list)
             setApprovalVisible(true)
@@ -237,7 +238,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
   const toApprovalFor = async (record: any) => {
     setLoading(true)
     await getApprovalFor(record.sendMessageId).then(res => {
-      if(res?.code == 200 || res?.success == true) {
+      if (res?.code == 200 || res?.success == true) {
         const data = res?.data;
         let durl = /http:\/\/([^\/]+)\//i;
         let d = data?.traceDetailUrl?.replace(durl, '/');
@@ -309,10 +310,10 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
         //按钮逻辑判断
         record.status == 0 && record.sendMessageStatus == 7 ? ( //草稿-无需发布
           <>
-            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               编辑
             </Button>
-            <Button type="text" key="4" onClick={() => toTakeEffect(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="4" onClick={() => toTakeEffect(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               生效
             </Button>
             <Popconfirm
@@ -321,7 +322,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
               okText="确定"
               cancelText="取消"
             >
-              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+              <Button type="text" key="3" hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
                 删除
               </Button>
             </Popconfirm>
@@ -334,10 +335,10 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
           (record.sendMessageStatus == 0 ||
             record.sendMessageStatus == 1) ? ( //草稿-公告未编辑-公告已编辑
           <>
-            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="1" onClick={() => toEdit(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               编辑
             </Button>
-            <Button type="text" key="5" onClick={() => toEditNotice(record)} hidden={btnAuthority(["ebtp-agency-project-manager","ebtp-purchase"])}>
+            <Button type="text" key="5" onClick={() => toEditNotice(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               编辑失败公告
             </Button>
             <Popconfirm
@@ -346,24 +347,25 @@ 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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
             <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)}>
@@ -372,20 +374,21 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
             <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)}>
@@ -400,54 +403,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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
             <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)}>
               查看审批流程
-          </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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
+            <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)}>
               查看
@@ -458,9 +463,10 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
           </>
         ) : record.status == 0 && record.sendMessageStatus == 6 ? ( //草稿-公告发布失败
           <>
@@ -479,17 +485,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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
             <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>
@@ -505,6 +512,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
           </>
         ) : null,
     },
@@ -538,7 +546,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 +568,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 +642,13 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
         projectData={values}
       />}
       {approvalVisible ? (
-          <SeleApprovalProcess modalVisible={approvalVisible} onCancel={() => {
-            setApprovalVisible(false)
-            setApprovalData([])
-            setRecordData({})
-            actionRef.current?.reload?.();
-          }} data={approvalData} annoId={recordData?.sendMessageId} />
-        ) : null}
+        <SeleApprovalProcess modalVisible={approvalVisible} onCancel={() => {
+          setApprovalVisible(false)
+          setApprovalData([])
+          setRecordData({})
+          actionRef.current?.reload?.();
+        }} data={approvalData} annoId={recordData?.sendMessageId} />
+      ) : null}
     </Drawer>
   );
 };
diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index 07d3987..eb63abc 100644
--- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
+++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
@@ -1,7 +1,7 @@
-import {UnorderedListOutlined} from "@ant-design/icons"
-import ProTable, {ActionType, ProColumns} from "@ant-design/pro-table"
-import {Button, Card, Divider, Drawer, message, Modal, Spin, Table} from "antd"
-import React, {useEffect, useRef, useState} from "react"
+import { UnorderedListOutlined } from "@ant-design/icons"
+import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table"
+import { Button, Card, Divider, Drawer, message, Modal, Spin, Table } from "antd"
+import React, { useEffect, useRef, useState } from "react"
 import BiddingAnnouncement from "./components/BiddingAnnouncement"
 import BiddingAnnouncement4Change from "./components/BiddingAnnouncement4Change"
 import {
@@ -14,11 +14,12 @@ import {
   GetNoticeUsablePackage, releaseNoticeOffline, getApprovalFor
 } from "./service"
 
-import {getProId, getProMethod} from "@/utils/session";
-import {checkConflict} from "@/pages/Bid/BiddingAnnouncement/service";
-import {btnAuthority} from "@/utils/authority";
+import { getProId, getProMethod } from "@/utils/session";
+import { checkConflict } from "@/pages/Bid/BiddingAnnouncement/service";
+import { btnAuthority } from "@/utils/authority";
 import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
+import { isEmpty } from "@/utils/CommonUtils"
 
 /*
 * 资审公告开始
@@ -124,36 +125,40 @@ 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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
-          </>
-        );
-        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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+          </>
+        );
+        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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         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 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>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
         let btn5 = (
@@ -162,17 +167,19 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <Button  type="text" onClick={() => toChange(record)}>变更</Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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 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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
 
@@ -201,12 +208,12 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
 
     },
   ];
-  const ChangeNoticeListcolumns:any = [
+  const ChangeNoticeListcolumns: any = [
     {
       title: '公告标题',
       dataIndex: 'annoTitle',
       align: 'left',
-      valueType:"text"
+      valueType: "text"
     },
     {
       title: '起草时间',
@@ -222,13 +229,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,9 +245,10 @@ 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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
         let btn2 = (
@@ -249,25 +257,28 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         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 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>
-            <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
         let btn5 = (
@@ -276,15 +287,17 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         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 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>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
 
@@ -328,7 +341,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 +359,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 +378,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 +492,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
         }
       }
       setRefresh(Math.random() + 1);
-    }).finally(()=>setPageloading(false));
+    }).finally(() => setPageloading(false));
   };
   /**
    * 再次发布
@@ -526,9 +539,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 +562,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 +577,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 +618,47 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           centered
           closable={false}
           // bodyStyle={{margin:0,padding:0}}
-          footer={[ <Button onClick={()=>setChangeNoticeListVisible(false)}>关闭 </Button>]}
+          footer={[<Button onClick={() => setChangeNoticeListVisible(false)}>关闭 </Button>]}
         >
           <ProTable
             toolBarRender={() => [
-              <Button hidden={btnAuthority(['ebtp-agency-project-manager','ebtp-purchase'])} type="primary"  onClick={() => creatChangeNotice()}>新增变更公告</Button>,
+              <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="primary" onClick={() => creatChangeNotice()}>新增变更公告</Button>,
             ]}
             size={"small"}
             search={false}
             options={false}
             columns={ChangeNoticeListcolumns}
             dataSource={ChangeNoticeListdataSource}
-            pagination={{hideOnSinglePage: true, pageSize: 50}}
+            pagination={{ hideOnSinglePage: true, pageSize: 50 }}
             loading={pageloading}
           />
         </Modal>
       ) : null}
-        {updateVisible ? (
-          <BiddingAnnouncement key={Math.random()} SX={() => setRefresh(Math.random() + 1)} titleName={updateChange}
-                               pkId={pkId} type={type} tpId={tpId}
-                               onCancel={() => setUpdateVisible(false)} modalVisible={updateVisible} FpkId={FpkId}
-                               ChangeSX={() => GetList(FpkId)}/>
-        ) : null}
-        {updateVisible4Change ? (
-          <BiddingAnnouncement4Change key={Math.random()} SX={() => setRefresh(Math.random() + 1)}
-                                      titleName={updateChange} pkId={pkId} type={type} tpId={tpId}
-                                      onCancel={() => setUpdateVisible4Change(false)}
-                                      modalVisible={updateVisible4Change} FpkId={FpkId}
-                                      ChangeSX={() => GetList(FpkId)}/>
-        ) : null}
-        {approvalVisible ? (
-          <SeleApprovalProcess modalVisible={approvalVisible} onCancel={() => {
-            setApprovalVisible(false)
-            setApprovalData([])
-            setRecordData({})
-            if (type == "change" || type == "changeNew") {
-              GetList(FpkId);
-            } else {
-              setRefresh(Math.random() + 1)
-            }
-          }} data={approvalData} annoId={recordData?.id} />
-        ) : null}
+      {updateVisible ? (
+        <BiddingAnnouncement key={Math.random()} SX={() => setRefresh(Math.random() + 1)} titleName={updateChange}
+          pkId={pkId} type={type} tpId={tpId}
+          onCancel={() => setUpdateVisible(false)} modalVisible={updateVisible} FpkId={FpkId}
+          ChangeSX={() => GetList(FpkId)} />
+      ) : null}
+      {updateVisible4Change ? (
+        <BiddingAnnouncement4Change key={Math.random()} SX={() => setRefresh(Math.random() + 1)}
+          titleName={updateChange} pkId={pkId} type={type} tpId={tpId}
+          onCancel={() => setUpdateVisible4Change(false)}
+          modalVisible={updateVisible4Change} FpkId={FpkId}
+          ChangeSX={() => GetList(FpkId)} />
+      ) : null}
+      {approvalVisible ? (
+        <SeleApprovalProcess modalVisible={approvalVisible} onCancel={() => {
+          setApprovalVisible(false)
+          setApprovalData([])
+          setRecordData({})
+          if (type == "change" || type == "changeNew") {
+            GetList(FpkId);
+          } else {
+            setRefresh(Math.random() + 1)
+          }
+        }} data={approvalData} annoId={recordData?.id} />
+      ) : null}
     </div>
   )
 }
diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index 865bc6c..3e76da1 100644
--- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
+++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
@@ -19,6 +19,7 @@ import { checkConflict } from "@/pages/Bid/BiddingAnnouncement/service";
 import { btnAuthority } from "@/utils/authority";
 import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
+import { isEmpty } from "@/utils/CommonUtils"
 
 /*
 * 招标公告开始
@@ -117,6 +118,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -126,6 +128,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn3 = (
@@ -135,6 +138,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn4 = (
@@ -144,6 +148,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -153,6 +158,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <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}
@@ -166,6 +172,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
 
@@ -254,6 +261,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -263,6 +271,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn3 = (
@@ -272,6 +281,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn4 = (
@@ -281,6 +291,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -290,6 +301,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn6 = (
@@ -299,6 +311,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
 
@@ -527,13 +540,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..b22ece3 100644
--- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
@@ -17,6 +17,7 @@ import { getProId } from "@/utils/session";
 import { btnAuthority } from "@/utils/authority";
 import { getApprProcessList } from "@/utils/SeleApprovalProcess/service"
 import SeleApprovalProcess from "@/utils/SeleApprovalProcess"
+import { isEmpty } from "@/utils/CommonUtils"
 
 /*
 * 招标公示开始
@@ -69,15 +70,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,6 +111,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>&nbsp;&nbsp;
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>&nbsp;&nbsp;
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -119,6 +121,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn3 = (
@@ -128,6 +131,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn4 = (
@@ -137,6 +141,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
             <Button type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -146,6 +151,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
         let btn6 = (
@@ -155,6 +161,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
           </>
         );
 
@@ -317,9 +324,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)

From 606e45a92f15fd3c67b39238c1ce784486d9a8c8 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Wed, 27 Apr 2022 09:07:48 +0800
Subject: [PATCH 08/16] =?UTF-8?q?4.27=20=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=8A=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PublicPlatform.tsx             | 65 +++++++++++++++----
 .../BiddingAnnouncement/components/style.less | 45 +++++++------
 .../BiddingAnnouncementList.tsx               | 24 +++----
 3 files changed, 89 insertions(+), 45 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
index cb5c29f..9982a6a 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
@@ -8,7 +8,8 @@ import { ArrowUpOutlined, CaretRightOutlined } from '@ant-design/icons';
 import { getURLInformation, isNotEmpty, returnDictVal } from '@/utils/CommonUtils';
 import ExtendUpload from '@/utils/ExtendUpload';
 import { getPublicData, savePublicData } from '../service';
-import { getDicData } from '@/utils/session';
+import { getDefId, getDicData, getProMethod } from '@/utils/session';
+import { getAllFlowNameByRoomType } from '@/utils/FlowUtils';
 
 const layout = {
     labelCol: {
@@ -34,8 +35,16 @@ const PublicPlatform: React.FC<{}> = () => {
     const [readOnly, setReadOnly] = useState<boolean>(true);
     //公示or公告 true-公示 false-公告
     const [annoType, setAnnoType] = useState<boolean>(false);
-    //annoId
+    //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);
@@ -67,7 +76,7 @@ const PublicPlatform: React.FC<{}> = () => {
         )
     }
     //TextArea
-    function returnArea(name: string | string[], label: string, readonly: boolean, initialValue: string | null, rules?: any[], placeholder?: string, extra?: React.ReactNode) {
+    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}
@@ -78,7 +87,9 @@ const PublicPlatform: React.FC<{}> = () => {
             >
                 <TextArea
                     bordered={!readonly}
+                    showCount={!readonly}
                     readOnly={readonly}
+                    maxLength={maxLength ? maxLength : 2000}
                     rows={3}
                     autoSize={readonly}
                     placeholder={placeholder}
@@ -95,7 +106,7 @@ const PublicPlatform: React.FC<{}> = () => {
                 rules={rules}
                 extra={extra}
             >
-                <ExtendUpload bid={initialValue} btnName="上传文件" uploadProps={{ disabled: readonly, accept: ".pdf" }} />
+                <ExtendUpload bid={initialValue} btnName="上传文件" maxCount={1} uploadProps={{ disabled: readonly, accept: ".pdf" }} />
             </Form.Item>
         )
     }
@@ -140,8 +151,8 @@ const PublicPlatform: React.FC<{}> = () => {
                     {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, item.timeLimit, [{ required: !readonly }], "工期/交货期/服务期", null, 200, "number", "天")}
+                    {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 }], "天数", null, 100, readonly ? void 0 : "number", readonly ? null : "天")}
                 </Panel>
             ))
         }
@@ -162,7 +173,7 @@ const PublicPlatform: React.FC<{}> = () => {
                     {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 }], "项目规模")}
+                    {returnArea("projectScale", "项目规模", rel, project.projectScale, [{ required: !rel }], "项目规模", null, 500)}
                     {returnArea("tenderContent", "招标内容与范围及招标方案说明", rel, project.tenderContent, [{ required: !rel }], "招标内容与范围及招标方案说明")}
                 </>
             )
@@ -172,7 +183,37 @@ const PublicPlatform: React.FC<{}> = () => {
     //公告&公示信息
     const annoRender = (anno: any, readonly: boolean) => {
         if (isNotEmpty(anno)) {
-            return returnUpload("ctpspFileId", "PDF公示文件", readonly, anno.ctpspFileId, [{ required: !readonly }])
+            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;
     }
@@ -203,7 +244,7 @@ const PublicPlatform: React.FC<{}> = () => {
                     for (const item of data?.sections) {
                         if (isNotEmpty(item.suppliers)) {
                             for (const val of item.suppliers) {
-                                const formData: any = form.getFieldValue(val.id);
+                                const formData: any = form.getFieldValue([item.id, val.id]);
                                 val.pmName = formData.pmName;
                                 val.pmCode = formData.pmCode;
                                 val.pmCeritficates = formData.pmCeritficates;
@@ -273,7 +314,7 @@ const PublicPlatform: React.FC<{}> = () => {
                 <PageHeader
                     title={
                         <Space>
-                            <Button type='primary' key='save' hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} onClick={() => onSave()}>保存</Button>
+                            {!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>
                     }
@@ -282,9 +323,9 @@ const PublicPlatform: React.FC<{}> = () => {
                 <div style={{ padding: '0px 24px' }}>
                     <div style={{ width: '85%', float: 'left', borderRadius: '8px', }}>
                         <PageHeader
-                            title={<Text strong>公共服务平台</Text>}
+                            title={<Text strong>公共服务平台信息</Text>}
                         />
-                        <div style={{ height: innerHeight - 180, overflowY: 'auto' }} ref={setContainer}>
+                        <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']}
diff --git a/src/pages/Bid/BiddingAnnouncement/components/style.less b/src/pages/Bid/BiddingAnnouncement/components/style.less
index ad76772..70c1227 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/style.less
+++ b/src/pages/Bid/BiddingAnnouncement/components/style.less
@@ -1,25 +1,25 @@
 @import '~antd/lib/style/themes/default.less';
 
-.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%);
-    }
+.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;/*设置阴影,可以自定义参数*/
+.card-onmouse:hover {
+  box-shadow: 8px 8px 5px #9e9e9e; /*设置阴影,可以自定义参数*/
 }
 .header {
   display: flex;
@@ -70,16 +70,19 @@
     color: rgb(255, 255, 255);
   }
   .ant-affix {
-    top: 134px !important;
+    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;
-  font-size: 14px;
+}
+.public-platform .ant-form-item {
+  margin-bottom: 22px;
 }
diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index eb63abc..7b7ce2a 100644
--- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
+++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
@@ -127,7 +127,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -137,7 +137,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
           </>
         );
         let btn3 = (
@@ -147,7 +147,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
           </>
         );
         let btn4 = (
@@ -157,7 +157,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -167,7 +167,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
             <Button type="text" onClick={() => toChange(record)}>变更</Button>
           </>
         );
@@ -179,7 +179,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
           </>
         );
 
@@ -247,7 +247,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -257,7 +257,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
           </>
         );
         let btn3 = (
@@ -267,7 +267,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
           </>
         );
         let btn4 = (
@@ -277,7 +277,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleRemove(record)}>删除</Button>
           </>
         );
@@ -287,7 +287,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
           </>
         );
         let btn6 = (
@@ -297,7 +297,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
           </>
         );
 

From 3182b11ff4ad27a6d290b615fa314dc28944e8f9 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 5 May 2022 15:05:44 +0800
Subject: [PATCH 09/16] =?UTF-8?q?5.5=20=E4=BF=AE=E6=94=B9=E5=8D=95?=
 =?UTF-8?q?=E8=BD=AE=E6=8B=9B=E5=8B=9F=E5=92=8C=E5=A4=9A=E8=BD=AE=E6=8B=9B?=
 =?UTF-8?q?=E5=8B=9F=E5=85=AC=E7=A4=BA=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Calibration/BidPublicityResult/index.tsx  | 20 +++++++++----------
 .../Calibration/BidPublicityResult/index.tsx  | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx
index 9e957d4..9e89a66 100644
--- a/src/pages/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/Calibration/BidPublicityResult/index.tsx
@@ -52,7 +52,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 +62,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 = "采购包";
@@ -282,7 +282,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 +293,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 +440,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/ZZhaoMu/Calibration/BidPublicityResult/index.tsx b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
index fd4e4c1..bd30a51 100644
--- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
@@ -69,15 +69,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: '' },
@@ -219,7 +219,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
         if (res.data.length == 0) {
           message.warn("没有可关联的包件！")
         } else {
-          setUpdateChange('新建中选候选人公示')
+          setUpdateChange('新增招募结果公示')
           setType("new");
           setUpdateVisible(true);
         }
@@ -231,14 +231,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 +317,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 +358,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}

From 9eba94ed191714ff4f486d476a519dd4f9d5ab45 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Mon, 9 May 2022 15:12:50 +0800
Subject: [PATCH 10/16] =?UTF-8?q?5.9=20=E4=BF=AE=E6=94=B9=E9=BB=91?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E7=AD=89=E7=BA=A7=E6=98=BE=E7=A4=BA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ViewBlacklistFormModal.tsx                | 9 +--------
 .../components/ViewInvoiceFormModal.tsx                  | 5 +----
 2 files changed, 2 insertions(+), 12 deletions(-)

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',

From 44bb739e3e8d430d2b878fcaf13c7d459fe64460 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Mon, 9 May 2022 15:30:04 +0800
Subject: [PATCH 11/16] =?UTF-8?q?5.9=20=E6=BE=84=E6=B8=85=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=85=AC=E5=91=8A=E6=97=B6=E9=97=B4=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0roomType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ClarifyTheList/components/ClarifyTheList.tsx           | 3 ++-
 src/pages/Tender/ProjectManager/ClarifyTheList/service.ts  | 7 ++++---
 .../ClarifyTheList/components/ClarifyTheList.tsx           | 3 ++-
 .../Tender/ProjectManager/ClarifyTheList/service.ts        | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

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/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,
     });
 }
 /**

From fd45dbd33059a15555f260dfd53184a90ca86490 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Mon, 9 May 2022 22:02:11 +0800
Subject: [PATCH 12/16] =?UTF-8?q?5.9=20=E5=85=AC=E5=85=B1=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BiddingAnnouncementList.tsx    | 24 +++++++++----------
 .../BiddingAnnouncement/components/Medias.tsx |  1 +
 .../components/PublicPlatform.tsx             | 20 +++++++++++-----
 .../BiddingAnnouncement/components/style.less |  3 +++
 .../Calibration/BidPublicityResult/index.tsx  | 12 +++++-----
 .../ExceptionHandling/ExceptionHandling.tsx   | 14 +++++------
 .../BiddingAnnouncementList.tsx               | 24 +++++++++----------
 .../BiddingAnnouncementList.tsx               | 24 +++++++++----------
 .../Calibration/BidPublicityResult/index.tsx  | 12 +++++-----
 9 files changed, 73 insertions(+), 61 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
index 526a988..2d7f48d 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
@@ -158,7 +158,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -168,7 +168,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
@@ -178,7 +178,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn4 = (
@@ -188,7 +188,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -198,7 +198,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -210,7 +210,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 
@@ -278,7 +278,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -288,7 +288,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
@@ -298,7 +298,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn4 = (
@@ -308,7 +308,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -318,7 +318,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn6 = (
@@ -328,7 +328,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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/Medias.tsx b/src/pages/Bid/BiddingAnnouncement/components/Medias.tsx
index b110980..334ed4f 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/Medias.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/Medias.tsx
@@ -71,6 +71,7 @@ const Media: React.FC<MediaProps> = (props) => {
             message: '当前项不可为空',
           },
         ]}
+        extra="如选择发布到【中国招标投标公共服务平台】，在发布前需填写【公共服务平台】信息"
       >
         <Checkbox.Group
           style={{ width: '100%' }}
diff --git a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
index 9982a6a..a3152d8 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/PublicPlatform.tsx
@@ -55,7 +55,7 @@ const PublicPlatform: React.FC<{}> = () => {
     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, extra?: React.ReactNode, width?: string | number, type?: string, suffix?: React.ReactNode) {
+    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}
@@ -69,6 +69,7 @@ const PublicPlatform: React.FC<{}> = () => {
                     readOnly={readonly}
                     placeholder={placeholder}
                     style={{ width }}
+                    maxLength={maxLength ? maxLength : 20}
                     type={type}
                     suffix={suffix}
                 />
@@ -89,7 +90,7 @@ const PublicPlatform: React.FC<{}> = () => {
                     bordered={!readonly}
                     showCount={!readonly}
                     readOnly={readonly}
-                    maxLength={maxLength ? maxLength : 2000}
+                    maxLength={maxLength ? maxLength : 1000}
                     rows={3}
                     autoSize={readonly}
                     placeholder={placeholder}
@@ -104,7 +105,13 @@ const PublicPlatform: React.FC<{}> = () => {
                 name={name}
                 label={label}
                 rules={rules}
-                extra={extra}
+                extra={
+                    <div style={{ color: '#b30000', marginTop: 16 }}>
+                        <p>1、请上传含公告（公示）正文的pdf文件</p>
+                        <p>2、上传的pdf文件请务必盖章</p>
+                        <p>勾选中国招标投标公共服务平台后该操作为必须执行</p>
+                    </div>
+                }
             >
                 <ExtendUpload bid={initialValue} btnName="上传文件" maxCount={1} uploadProps={{ disabled: readonly, accept: ".pdf" }} />
             </Form.Item>
@@ -147,12 +154,12 @@ const PublicPlatform: React.FC<{}> = () => {
             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 }], "项目负责人证件号码")}
+                    {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 }], "天数", null, 100, readonly ? void 0 : "number", readonly ? null : "天")}
+                    {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>
             ))
         }
@@ -320,10 +327,11 @@ const PublicPlatform: React.FC<{}> = () => {
                     }
                 />
                 <div style={{ width: '100%', height: 16, backgroundColor: 'rgb(240,242,245)', }}></div>
-                <div style={{ padding: '0px 24px' }}>
+                <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>注：因公共服务平台的公告/公示信息无法实时推送，招标采购中心发送成功后，建议间隔15分钟到公共服务平台进行确认</Text>}
                         />
                         <div style={{ height: innerHeight - 180, overflowY: 'auto' }} className="public-platform" ref={setContainer}>
                             <Form {...layout} form={form} scrollToFirstError name="public-platform" validateMessages={validateMessages}>
diff --git a/src/pages/Bid/BiddingAnnouncement/components/style.less b/src/pages/Bid/BiddingAnnouncement/components/style.less
index 70c1227..72ffe27 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/style.less
+++ b/src/pages/Bid/BiddingAnnouncement/components/style.less
@@ -86,3 +86,6 @@
 .public-platform .ant-form-item {
   margin-bottom: 22px;
 }
+.public-platform-header .ant-page-header-heading {
+  align-items: center;
+}
diff --git a/src/pages/Calibration/BidPublicityResult/index.tsx b/src/pages/Calibration/BidPublicityResult/index.tsx
index 26f5c62..6a8528a 100644
--- a/src/pages/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/Calibration/BidPublicityResult/index.tsx
@@ -157,7 +157,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>&nbsp;&nbsp;
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>&nbsp;&nbsp;
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -167,7 +167,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
@@ -177,7 +177,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn4 = (
@@ -187,7 +187,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -197,7 +197,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
             <Popconfirm
               title={`确定要${name5}结束吗？`}
               onConfirm={async () => {
@@ -224,7 +224,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 
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 852317e..ac4f4b6 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectDocumentation/components/ExceptionHandling/ExceptionHandling.tsx
@@ -351,7 +351,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
                 失败公告提交审批
               </Button>
             </Popconfirm>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
             <Popconfirm
               title="确定要删除吗？"
               onConfirm={() => toDelete(record)}
@@ -374,7 +374,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
             <Popconfirm
               title="确定要删除吗？"
               onConfirm={() => toDelete(record)}
@@ -407,7 +407,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
                 发布失败公告
               </Button>
             </Popconfirm>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
             <Popconfirm
               title="确定要删除吗？"
               onConfirm={() => toDelete(record)}
@@ -440,7 +440,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
                 失败公告提交审批
               </Button>
             </Popconfirm>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
             <Popconfirm
               title="确定要删除吗？"
               onConfirm={() => toDelete(record)}
@@ -466,7 +466,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
             <Button type="text" key="4" onClick={() => toTakeEffect(record)} hidden={btnAuthority(["ebtp-agency-project-manager", "ebtp-purchase"])}>
               生效
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
+            <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 ? ( //草稿-公告发布失败
           <>
@@ -489,7 +489,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
                 发布失败公告
               </Button>
             </Popconfirm>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
             <Popconfirm
               title="确定要删除吗？"
               onConfirm={() => toDelete(record)}
@@ -512,7 +512,7 @@ const ExceptionHandling: React.FC<ExceptionHandlingProps> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.sendMessageId)}>公共服务平台</Button>
           </>
         ) : null,
     },
diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index 7b7ce2a..a1f2874 100644
--- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
+++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
@@ -127,7 +127,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <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>
           </>
         );
@@ -137,7 +137,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</Button>
           </>
         );
         let btn3 = (
@@ -147,7 +147,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</Button>
           </>
         );
         let btn4 = (
@@ -157,7 +157,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <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>
           </>
         );
@@ -167,7 +167,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <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>
           </>
         );
@@ -179,7 +179,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</Button>
           </>
         );
 
@@ -247,7 +247,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <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>
           </>
         );
@@ -257,7 +257,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</Button>
           </>
         );
         let btn3 = (
@@ -267,7 +267,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</Button>
           </>
         );
         let btn4 = (
@@ -277,7 +277,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <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>
           </>
         );
@@ -287,7 +287,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</Button>
           </>
         );
         let btn6 = (
@@ -297,7 +297,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id + '&roomType=1')}>公共服务平台</Button>
           </>
         );
 
diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index 3e76da1..24394a0 100644
--- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
+++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
@@ -118,7 +118,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -128,7 +128,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
@@ -138,7 +138,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn4 = (
@@ -148,7 +148,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -158,7 +158,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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}
@@ -172,7 +172,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 
@@ -261,7 +261,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit4Change(record)}>编辑</Button>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -271,7 +271,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
@@ -281,7 +281,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn4 = (
@@ -291,7 +291,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -301,7 +301,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn6 = (
@@ -311,7 +311,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 
diff --git a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
index b22ece3..18be095 100644
--- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
+++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/index.tsx
@@ -111,7 +111,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
           <>
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => toEdit(record)}>编辑</Button>&nbsp;&nbsp;
             <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" disabled={pageloading} onClick={() => handleApproval(record)}>提交审批</Button>&nbsp;&nbsp;
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -121,7 +121,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn3 = (
@@ -131,7 +131,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn4 = (
@@ -141,7 +141,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <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>
           </>
         );
@@ -151,7 +151,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
         let btn6 = (
@@ -161,7 +161,7 @@ const BidPublicityResult: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
-            <a hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" style={{ color: '#b30000', paddingLeft: 4 }} onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</a>
+            <Button hidden={isEmpty(record.hasCtpsp) || !record.hasCtpsp} type="text" key="common" onClick={() => window.open('/PublicPlatform' + '?id=' + record.id)}>公共服务平台</Button>
           </>
         );
 

From 6e6a1da11ed7c0ff1de9f57445f334329894a685 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Wed, 11 May 2022 09:39:38 +0800
Subject: [PATCH 13/16] =?UTF-8?q?5.11=20resetVerificationCode=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=94=B9=E4=B8=BApost?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/bidev.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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) {

From 54335a40ac1ebf35b30467c031e27be9cb374b72 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Wed, 11 May 2022 12:50:39 +0800
Subject: [PATCH 14/16] =?UTF-8?q?5.11=20=E6=8B=9B=E6=A0=87=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=BB=BA=E6=A1=A3=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E6=A0=87=E6=AE=B5=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A9=BA=E6=A0=BC=E6=8D=A2=E8=A1=8C=E7=AC=A6?=
 =?UTF-8?q?=E5=88=B6=E8=A1=A8=E7=AC=A6=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BiddingDocument.tsx            |  3 +-
 .../ProjectManage/PackageDivided/utils.ts     |  2 +
 .../components/ProcurementMethod1.tsx         | 15 ++--
 .../components/ProcurementMethod2.tsx         |  3 +-
 .../components/ProcurementMethod3.tsx         |  3 +-
 .../components/ProcurementMethod4.tsx         |  3 +-
 .../components/ProcurementMethod5.tsx         |  3 +-
 .../components/ProcurementMethod6.tsx         |  3 +-
 .../components/ProcurementMethod9.tsx         |  3 +-
 .../components/BiddingDocument.tsx            | 65 +++++++++---------
 src/utils/CommonUtils.ts                      | 68 +++++++++++--------
 11 files changed, 96 insertions(+), 75 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingDocument.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingDocument.tsx
index 88793e0..f65c443 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,
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/ProjectInformationManagement/components/ProcurementMethod1.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod1.tsx
index d500861..db5b0d3 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标段页解除禁用
@@ -355,12 +356,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..0d81816 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);
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod3.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod3.tsx
index ec74deb..cf7c8f0 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;
 
@@ -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标段页解除禁用
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod4.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod4.tsx
index 32952fc..d6e99f4 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标段页解除禁用
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod5.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod5.tsx
index 356881c..1327a5a 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标段页解除禁用
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod6.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod6.tsx
index f6515ad..442f619 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标段页解除禁用
diff --git a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod9.tsx b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod9.tsx
index cd83338..dcc65a8 100644
--- a/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod9.tsx
+++ b/src/pages/Project/ProjectManage/ProjectManager/ProjectInformationManagement/components/ProcurementMethod9.tsx
@@ -5,7 +5,7 @@
  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 @@ import { btnAuthority } from '@/utils/authority';
                  values.regionDictId = isEmpty(values.regionDictId) ? values.regionDictCity : values.regionDictId;
              }
              values.regionDictName = regionDictName;
+             values.projectName = trim(values.projectName);
              !isIPassDecode && (values['isIPassDecode'] = '1');
              updateUtils(values);
              //tab标段页解除禁用
diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/components/BiddingDocument.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/components/BiddingDocument.tsx
index 7de69a9..75eb8c8 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,
@@ -243,7 +244,7 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
               },
             ]}
           >
-            <Input maxLength={200} readOnly={editInformation}/>
+            <Input maxLength={200} readOnly={editInformation} />
           </Form.Item>
           <Form.Item
             label="关联标段"
@@ -258,7 +259,7 @@ const BiddingDocument: React.FC<BiddingDocumentProps> = (props) => {
             <Checkbox.Group
 
               options={TpPackageId}
-              style={{width: '100%'}}
+              style={{ width: '100%' }}
               disabled={editInformation}
             >
             </Checkbox.Group>
@@ -268,11 +269,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 +281,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/utils/CommonUtils.ts b/src/utils/CommonUtils.ts
index c82ecc3..cb56df7 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,50 @@ 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 str 
+ * @returns 
+ */
+export const trim = (str: string | undefined) => {
+  let _str = str?.replace(/(^\s*)|(\s*$)/g, "");
+  _str = _str?.replace(/[<>|\\/?？:：*""“”\s\r\n\t]/, "");
+  return _str;
 }
\ No newline at end of file

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

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

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

From cd58ad7e326757ccb1c3f9cae613b84c605d086a Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Fri, 20 May 2022 14:00:39 +0800
Subject: [PATCH 16/16] =?UTF-8?q?5.20=20=E5=A4=9A=E8=BD=AE=E6=8B=9B?=
 =?UTF-8?q?=E5=8B=9F=E5=8F=98=E6=9B=B4=E5=85=AC=E5=91=8A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E5=8F=91=E5=B8=83=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=9F=E5=85=AC=E5=91=8A=E5=86=8D=E6=AC=A1=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BiddingAnnouncementList.tsx               | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx
index 865bc6c..763421e 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"
@@ -59,6 +59,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: '公告名称',
@@ -290,6 +291,8 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
             <Button type="text" key="9" onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
+            {getProMethod() == "procurement_mode_4" ?
+              <Button hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} type="text" onClick={() => handleReleaseAgain(record)}>再次发布</Button> : null}
           </>
         );
         let btn6 = (
@@ -495,17 +498,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 +545,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)