liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20230504-点击查看其他变更公告会导致新增变更公告cs_anno_id变为查看变更公告的id' into 'master'

Browse Source 
7.14 点击查看其他变更公告会导致新增变更公告cs_anno_id变为查看变更公告的id

See merge request eshop/fe_service_ebtp_frontend!299
This commit is contained in:
jl-zhoujl2
2023-07-14 03:13:11 +00:00
parent 6d73c004cc 0244845f6c
commit aee8463e86
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncement4Change.tsx
View File

@ -154,7 +154,7 @@ const BiddingAnnouncement: React.FC<BiddingAnnouncementProps> = (props) => {
if (type == "cease") { if (type == "cease") {
return; return;
} else if (type == "changeNew") {//==========================================================创建变更公告 } else if (type == "changeNew") {//==========================================================创建变更公告
GetNoticeMsg(pkId).then(res => { GetNoticeMsg(FpkId).then(res => {
if (res.code == 200) { if (res.code == 200) {
const data = res.data const data = res.data
let value = []; let value = [];
@ -305,7 +305,7 @@ const BiddingAnnouncement: React.FC<BiddingAnnouncementProps> = (props) => {
"id": pkId, "id": pkId,
"annoNature": annoNature, "annoNature": annoNature,
"tpId": tpId, "tpId": tpId,
"csAnnoId": pkId, "csAnnoId": FpkId,
"attDatasetId": form.getFieldValue("attDatasetId"), "attDatasetId": form.getFieldValue("attDatasetId"),
"openhallTitle": form.getFieldValue("openhallIdTime"),//开标大厅 时间段 "openhallTitle": form.getFieldValue("openhallIdTime"),//开标大厅 时间段
"contentWithStyle": braftRef.current.getHtml().replace(/<table border="0"/, '<table border="1"'),//富文本正文 "contentWithStyle": braftRef.current.getHtml().replace(/<table border="0"/, '<table border="1"'),//富文本正文

7
src/pages/Bid/BiddingAnnouncement/components/BiddingAnnouncementList.tsx
View File

@ -43,7 +43,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
const [updateVisible4Change, setUpdateVisible4Change] = useState<boolean>(false);//变更公告 const [updateVisible4Change, setUpdateVisible4Change] = useState<boolean>(false);//变更公告
const [updateChange, setUpdateChange] = useState<string>('');//弹窗名 const [updateChange, setUpdateChange] = useState<string>('');//弹窗名
const [type, setType] = useState<any>('cease');//弹窗类型 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 [tpId, setTpId] = useState<any>(getProId);//项目id
const [dataSource, setdataSource] = useState<any[]>([]); //公告列表数据 const [dataSource, setdataSource] = useState<any[]>([]); //公告列表数据
const [dataSourcePage, setDataSourcePage] = useState<any>(1);//当前页数 const [dataSourcePage, setDataSourcePage] = useState<any>(1);//当前页数
@ -457,6 +457,7 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
const creatChangeNotice = () => { const creatChangeNotice = () => {
setUpdateVisible4Change(true); setUpdateVisible4Change(true);
setUpdateChange('创建变更公告'); setUpdateChange('创建变更公告');
setPkId("");
setType("changeNew"); setType("changeNew");
} }
/*编辑变更公告*/ /*编辑变更公告*/
@ -671,13 +672,13 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => {
</Modal> </Modal>
) : null} ) : null}
{updateVisible ? ( {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} pkId={pkId} type={type} tpId={tpId}
onCancel={() => setUpdateVisible(false)} modalVisible={updateVisible} FpkId={FpkId} onCancel={() => setUpdateVisible(false)} modalVisible={updateVisible} FpkId={FpkId}
ChangeSX={() => GetList(FpkId)} /> ChangeSX={() => GetList(FpkId)} />
) : null} ) : null}
{updateVisible4Change ? ( {updateVisible4Change ? (
<BiddingAnnouncement4Change key={Math.random()} SX={() => setRefresh(Math.random() + 1)} <BiddingAnnouncement4Change SX={() => setRefresh(Math.random() + 1)}
titleName={updateChange} pkId={pkId} type={type} tpId={tpId} titleName={updateChange} pkId={pkId} type={type} tpId={tpId}
onCancel={() => setUpdateVisible4Change(false)} onCancel={() => setUpdateVisible4Change(false)}
modalVisible={updateVisible4Change} FpkId={FpkId} modalVisible={updateVisible4Change} FpkId={FpkId}