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] =?UTF-8?q?=E5=8D=95=E4=B8=80=E6=9D=A5=E6=BA=90=E8=BD=AF?= =?UTF-8?q?=E6=8E=A7=E6=98=BE=E7=A4=BA=E7=A1=AE=E8=AE=A4=E6=8C=89=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 = (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 = (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(/ { + 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 = (props) => { setRiskData([]) }} data={riskData} - onSubmit={() => submit()} + onSubmit={() => saveAfterRisk()} />} 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) => { "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 = (props) => { const { modalVisible, onCancel, onSubmit, data } = props; - const [spinning, setSping] = useState(false);//加载遮罩 + const [confirmButtonVisible, setConfirmButtonVisible] = useState(true);//是否显示确定按钮 const columns: ProColumns[] = [ { @@ -55,11 +55,23 @@ const RiskPreventionSoft: React.FC = (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 ( = (props) => { bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto', padding: '8px 24px 16px' }} centered onCancel={() => onCancel()} - okButtonProps={{hidden: true}} + okButtonProps={{hidden: confirmButtonVisible}} onOk={() => { onSubmit(); onCancel();