From eb7edbf807c55e87c2774f330bced3b2eb2d42a2 Mon Sep 17 00:00:00 2001 From: jlzhangyx5 Date: Fri, 13 Jun 2025 15:27:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E5=A7=94=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Bid/ReviewConfig/List/index.tsx | 3 +- .../JudgingPanel/List/index.tsx | 76 +++++++------------ 2 files changed, 29 insertions(+), 50 deletions(-) diff --git a/src/pages/Bid/ReviewConfig/List/index.tsx b/src/pages/Bid/ReviewConfig/List/index.tsx index a73267b..5483b5b 100644 --- a/src/pages/Bid/ReviewConfig/List/index.tsx +++ b/src/pages/Bid/ReviewConfig/List/index.tsx @@ -205,8 +205,7 @@ const List: React.FC<{}> = () => { } useEffect(() => { //取项目id - //proIdSet(getProId());//TODO zyx-假数据 - proIdSet("1920644626460389376"); + proIdSet(getProId()); // getHaveConfigSections(); }, []); return ( diff --git a/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx b/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx index e0bcc5b..74008d9 100644 --- a/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx +++ b/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useRef, useState } from 'react'; import { Button, Checkbox, Col, Collapse, DatePicker, Drawer, Form, Input, message, Modal, Popconfirm, Row, Select, Spin, Upload, Image, InputNumber } from 'antd' import ProTable, { ActionType, EditableProTable, ProColumns } from '@ant-design/pro-table'; -import { getList, saveGroup, delOne, saveMember, changeEx, queryVoList, changeMember, applyFor, roomStatus, juryTem, rePassWord, getUserPhoto, unlockAccount, getCrotchListUsingGET } from './service'; +import { getList, saveGroup, delOne, saveMember, changeEx, queryVoList, changeMember, applyFor, roomStatus, juryTem, rePassWord, getUserPhoto, unlockAccount, getCrotchListUsingGET, getSecs } from './service'; import moment from 'moment'; -import { getDefId, getProId, getProMethod, getSessionUserData } from '@/utils/session'; +import { getDefId, getProId, getProMethod, getProOpenTenderForm, getSessionUserData } from '@/utils/session'; import { getURLInformation, isEmpty } from '@/utils/CommonUtils'; import './judgList.less'; import '@/assets/xsy_style.less'; @@ -17,7 +17,7 @@ import ExpertSchemeProfessionalInfo from './ExpertSchemeProfessionalInfo'; const JudgingPanel: React.FC<{}> = () => { const modalHeight = window.innerHeight * 96 / 100; - const proId = "1513327631627579392";//getProId();//TODO zyx-假数据 + const proId = getProId(); const roomType = getURLInformation('roomType'); // const tailLayout = { wrapperCol: { offset: 8, span: 20 }, }; const formLayout = { labelCol: { span: 8 }, wrapperCol: { span: 16 }, }; @@ -53,7 +53,7 @@ const JudgingPanel: React.FC<{}> = () => { const [editableKeys, setEditableRowKeys] = useState([]); const [tableData, setTableData] = useState([]); function getShouName() { - const method = 'procurement_mode_1';//getProMethod();//TODO zyx-假数据 + const method = getProMethod(); let showNameT: any = { zbr: '', bb: '', pb: '', }//相关标段 标书费 保证金 服务费 // let num = 3; if (method === 'procurement_mode_1' || method === 'procurement_mode_2') {//招标 @@ -328,34 +328,19 @@ const JudgingPanel: React.FC<{}> = () => { params['juryId'] = ''; } getShouName();//根据采购类型变名字 - // TODO zyx假数据 - // modalVis == true ? getSecs({ ...params }).then((res) => { - let data = []; - let secVals = []; - // TODO zyx假数据 - // if (res.success) { - let res = { - "code": 200, "success": true, "message": "success", - "data": [{ - "id": "1905086119331868672", "tpId": "1905086117686558720", "sectionId": "1905086117879496704", - "sectionNum": "ZX00852409000329", "sectionName": "0926", "roomType": 2, "status": 1, - "openTime": "2025-04-27 14:42:00", "juryNumber": "5" - }, - { - "id": "1905086119331868671", "tpId": "1905086117686558720", "sectionId": "1905086117879496701", - "sectionNum": "ZX00852409000321", "sectionName": "0926-2", "roomType": 2, - "status": 1, "openTime": "2025-04-25 12:42:00", "juryNumber": "7" - }] - }; - secVals = res.data.map((item: any) => { return item.sectionId }) - data = res.data; - // } - setSections(data); - setSectionsVal(secVals); - setIndeterminate(!!checked.length && checked.length < secVals.length); - setCheckAll(checked.length === secVals.length); - updateData && String(updateData?.reserveStatus) == "1" && getEarliestTime(data, checked);//初始化赋值数据 - // }) : null; + modalVis == true ? getSecs({ ...params }).then((res) => { + let data = []; + let secVals = []; + if (res.success) { + secVals = res.data.map((item: any) => { return item.sectionId }) + data = res.data; + } + setSections(data); + setSectionsVal(secVals); + setIndeterminate(!!checked.length && checked.length < secVals.length); + setCheckAll(checked.length === secVals.length); + updateData && String(updateData?.reserveStatus) == "1" && getEarliestTime(data, checked);//初始化赋值数据 + }) : null; }, [sectionCount]); @@ -402,10 +387,7 @@ const JudgingPanel: React.FC<{}> = () => { let res = true; const defId = getDefId();//16 const method = getProMethod();//9 - //TODO zyx--假数据--start - const yushenType = "open_tender_form_1"; - // const yushenType = getSessionProjectData().openTenderForm; - //TODO zyx--假数据--end + const yushenType = getProOpenTenderForm(); let manNumT = 5; if (method === 'procurement_mode_1' || method === 'procurement_mode_2') { @@ -487,8 +469,10 @@ const JudgingPanel: React.FC<{}> = () => { // 在 useEffect 中监听依赖项 useEffect(() => { - calculateExpertNumber(); - }, [form.getFieldValue('representativeNumber'), checkedList]); + if (Array.isArray(sections) && sections.length > 0) { + calculateExpertNumber(); + } + }, [form.getFieldValue('representativeNumber'), checkedList, sections]); const tab1 = () => {//cqtab1 return ( <> @@ -1042,16 +1026,12 @@ const JudgingPanel: React.FC<{}> = () => { }); }, [memberCount]); async function queryOpenStatus(id: any) {//查是否开启评标 id:评委会id - //TODO ZYX假数据-start - openSet(false); - allEndSet(false); - // await roomStatus(id).then((res) => { - // if (res.data) { - // openSet(res.data.anyOpenRoom); - // allEndSet(res.data.allEndRoom); - // } - // }) - //TODO ZYX假数据-end + await roomStatus(id).then((res) => { + if (res.data) { + openSet(res.data.anyOpenRoom); + allEndSet(res.data.allEndRoom); + } + }) } const returnPanel = () => {//返回手风琴 return (