From 7bb5a1705dc4fa1a540796186eda912d58ea7f34 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Thu, 21 Jul 2022 15:43:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E9=99=90=E5=AE=9A?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ViewRiskSupplierModal.tsx | 45 ++++ .../BidControl/BidControlManager/index.tsx | 197 +++++++++--------- .../BidControl/BidControlManager/service.ts | 11 +- 3 files changed, 158 insertions(+), 95 deletions(-) create mode 100644 src/pages/Evaluation/BidControl/BidControlManager/components/ViewRiskSupplierModal.tsx diff --git a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRiskSupplierModal.tsx b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRiskSupplierModal.tsx new file mode 100644 index 0000000..daa884d --- /dev/null +++ b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRiskSupplierModal.tsx @@ -0,0 +1,45 @@ +import React, { useEffect, useState } from 'react'; +import { Collapse } from 'antd'; +import { getRiskSupplierList } from '../service'; +import { getRoomId, getSessionProjectData } from '@/utils/session'; + +interface ViewRiskSupplierModalProps { + modalVisible: boolean; + values: any; + onCancel: any; +} + +const ViewRiskSupplierModal: React.FC = (props) => { + + const [riskSupplierData, setRiskSupplierData] = useState({}); + + useEffect(() => { + getRiskSupplierInfo(); + }, []) + + const getRiskSupplierInfo = async () => { + let roomId = getRoomId();//sessionStorage.getItem('roomId');//sessionStorage.getItem('roomId') + let projectId = getSessionProjectData().id; + + //黑名单 + await getRiskSupplierList(projectId, roomId).then((res) => { + if (res.success == true && res.data.success==false) { + setRiskSupplierData(res.data.data.result[0].regulationData[0].message); + } else { + setRiskSupplierData({}); + } + }) + } + + return ( + <> + + + {riskSupplierData} + + + + ); +}; + +export default ViewRiskSupplierModal; diff --git a/src/pages/Evaluation/BidControl/BidControlManager/index.tsx b/src/pages/Evaluation/BidControl/BidControlManager/index.tsx index 106c43a..320e3d4 100644 --- a/src/pages/Evaluation/BidControl/BidControlManager/index.tsx +++ b/src/pages/Evaluation/BidControl/BidControlManager/index.tsx @@ -1,17 +1,13 @@ -import React, { useState,useRef, useEffect } from 'react'; -import { Tabs,Table, Spin, message, Popconfirm,Card,Collapse, Modal, Button} from 'antd'; -import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table'; +import React, { useState } from 'react'; +import { ProColumns } from '@ant-design/pro-table'; import ViewRishFormModal from './components/ViewRishFormModal'; import ViewQuoteWarningFormModal from './components/ViewQuoteWarningFormModal'; -import { getRoomId, getSessionUserData } from '@/utils/session'; import ViewBlacklistFormModal from './components/ViewBlacklistFormModal'; import ViewReviewResultFormModal from './components/ViewReviewResultFormModal'; import ViewJuryScoringRemindFormModal from './components/ViewJuryScoringRemindFormModal'; import ViewJuryScoringAnalysisFormModal from './components/ViewJuryScoringAnalysisFormModal'; +import ViewRiskSupplierModal from './components/ViewRiskSupplierModal'; -function callback(key) { - //getSessionUserData.roleIds; -} const title2 = [ { @@ -41,9 +37,9 @@ const title2 = [ const columns: ProColumns[] = [ { title: '序号', dataIndex: 'num', width: 50, }, { title: '供应商名称', dataIndex: 'gysmc', }, - { title: 'IP地址',width: '20%', dataIndex: 'ip', }, + { title: 'IP地址', width: '20%', dataIndex: 'ip', }, { title: 'MAC地址', dataIndex: 'mac', }, - { title: '上传时间', dataIndex: 'uploadTime',}, + { title: '上传时间', dataIndex: 'uploadTime', }, ]; const columnsMac: ProColumns[] = [ @@ -65,7 +61,7 @@ const Sing: React.FC<{}> = () => { const [ViewRishFormVisible, setViewRishFormVisible] = useState(false); //查看详情窗口record const [ViewRishValues, setViewRishValues] = useState({}); - + //一致性 const [ViewQuoteWarningFormVisible, setViewQuoteWarningFormVisible] = useState(false); //查看详情窗口record @@ -85,96 +81,109 @@ const Sing: React.FC<{}> = () => { const [ViewJuryScoringRemindFormVisible, setViewJuryScoringRemindFormVisible] = useState(false); //查看详情窗口record const [ViewJuryScoringRemindValues, setViewJuryScoringRemindValues] = useState({}); - + //评审专家打分偏离度分析 const [ViewJuryScoringAnalysisFormVisible, setViewJuryScoringAnalysisFormVisible] = useState(false); //查看详情窗口record const [ViewJuryScoringAnalysisValues, setViewJuryScoringAnalysisValues] = useState({}); - - - const getWarningList = async() => { - } - return ( + //风控中心-风险限定供应商 + const [BidRiskSupplierVisible, setBidRiskSupplierVisible] = useState(false); + //风控中心-风险限定供应商record + const [BidRiskSupplierValues, setRiskSupplierValues] = useState({}); + return ( <> - { - ViewRishFormModal ? ( - { - setViewRishFormVisible(!ViewRishFormVisible); - setViewRishValues({}); - }} - > - - ) : null - } - { - ViewQuoteWarningFormModal ? ( - { - setViewQuoteWarningFormVisible(!ViewQuoteWarningFormVisible); - setViewQuoteWarningValues({}); - }} - > + { + ViewRishFormModal ? ( + { + setViewRishFormVisible(!ViewRishFormVisible); + setViewRishValues({}); + }} + > + + ) : null + } + { + ViewQuoteWarningFormModal ? ( + { + setViewQuoteWarningFormVisible(!ViewQuoteWarningFormVisible); + setViewQuoteWarningValues({}); + }} + > - - ) : null - } - { - ViewBlacklistFormModal ? ( - { - setViewBlacklistFormVisible(!ViewBlacklistFormVisible); - setViewBlacklistValues({}); - }} - > - - ) : null - } - { - ViewReviewResultFormModal ? ( - { - setViewReviewResultFormVisible(!ViewReviewResultFormVisible); - setViewReviewResultValues({}); - }} - > - - ) : null - } - { - ViewJuryScoringRemindFormModal ? ( - { - setViewJuryScoringRemindFormVisible(!ViewJuryScoringRemindFormVisible); - setViewJuryScoringRemindValues({}); - }} - > - - ) : null - } - { - ViewJuryScoringAnalysisFormModal ? ( - { - setViewJuryScoringAnalysisFormVisible(!ViewJuryScoringAnalysisFormVisible); - setViewJuryScoringAnalysisValues({}); - }} - > - - ) : null - } + + ) : null + } + { + ViewBlacklistFormModal ? ( + { + setViewBlacklistFormVisible(!ViewBlacklistFormVisible); + setViewBlacklistValues({}); + }} + > + + ) : null + } + { + ViewReviewResultFormModal ? ( + { + setViewReviewResultFormVisible(!ViewReviewResultFormVisible); + setViewReviewResultValues({}); + }} + > + + ) : null + } + { + ViewJuryScoringRemindFormModal ? ( + { + setViewJuryScoringRemindFormVisible(!ViewJuryScoringRemindFormVisible); + setViewJuryScoringRemindValues({}); + }} + > + + ) : null + } + { + ViewJuryScoringAnalysisFormModal ? ( + { + setViewJuryScoringAnalysisFormVisible(!ViewJuryScoringAnalysisFormVisible); + setViewJuryScoringAnalysisValues({}); + }} + > + + ) : null + } + { + ViewRiskSupplierModal ? ( + { + setBidRiskSupplierVisible(!BidRiskSupplierVisible); + setRiskSupplierValues({}); + }} + > + + ) : null + } ) } diff --git a/src/pages/Evaluation/BidControl/BidControlManager/service.ts b/src/pages/Evaluation/BidControl/BidControlManager/service.ts index 12bf955..a77ffc0 100644 --- a/src/pages/Evaluation/BidControl/BidControlManager/service.ts +++ b/src/pages/Evaluation/BidControl/BidControlManager/service.ts @@ -113,7 +113,16 @@ export async function replace(a: any,b: any,c: any){ return a.replace(b,c); } - +//风险限定供应商 +export async function getRiskSupplierList(projectId: any, assessRoomId: any) { + return request('/api/biz-service-ebtp-evaluation/v1/risk/querySupplierLimit', { + method: 'post', + data: { + "assessRoomId": assessRoomId, + "projectId": projectId + } + }); +} From 5785daafa6d66eafb81e2ec88cf0b867dc6acd8b Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Thu, 21 Jul 2022 15:47:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E9=99=90=E5=AE=9A?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BidControl/BidControlManager/index.tsx | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/src/pages/Evaluation/BidControl/BidControlManager/index.tsx b/src/pages/Evaluation/BidControl/BidControlManager/index.tsx index 320e3d4..07796d5 100644 --- a/src/pages/Evaluation/BidControl/BidControlManager/index.tsx +++ b/src/pages/Evaluation/BidControl/BidControlManager/index.tsx @@ -1,5 +1,4 @@ import React, { useState } from 'react'; -import { ProColumns } from '@ant-design/pro-table'; import ViewRishFormModal from './components/ViewRishFormModal'; import ViewQuoteWarningFormModal from './components/ViewQuoteWarningFormModal'; import ViewBlacklistFormModal from './components/ViewBlacklistFormModal'; @@ -9,53 +8,6 @@ import ViewJuryScoringAnalysisFormModal from './components/ViewJuryScoringAnalys import ViewRiskSupplierModal from './components/ViewRiskSupplierModal'; -const title2 = [ - { - title: '序号', - dataIndex: 'num', - key: 'num', - }, - { - title: '投标人及报价', - dataIndex: 'tbrbj', - key: 'tbrbj', - }, - { - title: '预警信息', - dataIndex: 'yjxx', - key: 'yjxx', - }, - { - title: '操作', - dataIndex: 'cz', - key: 'cz', - }, -]; - - - -const columns: ProColumns[] = [ - { title: '序号', dataIndex: 'num', width: 50, }, - { title: '供应商名称', dataIndex: 'gysmc', }, - { title: 'IP地址', width: '20%', dataIndex: 'ip', }, - { title: 'MAC地址', dataIndex: 'mac', }, - { title: '上传时间', dataIndex: 'uploadTime', }, -]; - -const columnsMac: ProColumns[] = [ - { title: '序号', dataIndex: 'num', width: 50, }, - { title: '供应商名称', dataIndex: 'gysmc', }, - { title: '相同的MAC地址', dataIndex: 'mac', }, -]; - -const columns2: ProColumns[] = [ - { title: '序号', dataIndex: 'num', width: 50, }, - { title: '投标人及报价', dataIndex: 'tbrbj', }, - { title: '预警信息', dataIndex: 'yjxx', }, - { title: '操作', dataIndex: '', }, -]; - - const Sing: React.FC<{}> = () => { //ip mac const [ViewRishFormVisible, setViewRishFormVisible] = useState(false); From d747a5ff2b8ffab9a23f44fc43d2ca048cfc29f3 Mon Sep 17 00:00:00 2001 From: yss <17921@qq.com> Date: Thu, 11 Aug 2022 13:39:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B9=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BidControlManager/components/ViewRiskSupplierModal.tsx | 2 +- src/pages/Evaluation/BidControl/BidControlManager/service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRiskSupplierModal.tsx b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRiskSupplierModal.tsx index daa884d..747868e 100644 --- a/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRiskSupplierModal.tsx +++ b/src/pages/Evaluation/BidControl/BidControlManager/components/ViewRiskSupplierModal.tsx @@ -26,7 +26,7 @@ const ViewRiskSupplierModal: React.FC = (props) => { if (res.success == true && res.data.success==false) { setRiskSupplierData(res.data.data.result[0].regulationData[0].message); } else { - setRiskSupplierData({}); + setRiskSupplierData("暂无数据"); } }) } diff --git a/src/pages/Evaluation/BidControl/BidControlManager/service.ts b/src/pages/Evaluation/BidControl/BidControlManager/service.ts index 912b9bf..aae681e 100644 --- a/src/pages/Evaluation/BidControl/BidControlManager/service.ts +++ b/src/pages/Evaluation/BidControl/BidControlManager/service.ts @@ -122,7 +122,7 @@ export async function replace(a: any,b: any,c: any){ //风险限定供应商 export async function getRiskSupplierList(projectId: any, assessRoomId: any) { - return request('/api/biz-service-ebtp-evaluation/v1/risk/querySupplierLimit', { + return request('/api/biz-service-ebtp-rsms/v1/riskcenter/querySupplierLimit', { method: 'post', data: { "assessRoomId": assessRoomId,