From 48bf23aa87011f6d20d3f312203371e4a4bb2d8f Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Wed, 24 Aug 2022 10:45:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=95=E4=B8=80=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E5=B0=91=E4=B8=89=E5=A4=A9=E5=A1=AB=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BiddingInvitation.tsx          |  66 ++++++++-
 .../components/BiddingInvitationList.tsx      |  62 +++++++++
 .../components/ReasonMemo.tsx                 | 129 ++++++++++++++++++
 src/pages/Bid/BiddingAnnouncement/service.ts  |   9 ++
 4 files changed, 264 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Bid/BiddingAnnouncement/components/ReasonMemo.tsx

diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
index 785150a..009b629 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
@@ -13,6 +13,7 @@ import {
   Radio,
   Row,
   Spin, Tabs,
+  Typography,
   Upload
 } from "antd"
 import '@/assets/ld_style.less'
@@ -46,6 +47,7 @@ import BraftText from "@/components/richText/wang"
 import RiskPrevention from "@/utils/RiskPrevention"
 import Dating from '@/images/招标公告/dating.jpg';
 import './style.less';
+import TextArea from "antd/lib/input/TextArea"
 
 interface BiddingInvitation {
   type: string;
@@ -104,6 +106,11 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
   const [riskVisible, setRiskVisible] = useState<boolean>(false);//风控弹窗 2021.9.7 zhoujianlong
   const [riskData, setRiskData] = useState<any[]>([]);//风控数据 2021.9.7 zhoujianlong
   const WebofficeRef = useRef<Weboffice>(null);
+  const [memoVisible, setMemoVisible] = useState<boolean>(false);//说明弹窗
+  /*weboffic end*/
+  const [UploadMemoID, setUploadMemoID] = useState<any>("empty"); //upload 业务id
+
+  const { Text } = Typography;
   const onRef = (ref) => {
     /* this.child= ref;*/
   }
@@ -182,6 +189,7 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
           setDocSaveBtn("compact");
           setDocBtnName("新建");
           setSping(false);
+          setUploadMemoID("");
         }
       });
     } else if (type == "edit") {//==========================================================编辑
@@ -211,6 +219,7 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
               "openhallId": data.openhallId,
               "annoTitle": data.annoTitle,
               "sectionIds": defPak,
+              "reasonMemo": data.reasonMemo,
             });
             echoSet(data.contentWithStyle);
             setUploadID(data.attDatasetId);
@@ -220,6 +229,7 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
             setDocReadOnly("false");
             setDocSaveBtn("compact");
             setDocBtnName("编辑");
+            setUploadMemoID(data.reasonMemoAttrId);
           }
         });
 
@@ -256,6 +266,7 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
           setDocReadOnly("ture");
           setDocSaveBtn("none");
           setDocBtnName("查看");
+          setUploadMemoID(data.reasonMemoAttrId);
         }
       });
     }
