From 8fc30a53d31746f9d0787b028f52ba40e1f9de91 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Thu, 27 Oct 2022 13:50:42 +0800 Subject: [PATCH] =?UTF-8?q?10.27=20=E5=85=AC=E5=BC=80=E6=AF=94=E9=80=89?= =?UTF-8?q?=EF=BC=88=E5=A4=9A=E9=98=B6=E6=AE=B5=E3=80=81=E4=B8=80=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=89=E5=88=9D=E5=AE=A1=E6=B1=87=E6=80=BB=E7=8E=AF?= =?UTF-8?q?=E8=8A=82=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E4=B8=89=E5=AE=B6=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E8=AF=A6=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BidPreliminaryReviewLeader/index.tsx | 57 +++--- .../components/DetailedSummary.tsx | 98 +++++++-- .../View/BidNumberManager/service.ts | 10 + .../components/BidDetailSummary.tsx | 48 ++++- .../View/BidNumberReviewLeader/index.tsx | 189 ++++++++++++++++-- .../View/BidNumberReviewLeader/service.ts | 67 +++++-- 6 files changed, 377 insertions(+), 92 deletions(-) diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx index 6aa0aa8..36d123c 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx +++ b/src/pages/Evaluation/BidPreliminary/BidPreliminaryReviewLeader/index.tsx @@ -748,7 +748,6 @@ const Index: React.FC<{}> = () => { } //处理汇总表返回的数据 const getRemarkList = (data: any) => { - console.log('data', data); const List: any[] = [] for (const item of totalSupplierColumns) { const obj = data[data.length - 1][item?.supplierRegisterId] @@ -884,30 +883,30 @@ const Index: React.FC<{}> = () => { }) }, [count]); -/** + /** * 风控中心校验 - * @param params */ - const verificationRiskControl = () => { - const remarkList = getRemarkList(ref.current); - console.log(remarkList); - let submitData = { - reviewStatus: '2', - reviewTurnId: getURLInformation("turnId"), - reviewType: '1', - remarkList: remarkList, - } - beforeRiskControl(submitData).then(res => { - if (res?.code == 200) { - if (res?.data.length > 0) { - setRiskData(res?.data); - setRiskVisible(true); - } else { - finalSubmit(); + const verificationRiskControl = () => { + const remarkList = getRemarkList(ref.current); + if (remarkList) { + let submitData = { + reviewStatus: '2', + reviewTurnId: getURLInformation("turnId"), + reviewType: '1', + remarkList: remarkList, } + beforeRiskControl(submitData).then(res => { + if (res?.code == 200) { + if (res?.data.length > 0) { + setRiskData(res?.data); + setRiskVisible(true); + } else { + finalSubmit(); + } + } + }) } - }) -} + } return ( <> @@ -1099,14 +1098,14 @@ const Index: React.FC<{}> = () => { {/**风控组件 */} {riskVisible && { - setRiskVisible(false); - setRiskData([]); - }} - onSubmit={() => finalSubmit()} - data={riskData} - />} + modalVisible={riskVisible} + onCancel={() => { + setRiskVisible(false); + setRiskData([]); + }} + onSubmit={() => finalSubmit()} + data={riskData} + />} ) diff --git a/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/components/DetailedSummary.tsx b/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/components/DetailedSummary.tsx index d628103..2e2f7e7 100644 --- a/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/components/DetailedSummary.tsx +++ b/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/components/DetailedSummary.tsx @@ -1,13 +1,30 @@ import React, { useEffect, useState } from 'react'; -import { Table } from 'antd'; +import { Form, Input, Radio, Table } from 'antd'; import '@/assets/ld_style.less'; -import { getJuryDetailScoreData, getJuryList } from '../service'; +import { checkShowData, getJuryDetailScoreData, getJuryList } from '../service'; import { getURLInformation } from '@/utils/CommonUtils'; import { getRoomId } from '@/utils/session'; +import ExtendUpload from '@/utils/ExtendUpload'; + +const layout = { + labelCol: { span: 2 }, + wrapperCol: { span: 16 }, +}; +const validateMessages = { + required: '请填写${label}', +}; const DetailedSummary: React.FC<{}> = () => { //存储表 const [scheduleTable, setScheduleTable] = useState(); + //单选数值存储 + const [radioValue, setRadioValue] = useState(1); + //是否显示合格供应商不足三家 + const [isShowFoot, setIsShowFoot] = useState(false); + //说明文件fileId + const [fileId, setFileId] = useState(''); + const { TextArea } = Input; + const [form] = Form.useForm(); //初始化表 useEffect(() => { //全部参数 @@ -21,12 +38,12 @@ const DetailedSummary: React.FC<{}> = () => { //获取评委 getJuryList(juryParams).then((res) => { if (res.code == 200) { - //获取汇总表数据 getJuryDetailScoreData(juryDataParams).then((response) => { if (response.code == 200) { //调用数据处理方法并初始化表格 InitializeTable(res.data, response.data); + getFooterData(); } }); } @@ -35,21 +52,21 @@ const DetailedSummary: React.FC<{}> = () => { //初始化表格方法 const InitializeTable = (columns: any, data: any) => { - + //处理数据 let totalData: any[] = [] data.forEach((ele: any) => { - let inner = ele - inner.key = ele.supplierRegisterId + 1 - for (const key in inner.scoreMap) { - if (Object.prototype.hasOwnProperty.call(inner.scoreMap, key)) { - inner.scoreMap[key] = inner.scoreMap[key] == undefined ? "-" : inner.scoreMap[key].score - } - } - Object.assign(inner,inner.scoreMap) - totalData.push(inner) + let inner = ele + inner.key = ele.supplierRegisterId + 1 + for (const key in inner.scoreMap) { + if (Object.prototype.hasOwnProperty.call(inner.scoreMap, key)) { + inner.scoreMap[key] = inner.scoreMap[key] == undefined ? "-" : inner.scoreMap[key].score + } + } + Object.assign(inner, inner.scoreMap) + totalData.push(inner) }); - + //处理表头 const tcolumns: any[] = [ { @@ -83,17 +100,62 @@ const DetailedSummary: React.FC<{}> = () => { title: ele.name, dataIndex: ele.userId, key: ele.userId, - render:(value: any,record: any,index: any) => { - return value == undefined ? "-" : value + render: (value: any, record: any, index: any) => { + return value == undefined ? "-" : value } }); }); setScheduleTable( //
- +
// , ); }; - return <>{scheduleTable}; + + //radio单选onChange方法 + const radioOnChange = (e: any) => { + setRadioValue(e.target.value); + }; + //获取不满足三家数据 + const getFooterData = () => { + checkShowData(getRoomId()).then(response => { + if (response?.code == 200) { + if (response?.data == undefined) { } else { + setIsShowFoot(true) + setRadioValue(response.data?.continueStatus) + if (response.data?.continueStatus == 1) { + setFileId(response.data?.fileId) + form.setFieldsValue({ + remarks: response.data?.remarks + }) + } + } + } + }) + } + return ( + <> + {scheduleTable} + {isShowFoot ? ( +
+
+ 合格供应商不足三家，是否继续进行详审： + + 是，继续进行 + 否，终止评审 + +
+
+