From 0244845f6c65cfc2fe86c3efc462ddfbf8756c74 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 4 May 2023 10:30:01 +0800
Subject: [PATCH] =?UTF-8?q?5.4=20=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=8F=98=E6=9B=B4=E5=85=AC=E5=91=8A=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=96=B0=E5=A2=9E=E5=8F=98=E6=9B=B4=E5=85=AC?=
 =?UTF-8?q?=E5=91=8Acs=5Fanno=5Fid=E5=8F=98=E4=B8=BA=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=85=AC=E5=91=8A=E7=9A=84id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BiddingAnnouncement4Change.tsx              | 4 ++--
 .../components/BiddingAnnouncementList.tsx                 | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncement4Change.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncement4Change.tsx
index b57bddc..6f5327b 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncement4Change.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncement4Change.tsx
@@ -154,7 +154,7 @@ const BiddingAnnouncement: React.FC<BiddingAnnouncementProps> = (props) => {
     if (type == "cease") {
       return;
     } else if (type == "changeNew") {//==========================================================创建变更公告
-      GetNoticeMsg(pkId).then(res => {
+      GetNoticeMsg(FpkId).then(res => {
         if (res.code == 200) {
           const data = res.data
           let value = [];
@@ -305,7 +305,7 @@ const BiddingAnnouncement: React.FC<BiddingAnnouncementProps> = (props) => {
       "id": pkId,
       "annoNature": annoNature,
       "tpId": tpId,
-      "csAnnoId": pkId,
+      "csAnnoId": FpkId,
       "attDatasetId": form.getFieldValue("attDatasetId"),
       "openhallTitle": form.getFieldValue("openhallIdTime"),//开标大厅 时间段
       "contentWithStyle": braftRef.current.getHtml().replace(/<table border="0"/, '<table border="1"'),//富文本正文
diff --git a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
index 5d17d46..6b4f94b 100644
--- a/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
+++ b/src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
@@ -43,7 +43,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   const [updateVisible4Change, setUpdateVisible4Change] = useState<boolean>(false);//变更公告
   const [updateChange, setUpdateChange] = useState<string>('');//弹窗名
   const [type, setType] = useState<any>('cease');//弹窗类型
-  const [pkId, setPkId] = useState<string>();//公告/邀请函id
+  const [pkId, setPkId] = useState<string>("");//公告/邀请函id
   const [tpId, setTpId] = useState<any>(getProId);//项目id
   const [dataSource, setdataSource] = useState<any[]>([]); //公告列表数据
   const [dataSourcePage, setDataSourcePage] = useState<any>(1);//当前页数
@@ -457,6 +457,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
   const creatChangeNotice = () => {
     setUpdateVisible4Change(true);
     setUpdateChange('创建变更公告');
+    setPkId("");
     setType("changeNew");
   }
   /*编辑变更公告*/
@@ -671,13 +672,13 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
           </Modal>
         ) : null}
         {updateVisible ? (
-          <BiddingAnnouncement key={Math.random()} SX={() => setRefresh(Math.random() + 1)} titleName={updateChange}
+          <BiddingAnnouncement 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)}
+          <BiddingAnnouncement4Change SX={() => setRefresh(Math.random() + 1)}
             titleName={updateChange} pkId={pkId} type={type} tpId={tpId}
             onCancel={() => setUpdateVisible4Change(false)}
             modalVisible={updateVisible4Change} FpkId={FpkId}