@@ -318,7 +329,15 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
     } else if (TpPackageName == "谈判") {
       if (form.getFieldValue("docStartTime") < moment().startOf('day')) {
         message.warn('采购文件获取开始时间需晚于当前时间');
-      } else if (moment(form.getFieldValue("docEndTime")).startOf('day').diff(moment(form.getFieldValue("docStartTime")).startOf('day'), "days") < 3) {
+      } else if (proDict == "procurement_mode_6" && moment(form.getFieldValue("docEndTime")).startOf('day').diff(moment(form.getFieldValue("docStartTime")).startOf('day'), "days") < 1) {
+        message.warn('采购文件获取截止时间需与采购文件获取开始时间间隔不少于1天');
+      } else if (proDict == "procurement_mode_6" && moment(form.getFieldValue("docEndTime")).startOf('day').diff(moment(form.getFieldValue("docStartTime")).startOf('day'), "days") < 3) {
+        if(form.getFieldValue("reasonMemo") !== null && form.getFieldValue("reasonMemo") !== undefined){
+          msg = "true"
+        }else{
+          setMemoVisible(true);
+        }
+      }  else if (moment(form.getFieldValue("docEndTime")).startOf('day').diff(moment(form.getFieldValue("docStartTime")).startOf('day'), "days") < 3) {
         message.warn('采购文件获取截止时间需与采购文件获取开始时间间隔不少于3天');
       } else if (form.getFieldValue("replyEndTime").format('YYYY-MM-DD HH:mm:ss') < form.getFieldValue("docEndTime").format('YYYY-MM-DD HH:mm:ss')) {
         message.warn('应答截止时间需晚于或等于采购文件获取截止时间');
@@ -442,9 +461,12 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
       // "contentHtmlId": WebofficeRef.current!.HTMLfileCode,//html id
       "sections": packageMsg,
       "medias": "9",
-      "roomType": "2"
+      "roomType": "2",
+      "reasonMemoAttrId": form.getFieldValue("reasonMemoAttrId"),
+      "reasonMemo": form.getFieldValue("reasonMemo")
     }
     creatNotice(type, fromData).then(res => {
+    // creatNotice(type, fromData).then(res => {
       if (res?.code == 4004 && res?.success == false) { //2021.9.7 zhoujianlong 新增和修改邀请函增加风控
         const data = res?.data?.result == undefined ? [] : res?.data?.result
         setRiskData(data)
@@ -828,6 +850,45 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
               </div>
             </Card> */}
             <BraftText braftRef={braftRef} echo={echo} disabled={editInformation} />
+            <Modal
+              destroyOnClose
+              title="原因说明"
+              visible={memoVisible}
+              width={'40%'}
+              onCancel={() => {
+                setMemoVisible(false)
+              }}
+              onOk={() => {setMemoVisible(false);onFinshInvitation();}}
+              footer={[
+                <Button key="back" onClick={() => setMemoVisible(false)}>
+                  取消
+                </Button>,
+                <Button key="save" type="primary" onClick={() => {setMemoVisible(false);onFinshInvitation();}}>
+                  确定
+                </Button>,
+              ]}
+              centered
+            >
+
+              <Text style={{ color: '#b30000' }}>提示：当前采购文件获取截止时间与采购文件获取开始时间间隔少于3天，请填写原因说明！</Text>
+              <Form.Item
+                label="原因说明"
+                name="reasonMemo"
+                rules={[
+                  { required: true },
+                  { max: 500, message: '原因说明不能超过500字' },
+                ]}
+              >
+                <TextArea rows={4} style={{ resize: 'vertical'}}  />
+              </Form.Item>
+              <Form.Item
+                label="附件文件"
+                name="reasonMemoAttrId"
+                extra="单个附件最大30MB"
+              >
+                {UploadMemoID != "empty" ? <ExtendUpload uploadProps={UploadProps} maxCount={1} bid={UploadMemoID} /> : null}
+              </Form.Item>
+            </Modal>
           </Form>
           {editInformation ? null :
             <div style={{ textAlign: "right", marginTop: " 26px" }}>
@@ -893,6 +954,7 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
         }}
         data={riskData}
       />}
+      
     </Spin>
 
   )
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
index 2d6153a..fda9c20 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitationList.tsx
@@ -20,6 +20,7 @@ import { btnAuthority } from '@/utils/authority';
 import { getApprProcessList } from '@/utils/SeleApprovalProcess/service';
 import SeleApprovalProcess from '@/utils/SeleApprovalProcess';
 import { checkObjectId } from '@/utils/DownloadUtils';
