From 9c9bc9ce1e25dea5faebc9094d10e06615e714e2 Mon Sep 17 00:00:00 2001 From: sunyu Date: Fri, 1 Aug 2025 14:55:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E5=AE=A1=E6=8B=9B=E6=A0=87--=E8=B5=84?= =?UTF-8?q?=E5=AE=A1=E5=85=AC=E5=91=8A=E5=8E=BB=E6=8E=89=E5=BC=80=E6=A0=87?= =?UTF-8?q?=E5=A4=A7=E5=8E=85=E9=80=89=E9=A1=B9=EF=BC=9B=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BiddingAnnouncementList.tsx | 90 +++++++---- .../components/BiddingAnnouncement.tsx | 152 +++++++++--------- 2 files changed, 141 insertions(+), 101 deletions(-) diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx index cd9a589..c34b5a8 100644 --- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx +++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingAnnouncementList.tsx @@ -444,46 +444,82 @@ const BiddingAnnouncementList: React.FC<{}> = (props) => { * @param selectedRows */ const handleRemove = async (record: any) => { - setPageloading(true); - removeNotice(record.id).then(res => { - if (res.code == 200) { - message.success('删除成功'); - if (type == "change" || type == "changeNew") { - GetList(FpkId); - } else { - setRefresh(Math.random() + 1) + // 显示确认对话框 + Modal.confirm({ + title: '确认删除', + content: '您确定要删除这条数据吗？此操作不可撤销。', + okText: '确认', + cancelText: '取消', + onOk: async () => { + // 用户确认后执行删除操作 + setPageloading(true); + try { + const res = await removeNotice(record.id); + if (res.code === 200) { + message.success('删除成功'); + if (type === "change" || type === "changeNew") { + GetList(FpkId); + } else { + setRefresh(Math.random() + 1); + } + } + } catch (error) { + message.error('删除失败，请稍后重试'); + console.error('删除出错:', error); + } finally { + setRefresh(Math.random() + 1); + setPageloading(false); } + }, + onCancel: () => { + // 用户取消删除，不执行任何操作 + console.log('用户取消了删除操作'); } - setRefresh(Math.random() + 1) - setPageloading(false); }); - }; + /** * 批量删除 * */ const handleRemoveMore = async () => { - if (selectedRowsState.length != 0) { - setPageloading(true); - let param = [] - for (const item of selectedRowsState) { - param.push(item.id); - } - removeNotice(param).then(res => { - if (res.code == 200) { - message.success('删除成功'); - if (type == "change" || type == "changeNew") { - GetList(FpkId); - } else { - setRefresh(Math.random() + 1) + if (selectedRowsState.length !== 0) { + // 显示确认对话框 + Modal.confirm({ + title: '确认删除', + content: `您确定要删除选中的 ${selectedRowsState.length} 条数据吗？此操作不可撤销。`, + okText: '确认', + cancelText: '取消', + onOk: async () => { + // 用户确认后执行删除操作 + setPageloading(true); + const param = selectedRowsState.map(item => item.id); + + try { + const res = await removeNotice(param); + if (res.code === 200) { + message.success('删除成功'); + if (type === "change" || type === "changeNew") { + GetList(FpkId); + } else { + setRefresh(Math.random() + 1); + } + } + } catch (error) { + message.error('删除失败，请稍后重试'); + console.error('删除出错:', error); + } finally { + setRefresh(Math.random() + 1); + setPageloading(false); } - ; + }, + onCancel: () => { + // 用户取消删除，不执行任何操作 + console.log('用户取消了删除操作'); } - setRefresh(Math.random() + 1) - setPageloading(false); }); } }; + /** * 发布 * */ diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/components/BiddingAnnouncement.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/components/BiddingAnnouncement.tsx index f76150a..3ed636b 100644 --- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/components/BiddingAnnouncement.tsx +++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/components/BiddingAnnouncement.tsx @@ -171,7 +171,7 @@ const BiddingAnnouncement: React.FC = (props) => { "replyEndTime": moment(data.replyEndTime, 'yyyy-MM-DD HH:mm:ss'), "openingTime": moment(data.openingTime, 'yyyy-MM-DD HH:mm:ss'), "docEndTime": moment(data.docEndTime, 'yyyy-MM-DD HH:mm:ss'), - "openhallIdTime": data.openhallTitle,//开标大厅 时间段 + // "openhallIdTime": data.openhallTitle,//开标大厅 时间段 "openhallId": data.openhallId, "annoTitle": data.annoTitle, "medias": data.medias, @@ -212,7 +212,7 @@ const BiddingAnnouncement: React.FC = (props) => { "replyEndTime": moment(data.replyEndTime, 'yyyy-MM-DD HH:mm:ss'), "openingTime": moment(data.openingTime, 'yyyy-MM-DD HH:mm:ss'), "docEndTime": moment(data.docEndTime, 'yyyy-MM-DD HH:mm:ss'), - "openhallIdTime": data.openhallTitle,//开标大厅 时间段 + // "openhallIdTime": data.openhallTitle,//开标大厅 时间段 "openhallId": data.openhallId, "annoTitle": data.annoTitle, "medias": data.medias, @@ -248,7 +248,7 @@ const BiddingAnnouncement: React.FC = (props) => { "replyEndTime": moment(data.replyEndTime, 'yyyy-MM-DD HH:mm:ss'), "openingTime": moment(data.openingTime, 'yyyy-MM-DD HH:mm:ss'), "docEndTime": moment(data.docEndTime, 'yyyy-MM-DD HH:mm:ss'), - "openhallIdTime": data.openhallTitle,//开标大厅 时间段 + // "openhallIdTime": data.openhallTitle,//开标大厅 时间段 "openhallId": data.openhallId, "annoTitle": data.annoTitle, "medias": data.medias, @@ -292,7 +292,7 @@ const BiddingAnnouncement: React.FC = (props) => { "replyEndTime": moment(data.replyEndTime, 'yyyy-MM-DD HH:mm:ss'), "openingTime": moment(data.openingTime, 'yyyy-MM-DD HH:mm:ss'), "docEndTime": moment(data.docEndTime, 'yyyy-MM-DD HH:mm:ss'), - "openhallIdTime": data.openhallTitle,//开标大厅 时间段 + // "openhallIdTime": data.openhallTitle,//开标大厅 时间段 "openhallId": data.openhallId, "annoTitle": data.annoTitle, "medias": data.medias, @@ -397,7 +397,7 @@ const BiddingAnnouncement: React.FC = (props) => { "tpId": tpId, "csAnnoId": pkId, "attDatasetId": form.getFieldValue("attDatasetId"), - "openhallTitle": form.getFieldValue("openhallIdTime"),//开标大厅 时间段 + // "openhallTitle": form.getFieldValue("openhallIdTime"),//开标大厅 时间段 "contentWithStyle": braftRef.current.getHtml().replace(/ = (props) => { message.warn('资审投标截止时间需与资审文件获取截止时间间隔不少于5天'); } else if (moment(form.getFieldValue("openingTime")).diff(moment(form.getFieldValue("replyEndTime")), "minutes") != 0) { message.warn('资审开标时间（' + form.getFieldValue("openingTime").format("yyyy-MM-DD HH:mm") + '）需与资审投标截止时间（' + form.getFieldValue("replyEndTime").format("yyyy-MM-DD HH:mm") + '）相同'); - } else if (form.getFieldValue("openhallIdTime").substring(0, 10) != moment(form.getFieldValue("openingTime")).format('YYYY-MM-DD')) { - message.warn('开标大厅时间需与资审开标时间相同'); - } else { + } + // else if (form.getFieldValue("openhallIdTime").substring(0, 10) != moment(form.getFieldValue("openingTime")).format('YYYY-MM-DD')) { + // message.warn('开标大厅时间需与资审开标时间相同'); + // } + else { msg = "true" } /**比选一阶段 资格预审 */ @@ -463,9 +465,11 @@ const BiddingAnnouncement: React.FC = (props) => { message.warn('资审应答截止时间需与资审文件获取开始时间间隔不少于8天'); } else if (form.getFieldValue("openingTime").format('YYYY-MM-DD HH:mm:ss') < form.getFieldValue("replyEndTime").format('YYYY-MM-DD HH:mm:ss')) { message.warn('资审开启时间需晚于或等于资审应答截止时间'); - } else if (form.getFieldValue("openhallIdTime").substring(0, 10) != moment(form.getFieldValue("openingTime")).format('YYYY-MM-DD')) { - message.warn('开启大厅时间需与资审开启时间相同'); - } else { + } + // else if (form.getFieldValue("openhallIdTime").substring(0, 10) != moment(form.getFieldValue("openingTime")).format('YYYY-MM-DD')) { + // message.warn('开启大厅时间需与资审开启时间相同'); + // } + else { msg = "true" } } else { @@ -694,69 +698,69 @@ const BiddingAnnouncement: React.FC = (props) => { - - - - - - - - - - - - - - - )} - > -

温馨提示：如当天所有大厅预约已满，请联系系统客服帮您处理~

- ( - confirmChooseRoom(item)}> -
- -
-
{item.openDate}
-
已预约：{item.num}/{item.max}
-
-
- - )} - /> - - + {/**/} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* )}*/} + {/* >*/} + {/*

温馨提示：如当天所有大厅预约已满，请联系系统客服帮您处理~

*/} + {/* (*/} + {/* confirmChooseRoom(item)}>*/} + {/*
*/} + {/* */} + {/*
*/} + {/*
{item.openDate}
*/} + {/*
已预约：{item.num}/{item.max}
*/} + {/*
*/} + {/*
*/} + {/* */} + {/* )}*/} + {/* />*/} + {/* */} + {/**/}