From 324d61dbde5bd83eef6f88fc69c43ee5ccb6c9c0 Mon Sep 17 00:00:00 2001 From: lix Date: Thu, 31 Jul 2025 16:57:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=92=8C=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 --- .../BiddingDocumentList.tsx | 44 ++++++++++++------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingDocumentList.tsx b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingDocumentList.tsx index c8da32a..165f70b 100644 --- a/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingDocumentList.tsx +++ b/src/pages/ZYuShen/Bid/BiddingAnnouncement/BiddingDocumentList.tsx @@ -1,7 +1,7 @@ import { UnorderedListOutlined } from "@ant-design/icons" import ProTable, { ActionType, ProColumns } from "@ant-design/pro-table" import tableProps from '@/utils/tableProps'; -import { Button, Card, Divider, message, Spin } from "antd" +import { Button, Card, Divider, message, Modal, Popconfirm, Spin } from "antd" import React, { useEffect, useRef, useState } from "react" import BiddingDocument from "./components/BiddingDocument" import { @@ -95,7 +95,9 @@ const BiddingDocumentList: React.FC<{}> = (props) => { let btn1 = ( <> - + toRemove(record)}> + + ); let btn2 = ( @@ -172,21 +174,31 @@ const BiddingDocumentList: React.FC<{}> = (props) => { } const toRemoveMore = () => { if (selectedRowsState.length != 0) { - setPageloading(true); - let param = [] - for (const item of selectedRowsState) { - param.push(item.id); - } - removefile(param).then(res => { - if (res.code == 200) { - message.success('删除成功'); - } + Modal.confirm({ + title: '确定删除吗？', + onOk: () => { + setPageloading(true); + let param = [] + for (const item of selectedRowsState) { + param.push(item.id); + } + removefile(param).then(res => { + if (res.code == 200) { + message.success('删除成功'); + } - setPageloading(false); - setRefresh(Math.random() + 1) - setSelectedRows([]); - actionRef?.current?.reloadAndRest?.(); - }); + setPageloading(false); + setRefresh(Math.random() + 1) + setSelectedRows([]); + actionRef?.current?.reloadAndRest?.(); + }); + }, + onCancel: () => { + setSelectedRows([]); + } + }) + } else { + message.warn('请选择要删除的资审文件'); } } From 46e8c40ab9d3e8a70055180de35dbbfad03f3ab3 Mon Sep 17 00:00:00 2001 From: lix Date: Thu, 31 Jul 2025 16:59:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E5=A4=A7=E5=8E=85=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Opening/ProjectManager/OpenList/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Opening/ProjectManager/OpenList/index.tsx b/src/pages/Opening/ProjectManager/OpenList/index.tsx index 92bac48..132cef6 100644 --- a/src/pages/Opening/ProjectManager/OpenList/index.tsx +++ b/src/pages/Opening/ProjectManager/OpenList/index.tsx @@ -242,9 +242,9 @@ const Sing: React.FC<{}> = () => {

{showNameT.kb}列表

-
+ {/*
-
+
*/}
Date: Thu, 31 Jul 2025 17:15:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.ts | 1 + config/router_system.ts | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/config/config.ts b/config/config.ts index 317a28c..ed00498 100644 --- a/config/config.ts +++ b/config/config.ts @@ -32,6 +32,7 @@ export default defineConfig({ targets: { ie: 11, }, + jsMinifier: 'terser', define: { PROJECT_THEME: JSON.stringify(theme), }, diff --git a/config/router_system.ts b/config/router_system.ts index a46cb65..109f63e 100644 --- a/config/router_system.ts +++ b/config/router_system.ts @@ -32,6 +32,11 @@ export default [{ path: '/System/CategoryManagement', component: './CategoryManagement/components/CategoryMaintenance', }, + {//品类管理 + name: '供应商账号管理', + path: '/System/SupplierAccount', + component: './System/SupplierUser', + }, {//定时任务管理 path: '/System/Scheduled', component: './System/Scheduled', From 394989b8307516eef7b68bc442cad35cea133399 Mon Sep 17 00:00:00 2001 From: lix Date: Fri, 1 Aug 2025 11:14:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E4=B8=93=E5=AE=B6=E6=9D=A5=E6=BA=90=E5=92=8C=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JudgingPanel/List/index.tsx | 46 +++++++++++++------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx b/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx index 0738821..28e88c5 100644 --- a/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx +++ b/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx @@ -1,5 +1,5 @@ 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 { Button, Checkbox, Col, Collapse, DatePicker, Drawer, Form, Input, message, Modal, Popconfirm, Row, Select, Spin, Upload, Radio, InputNumber } from 'antd' import ProTable, { ActionType, EditableProTable, ProColumns } from '@ant-design/pro-table'; import tableProps from '@/utils/tableProps'; import { getList, saveGroup, delOne, saveMember, changeEx, queryVoList, changeMember, applyFor, roomStatus, juryTem, rePassWord, getUserPhoto, unlockAccount, getCrotchListUsingGET, getSecs } from './service'; @@ -12,9 +12,10 @@ import FileDown from '@/utils/Download'; import { UploadOutlined } from '@ant-design/icons'; import { btnAuthority } from '@/utils/authority'; import RiskPrevention from '@/utils/RiskPrevention'; -import { downloadPath } from '@/utils/DownloadUtils'; +import ExtendUpload from '@/utils/ExtendUpload'; +// import { downloadPath } from '@/utils/DownloadUtils'; import { sortBy } from 'lodash'; -import ExpertSchemeProfessionalInfo from './ExpertSchemeProfessionalInfo'; +// import ExpertSchemeProfessionalInfo from './ExpertSchemeProfessionalInfo'; const JudgingPanel: React.FC<{}> = () => { const modalHeight = window.innerHeight * 96 / 100; @@ -46,7 +47,7 @@ const JudgingPanel: React.FC<{}> = () => { // const [manNum, manNumSet] = useState(5);//人数 const [riskVisible, setRiskVisible] = useState(false);//风控弹窗 2021.9.7 zhoujianlong const [riskData, setRiskData] = useState([]);//风控数据 2021.9.7 zhoujianlong - // const [userPhotoId, setUserPhotoId] = useState("");//电子评标室-录入外部专家-相片id 2022.8.29 zhoujianlong + // const [userPhotoId, setUserPhotoId] = useState("");//电子评标室-录入专家-相片id 2022.8.29 zhoujianlong const userData = getSessionUserData();//当前登录人用户信息 const [professionalMap, setProfessionalMap] = useState(); @@ -890,7 +891,7 @@ const JudgingPanel: React.FC<{}> = () => { }; //成员管理 - const [add, setAdd] = useState(false);//录入外部专家Drawer显隐 + const [add, setAdd] = useState(false);//录入专家Drawer显隐 const [changeMan, changeManSet] = useState(false);//更换Drawer显隐 const [juryId, juryIdSet] = useState('');//更换专家所需评委会id const [reason, reasonSet] = useState('');//更换专家原因 @@ -908,6 +909,7 @@ const JudgingPanel: React.FC<{}> = () => { const [changeMemberId, changeMemberIdSet] = useState('');//更换专家id const [changeBtn, changeBtnSet] = useState(true);//更换按钮显隐 const [formMem] = Form.useForm(); + const formMemSourceType = Form.useWatch('sourceType', formMem); function reset() {//重置 categorySet([]); luruSet(0); @@ -1099,7 +1101,7 @@ const JudgingPanel: React.FC<{}> = () => { message.error('录入人数已满') } }} - > 录入外部专家 + > 录入专家 ]} /> @@ -1123,7 +1125,7 @@ const JudgingPanel: React.FC<{}> = () => { } else { message.error('录入人数已满') } - }}> 录入外部专家 + }}> 录入专家 ]} /> @@ -1147,7 +1149,7 @@ const JudgingPanel: React.FC<{}> = () => { } else { message.error('录入人数已满') } - }}> 录入外部专家 + }}> 录入专家 ]} /> @@ -1171,7 +1173,7 @@ const JudgingPanel: React.FC<{}> = () => { } else { message.error('录入人数已满') } - }}> 录入外部专家 + }}> 录入专家 ]} /> @@ -1195,7 +1197,7 @@ const JudgingPanel: React.FC<{}> = () => { // } else { // message.error('录入人数已满') // } - // }}> 录入外部专家 + // }}> 录入专家 ]} /> @@ -1253,7 +1255,7 @@ const JudgingPanel: React.FC<{}> = () => { return ( <> { @@ -1261,11 +1263,21 @@ const JudgingPanel: React.FC<{}> = () => { changeBtnSet(true); // formMem.resetFields(); }} - visible={add} + open={add} getContainer={false} style={{ position: 'absolute' }} >
+ + + 集团内部专家 + 集团外部专家 + + = () => { > + {formMemSourceType === '1' ? ( + + ) : null}