+import ReasonMemo from './ReasonMemo';
 
 /*
  * 招标公告开始
@@ -50,6 +51,7 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
   const [approvalVisible, setApprovalVisible] = useState<boolean>(false);//选择流程弹窗控制参数
   const [approvalData, setApprovalData] = useState<any[]>([]);//选择流程数据存储
 
+  const [memoVisible, setMemoVisible] = useState<boolean>(false);//说明弹窗
   let proName = ''; //名称
   let pktittle = '';
   let proDict = getProMethod();
@@ -129,6 +131,13 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
               onClick={() => toEdit(record)}
             >
               编辑
+            </Button>
+              <Button
+              hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])|| record.reasonMemo== null ||record.reasonMemo==undefined}
+              type="text"
+              onClick={() => toEditReasonMemo(record,"edit")}
+            >
+              原因说明
             </Button>
             <Button
               hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])}
@@ -158,6 +167,13 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             <Button type="text" onClick={() => toRead(record)}>
               查看
             </Button>
+            <Button
+              hidden={ record.reasonMemo== null ||record.reasonMemo==undefined}
+              type="text"
+              onClick={() => toEditReasonMemo(record,"read")}
+            >
+              原因说明
+            </Button>
             <Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
@@ -176,6 +192,13 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             <Button type="text" onClick={() => toRead(record)}>
               查看
             </Button>
+            <Button
+              hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
+              type="text"
+              onClick={() => toEditReasonMemo(record,"read")}
+            >
+              原因说明
+            </Button>
             <Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
@@ -190,6 +213,13 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             >
               编辑
             </Button>
+            <Button
+              hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])|| record.reasonMemo== null ||record.reasonMemo==undefined}
+              type="text"
+              onClick={() => toEditReasonMemo(record,"edit")}
+            >
+              原因说明
+            </Button>
             <Button
               hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])}
               type="text"
@@ -221,6 +251,13 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             <Button type="text" onClick={() => toRead(record)}>
               查看
             </Button>
+            <Button
+              hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
+              type="text"
+              onClick={() => toEditReasonMemo(record,"read")}
+            >
+              原因说明
+            </Button>
             <Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
@@ -239,6 +276,13 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
             <Button type="text" onClick={() => toRead(record)}>
               查看
             </Button>
+            <Button
+              hidden={record.reasonMemo== null ||record.reasonMemo==undefined}
+              type="text"
+              onClick={() => toEditReasonMemo(record,"read")}
+            >
+              原因说明
+            </Button>
             <Button type="text" key="9" hidden={!record.approvalInstanceId || !checkObjectId(record.id)} onClick={() => toApprovalFor(record)}>
               查看审批流程
             </Button>
@@ -434,7 +478,15 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
       }
     });
   };
+
+  /*编辑原因说明*/
+  const toEditReasonMemo = (props: any,type: any) => {
+    setPkId(props.id);
+    setType(type);
+    setMemoVisible(true);
+  };
   const Proref = useRef<ActionType>();
+  
   return (
     <div style={{ height: '100%', position: 'relative' }}>
       <Spin spinning={spin}>
@@ -511,6 +563,16 @@ const BiddingInvitationList: React.FC<{}> = (props) => {
           setRefresh(Math.random() + 1)
         }} data={approvalData} annoId={recordData?.id} />
       ) : null}
+      {memoVisible ? (
+      <ReasonMemo
+      modalVisible={memoVisible}
+          id={pkId}
+          type={type}
+          onCancel={() => {
+            setMemoVisible(false)
+          }}
+        />
+        ) : null}
     </div>
   );
 };
