From 48b39daad1f452c01aeb1b9a9fa062d1417d2784 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Wed, 5 Jul 2023 14:42:50 +0800 Subject: [PATCH] =?UTF-8?q?7.5=20=E4=B8=93=E5=AE=B6=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E7=BB=84=E7=85=A7=E7=89=87=E7=BB=B4=E6=8A=A4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E5=BD=93=E9=80=89=E6=8B=A9=E7=94=B5=E5=AD=90=E8=AF=84?= =?UTF-8?q?=E6=A0=87=E5=AE=A4=E7=9A=84=E6=A0=87=E6=AE=B5=EF=BC=8C=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E7=85=A7=E7=89=87=E6=97=B6=E4=B8=BA=E5=BF=85=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ElecBidEvaluation/ExpertPhotoUpload.tsx | 2 +- .../JudgingPanel/List/OutsourcingManage.tsx | 13 +++++----- .../JudgingPanel/List/index.tsx | 24 +++++++++++-------- src/pages/ZZhaoMu/JudgingPanel/index.tsx | 24 +++++++++++-------- 4 files changed, 36 insertions(+), 27 deletions(-) diff --git a/src/components/ElecBidEvaluation/ExpertPhotoUpload.tsx b/src/components/ElecBidEvaluation/ExpertPhotoUpload.tsx index 911922f..40e2fed 100644 --- a/src/components/ElecBidEvaluation/ExpertPhotoUpload.tsx +++ b/src/components/ElecBidEvaluation/ExpertPhotoUpload.tsx @@ -144,7 +144,7 @@ const ExpertPhotoUpload: React.FC = (props) => { > {uploadProps?.disabled || fileList.length >= 1 ? null : uploadButton} - + example diff --git a/src/pages/Tender/ProjectManager/JudgingPanel/List/OutsourcingManage.tsx b/src/pages/Tender/ProjectManager/JudgingPanel/List/OutsourcingManage.tsx index 424d23b..6a4de8a 100644 --- a/src/pages/Tender/ProjectManager/JudgingPanel/List/OutsourcingManage.tsx +++ b/src/pages/Tender/ProjectManager/JudgingPanel/List/OutsourcingManage.tsx @@ -252,18 +252,19 @@ const OutsourcingManage: React.FC = (props) => { > - + 若预约了电子评标室，请提前维护外协人员照片，避免无法进入电子评标室。} + style={{ display: 'inline-block', width: '80%' }} + rules={[{ required: true, message: "请上传照片" }]} + extra={要求本人清晰、免冠、正面彩色2寸（413*579px）头像照片，无逆光、无ps、无美颜，面部五官无遮挡，头像部约占照片高度的三分之二，照片保存格式为JPG格式，大小200k以下} > - + - - + */} @@ -1204,6 +1206,7 @@ const JudgingPanel: React.FC<{}> = () => { checkBoxsSet([]); changeMemberIdSet(''); setCheckedList([]); + setReserveStatus(false); form.resetFields(); } const columnsMember: ProColumns[] = [//成员管理页面表格 @@ -1616,19 +1619,20 @@ const JudgingPanel: React.FC<{}> = () => { > - + 评审专家照片为专家进入电子评标室报道及人脸识别认证使用，若预约了电子评标室，请维护专家照片。} + style={{ display: 'inline-block', width: '80%' }} + rules={[{ required: reserveStatus, message: "请上传照片" }]} + extra={要求本人清晰、免冠、正面彩色2寸（413*579px）头像照片，无逆光、无ps、无美颜，面部五官无遮挡，头像部约占照片高度的三分之二，照片保存格式为JPG格式，大小200k以下} > - - - - {/* */} + + {/* */} + {/* */} + {/* */} {/* = () => { centered destroyOnClose title="评审小组成员管理" - bodyStyle={{ maxHeight: modalHeight - 140, overflow: 'auto', minHeight: '300px', padding: '16px 0px 0px 0px' }} + bodyStyle={{ maxHeight: modalHeight - 140, overflow: 'auto', minHeight: '350px', padding: '16px 0px 0px 0px' }} footer={returnFooterMem()} onCancel={() => { setMemberVis(false); diff --git a/src/pages/ZZhaoMu/JudgingPanel/index.tsx b/src/pages/ZZhaoMu/JudgingPanel/index.tsx index 471e357..ecec0b4 100644 --- a/src/pages/ZZhaoMu/JudgingPanel/index.tsx +++ b/src/pages/ZZhaoMu/JudgingPanel/index.tsx @@ -56,6 +56,7 @@ const JudgingPanel: React.FC<{}> = (props: any) => { const [isReserve, setIsReserve] = useState("0");//电子评标室-是否预约电子评标室 2022.9.23 zhoujianlong 0-不预约 1-预约 const userData = getSessionUserData();//当前登录人用户信息 const [assistVisible, setAssistVisible] = useState(false);//协办管理visible 2022.10.10 zhoujianlong + const [reserveStatus, setReserveStatus] = useState(false);//成员管理-当前行是否预约了评标室 true-预约了 false-没预约 //外协管理 const [assistList, setAssistList] = useState([]);//外协人员数据 assistList const [assistNumber, setAssistNumber] = useState("");//外协人员数量 assistNumber @@ -155,6 +156,7 @@ const JudgingPanel: React.FC<{}> = (props: any) => { await queryOpenStatus(record.id); categorySet(record.juryCategoryVOList); juryIdSet(record.id); + setReserveStatus(record.reserveStatus === 1); memberCountSet(memberCount + 1); setMemberVis(true); }}>成员管理 @@ -1072,6 +1074,7 @@ const JudgingPanel: React.FC<{}> = (props: any) => { updateKeyMemSet(-1); checkBoxsSet([]); changeMemberIdSet(''); + setReserveStatus(false); form.resetFields(); } const columnsMember: ProColumns[] = [//成员管理页面表格 @@ -1484,19 +1487,20 @@ const JudgingPanel: React.FC<{}> = (props: any) => { > - + 评审专家照片为专家进入电子评标室报道及人脸识别认证使用，若预约了电子评标室，请维护专家照片。} + style={{ display: 'inline-block', width: '80%' }} + rules={[{ required: reserveStatus, message: "请上传照片" }]} + extra={要求本人清晰、免冠、正面彩色2寸（413*579px）头像照片，无逆光、无ps、无美颜，面部五官无遮挡，头像部约占照片高度的三分之二，照片保存格式为JPG格式，大小200k以下} > - - - - {/* */} + + {/* */} + {/* */} + {/* */} {/* = (props: any) => { centered destroyOnClose title="评审小组成员管理" - bodyStyle={{ maxHeight: modalHeight - 140, overflow: 'auto', minHeight: '300px', padding: '16px 0px 0px 0px' }} + bodyStyle={{ maxHeight: modalHeight - 140, overflow: 'auto', minHeight: '350px', padding: '16px 0px 0px 0px' }} footer={returnFooterMem()} onCancel={() => { setMemberVis(false);