diff --git a/src/pages/Bid/BiddingAnnouncement/components/ReasonMemo.tsx b/src/pages/Bid/BiddingAnnouncement/components/ReasonMemo.tsx
new file mode 100644
index 0000000..f47cceb
--- /dev/null
+++ b/src/pages/Bid/BiddingAnnouncement/components/ReasonMemo.tsx
@@ -0,0 +1,129 @@
+import { Button, Form, message, Modal, Typography, Spin } from 'antd';
+import TextArea from 'antd/lib/input/TextArea';
+import React, { useEffect, useState } from 'react';
+import { GetNoticeMsg, updateMemo } from '../service';
+import { UploadProps } from "antd/lib/upload/interface";
+import ExtendUpload from '@/utils/ExtendUpload';
+/*说明原因 组件*/
+type Props = {
+  id: string;
+  type: string;
+  onCancel: () => void;
+  modalVisible: boolean; //弹窗visible
+}
+const Index: React.FC<Props> = (props) => {
+  const { type, id ,modalVisible,onCancel} = props;
+  const [spinning, setSping] = useState<boolean>(false);//加载遮罩
+  const [UploadMemoID, setUploadMemoID] = useState<any>("empty"); //upload 业务id
+  const [disableStatus, setDisableStatus] = useState<boolean>(false);//是否只读
+  const [form] = Form.useForm();
+  const { Text } = Typography;
+  useEffect(() => {
+    Int();
+    form.resetFields();//清除form中数据
+  }, [id, type]);
+
+  const UploadProps: UploadProps = {
+    name: "file",
+    disabled: disableStatus
+  }
+
+  const layout = {
+    labelCol: { span: 7 },
+    wrapperCol: { span: 10 },
+  };
+
+  const Int = async () => {
+    setSping(true);
+    await GetNoticeMsg(id).then(res => {
+      if (res.code == 200) {
+        const data = res.data;
+        let defPak = [];
+        for (const item of data.sections) {
+          defPak.push(item.bsId);
+        }
+        form.setFieldsValue({
+          "reasonMemo": data.reasonMemo,
+          "reasonMemoAttrId": data.reasonMemoAttrId,
+        });
+        setUploadMemoID(data.reasonMemoAttrId);
+      }
+    });
+    if (type == "read") {//==========================================================查看
+      setDisableStatus(true);//不可编辑
+    }
+    setSping(false);
+  };
+  const submit = () => {
+    setSping(true);
+    const fromData = {
+      "id": id,
+      "reasonMemoAttrId": form.getFieldValue("reasonMemoAttrId"),
+      "reasonMemo": form.getFieldValue("reasonMemo")
+    }
+    updateMemo(type, fromData).then(res => {
+      if (res.code == 200) {
+        message.success("成功");
+        onCancel();
+        setSping(false);
+      } else {
+        message.success("失败");
+      }
+    });
+  }
+  return (
+    <>
+      <Spin spinning={spinning}>
+
+        <Modal
+          destroyOnClose
+          visible={modalVisible}
+          title="原因说明"
+          width={'40%'}
+          onCancel={() => {
+            onCancel();
+          }}
+          onOk={() => { submit();}}
+          footer={[
+            disableStatus ? null : <Button key="back" onClick={() => onCancel()}>
+              取消
+            </Button>,
+            disableStatus ? null : <Button key="save" type="primary" onClick={() => { submit(); }}>
+              确定
+            </Button>,
+          ]}
+          centered
+        >
+
+          <Text style={{ color: '#b30000' }}>提示：当前采购文件获取截止时间与采购文件获取开始时间间隔少于3天，请填写原因说明！</Text>
+          <Form
+            {...layout}
+            name="basic"
+            form={form}
+            component={false}
+          >
+
+          <Form.Item
+            label="原因说明"
+            name="reasonMemo"
+            rules={[
+              { required: true },
+              { max: 500, message: '原因说明不能超过500字' },
+            ]}
+          >
+            <TextArea rows={4} style={{ resize: 'vertical' }} disabled={disableStatus} />
+          </Form.Item>
+          <Form.Item
+            label="附件文件"
+            name="reasonMemoAttrId"
+            extra="单个附件最大30MB"
+          >
+            {UploadMemoID != "empty" ? <ExtendUpload uploadProps={UploadProps} maxCount={1} bid={UploadMemoID} /> : null}
+          </Form.Item>
+          </Form>
+        </Modal>
+      </Spin>
+    </>
+  )
+}
+export default Index;
\ No newline at end of file
diff --git a/src/pages/Bid/BiddingAnnouncement/service.ts b/src/pages/Bid/BiddingAnnouncement/service.ts
index bc87e77..dc4a31d 100644
--- a/src/pages/Bid/BiddingAnnouncement/service.ts
+++ b/src/pages/Bid/BiddingAnnouncement/service.ts
@@ -222,4 +222,13 @@ export async function savePublicData(params: any) {
     method: "POST",
     data: params
   });
+}
+/*修改说明*/
+export async function updateMemo(type: any, params?: any) {
+  return request("/api/biz-service-ebtp-bid/v1/anno/updateMemo", {
+    method: "post",
+    data: {
+      ...params
+    },
+  })
 }
\ No newline at end of file

From d3eaf5b20ca955119e64af638e100bd7d94a3b2a Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Wed, 24 Aug 2022 15:39:01 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=95=E4=B8=80=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BiddingAnnouncement/components/BiddingInvitation.tsx | 4 +++-
 src/utils/RiskPreventionSoft/index.tsx                   | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
index 009b629..33c9b8c 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
@@ -48,6 +48,7 @@ import RiskPrevention from "@/utils/RiskPrevention"
 import Dating from '@/images/招标公告/dating.jpg';
 import './style.less';
 import TextArea from "antd/lib/input/TextArea"
+import RiskPreventionSoft from "@/utils/RiskPreventionSoft"
 
 interface BiddingInvitation {
   type: string;
@@ -946,13 +947,14 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
         </TabPane>
       </Tabs>
       {/**风控组件 */}
-      {riskVisible && <RiskPrevention
+      {riskVisible && <RiskPreventionSoft
         modalVisible={riskVisible}
         onCancel={() => {
           setRiskVisible(false)
           setRiskData([])
         }}
         data={riskData}
+        onSubmit={() => submit()}
       />}
       
     </Spin>
diff --git a/src/utils/RiskPreventionSoft/index.tsx b/src/utils/RiskPreventionSoft/index.tsx
index 04a4fbf..b445f1f 100644
--- a/src/utils/RiskPreventionSoft/index.tsx
+++ b/src/utils/RiskPreventionSoft/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { Modal, Tag } from 'antd';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import type { ProColumns } from '@ant-design/pro-table';
@@ -21,6 +21,7 @@ const modalHeight = window.innerHeight * 96 / 100;
  */
 const RiskPreventionSoft: React.FC<RiskPreventionSoftProps> = (props) => {
     const { modalVisible, onCancel, onSubmit, data } = props;
+    const [spinning, setSping] = useState<boolean>(false);//加载遮罩
 
     const columns: ProColumns<any[]>[] = [
         {
@@ -53,6 +54,11 @@ const RiskPreventionSoft: React.FC<RiskPreventionSoftProps> = (props) => {
             title: '规则相应内容',
         },
     ];
+    useEffect(()=>{
+        for (const iterator of data) {
+            
+        }
+    },[])
 
     return (
         <Modal
@@ -64,6 +70,7 @@ const RiskPreventionSoft: React.FC<RiskPreventionSoftProps> = (props) => {
             bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto', padding: '8px 24px 16px' }}
             centered
             onCancel={() => onCancel()}
+            okButtonProps={{hidden: true}}
             onOk={() => {
                 onSubmit();
                 onCancel();

From c74d22f413b67ef875ff1f3e72999a607830254a Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Thu, 25 Aug 2022 10:42:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=95=E4=B8=80=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E8=BD=AF=E6=8E=A7=E6=98=BE=E7=A4=BA=E7=A1=AE=E8=AE=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BiddingInvitation.tsx          | 53 +++++++++++++++++--
 .../components/ReasonMemo.tsx                 |  2 +-
 src/pages/Bid/BiddingAnnouncement/service.ts  | 15 ++++--
 src/utils/RiskPreventionSoft/index.tsx        | 22 ++++++--
 4 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
index 33c9b8c..d049888 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingInvitation.tsx
@@ -26,7 +26,7 @@ import {
   creatNotice,
   getChooseRoom,
   getPackageAndSupplierList,
-  chooseSupplier, deleteSupplier, updateSupplierUser, checkConflict
+  chooseSupplier, deleteSupplier, updateSupplierUser, saveAnno
 } from '../service'
 import moment from "moment";
 import TabPane from "@ant-design/pro-card/lib/components/TabPane";
@@ -467,10 +467,11 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
       "reasonMemo": form.getFieldValue("reasonMemo")
     }
     creatNotice(type, fromData).then(res => {
-    // creatNotice(type, fromData).then(res => {
       if (res?.code == 4004 && res?.success == false) { //2021.9.7 zhoujianlong 新增和修改邀请函增加风控
-        const data = res?.data?.result == undefined ? [] : res?.data?.result
-        setRiskData(data)
+        const data = res?.data== undefined ? [] : res?.data
+        let thisData = [];
+        thisData.push(data);
+        setRiskData(thisData)
         setRiskVisible(true)
       }
       if (res.code == 200) {
@@ -481,6 +482,48 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
       setTimeout(() => setSping(false), 1000)
     });
   }
+  const saveAfterRisk = () => {
+    const packageMsg = [];
+    for (const item of TpPackageId) {//包数据
+      for (const item1 of form.getFieldValue("sectionIds")) {
+        if (item.value == item1) {
+          packageMsg.push({ "bsId": item.value, "bsName": item.label })
+        }
+      }
+    }
+    setSping(true);
+    const fromData = {
+      "id": pkId,
+      "annoNature": 101,//邀请函
+      "tpId": tpId,
+      "csAnnoId": pkId,
+      "attDatasetId": form.getFieldValue("attDatasetId"),
+      "openhallTitle": form.getFieldValue("openhallIdTime"),//开标大厅 时间段
+      "source": 21,//来源（1：预审公告；2：预审公示；11：资审公告；12资审公示；21：邀请函）
+      "annoTitle": form.getFieldValue("annoTitle"),
+      "contentWithStyle": braftRef.current.getHtml().replace(/<table border="0"/, '<table border="1"'),//富文本正文
+      "docStartTime": form.getFieldValue("docStartTime").format("yyyy-MM-DD HH:mm:ss"),
+      "replyEndTime": form.getFieldValue("replyEndTime").format("yyyy-MM-DD HH:mm:ss"),
+      "openingTime": form.getFieldValue("openingTime").format("yyyy-MM-DD HH:mm:ss"),
+      "docEndTime": form.getFieldValue("docEndTime").format("yyyy-MM-DD HH:mm:ss"),
+      "openhallId": form.getFieldValue("openhallId"),
+      // "contentFileId": WebofficeRef.current!.DocfileCode,//office id
+      // "contentHtmlId": WebofficeRef.current!.HTMLfileCode,//html id
+      "sections": packageMsg,
+      "medias": "9",
+      "roomType": "2",
+      "reasonMemoAttrId": form.getFieldValue("reasonMemoAttrId"),
+      "reasonMemo": form.getFieldValue("reasonMemo")
+    }
+    saveAnno(fromData).then(res => {
+      if (res.code == 200) {
+        setAnnoId(res?.data);
+        message.success("成功");
+        setTabsKeys("2");
+      }
+      setTimeout(() => setSping(false), 1000)
+    });
+  }
 
 
   const columns1: ProColumns<{}>[] = [
@@ -954,7 +997,7 @@ const BiddingInvitation: React.FC<BiddingInvitation> = (props) => {
           setRiskData([])
         }}
         data={riskData}
-        onSubmit={() => submit()}
+        onSubmit={() => saveAfterRisk()}
       />}
       
     </Spin>
diff --git a/src/pages/Bid/BiddingAnnouncement/components/ReasonMemo.tsx b/src/pages/Bid/BiddingAnnouncement/components/ReasonMemo.tsx
index f47cceb..57f4927 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/ReasonMemo.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/ReasonMemo.tsx
@@ -61,7 +61,7 @@ const Index: React.FC<Props> = (props) => {
       "reasonMemoAttrId": form.getFieldValue("reasonMemoAttrId"),
       "reasonMemo": form.getFieldValue("reasonMemo")
     }
-    updateMemo(type, fromData).then(res => {
+    updateMemo(fromData).then(res => {
       if (res.code == 200) {
         message.success("成功");
         onCancel();
diff --git a/src/pages/Bid/BiddingAnnouncement/service.ts b/src/pages/Bid/BiddingAnnouncement/service.ts
index dc4a31d..186291e 100644
--- a/src/pages/Bid/BiddingAnnouncement/service.ts
+++ b/src/pages/Bid/BiddingAnnouncement/service.ts
@@ -22,8 +22,8 @@ export async function GetNoticeMsg(params?: any) {
 /*创建公告*/
 export async function creatNotice(type: any, params?: any) {
   let method = "post";
-  if (type == "edit" || type == "change")
-    method = "put";
+   if (type == "edit" || type == "change")
+     method = "put";
   return request('/api/biz-service-ebtp-bid/v1/anno', {
     method: method,
     data: {
@@ -224,11 +224,20 @@ export async function savePublicData(params: any) {
   });
 }
 /*修改说明*/
-export async function updateMemo(type: any, params?: any) {
+export async function updateMemo(params?: any) {
   return request("/api/biz-service-ebtp-bid/v1/anno/updateMemo", {
     method: "post",
     data: {
       ...params
     },
   })
+}
+/*风控后的保存公告*/
+export async function saveAnno(params?: any) {
+  return request("/api/biz-service-ebtp-bid/v1/anno/saveAnno", {
+    method: "post",
+    data: {
+      ...params
+    },
+  })
 }
\ No newline at end of file
diff --git a/src/utils/RiskPreventionSoft/index.tsx b/src/utils/RiskPreventionSoft/index.tsx
index b445f1f..d368695 100644
--- a/src/utils/RiskPreventionSoft/index.tsx
+++ b/src/utils/RiskPreventionSoft/index.tsx
@@ -21,7 +21,7 @@ const modalHeight = window.innerHeight * 96 / 100;
  */
 const RiskPreventionSoft: React.FC<RiskPreventionSoftProps> = (props) => {
     const { modalVisible, onCancel, onSubmit, data } = props;
-    const [spinning, setSping] = useState<boolean>(false);//加载遮罩
+    const [confirmButtonVisible, setConfirmButtonVisible] = useState<boolean>(true);//是否显示确定按钮
 
     const columns: ProColumns<any[]>[] = [
         {
@@ -55,11 +55,23 @@ const RiskPreventionSoft: React.FC<RiskPreventionSoftProps> = (props) => {
         },
     ];
     useEffect(()=>{
-        for (const iterator of data) {
-            
-        }
+        setConfirmButtonVisible(getButtonVisible());
     },[])
 
+    const getButtonVisible = () => {
+        console.log(data);
+        for (const risk of data) {
+            for (const result of risk.result) {
+                for (const regulationData of result.regulationData) {
+                    if(regulationData.regulationStrategy=="hard"){
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     return (
         <Modal
             destroyOnClose
@@ -70,7 +82,7 @@ const RiskPreventionSoft: React.FC<RiskPreventionSoftProps> = (props) => {
             bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto', padding: '8px 24px 16px' }}
             centered
             onCancel={() => onCancel()}
-            okButtonProps={{hidden: true}}
+            okButtonProps={{hidden: confirmButtonVisible}}
             onOk={() => {
                 onSubmit();
                 onCancel();

From 789f5b1cfa625f9a0d5c10daec6a10cd77c12f3c Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 25 Aug 2022 14:17:56 +0800
Subject: [PATCH 4/4] 8.25

---
 src/pages/Bid/BiddingAnnouncement/service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/service.ts b/src/pages/Bid/BiddingAnnouncement/service.ts
index 186291e..832b6b6 100644
--- a/src/pages/Bid/BiddingAnnouncement/service.ts
+++ b/src/pages/Bid/BiddingAnnouncement/service.ts
@@ -22,8 +22,8 @@ export async function GetNoticeMsg(params?: any) {
 /*创建公告*/
 export async function creatNotice(type: any, params?: any) {
   let method = "post";
-   if (type == "edit" || type == "change")
-     method = "put";
+  if (type == "edit" || type == "change")
+    method = "put";
   return request('/api/biz-service-ebtp-bid/v1/anno', {
     method: method,
     data: {