liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20230705-专家评审组照片维护功能，当选择电子评标室的标段，维护照片时为必选项。' into 'release_20230714'

Browse Source 
7.14 专家评审组照片维护功能，当选择电子评标室的标段，维护照片时为必选项。

See merge request eshop/fe_service_ebtp_frontend!303
This commit is contained in:
jl-zhoujl2
2023-07-14 03:14:30 +00:00
parent 2188506c8e 133f159450
commit 18e2ab547c
6 changed files with 136 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/pages/ZZhaoMu/JudgingPanel/index.tsx
View File

@ -17,6 +17,7 @@ import { getUserPhoto, unlockAccount } from '@/pages/Tender/ProjectManager/Judgi
import BidEvalAppointment from '@/components/ElecBidEvaluation/BidEvalAppointment';
import OutsourcingManage from '@/pages/Tender/ProjectManager/JudgingPanel/List/OutsourcingManage';
import { dateTimeFormatter } from '@/utils/DateUtils';
import { isEmpty } from '@/utils/CommonUtils';
const JudgingPanel: React.FC<{}> = (props: any) => {
const modalHeight = window.innerHeight * 96 / 100;
@ -56,6 +57,7 @@ const JudgingPanel: React.FC<{}> = (props: any) => {
const [isReserve, setIsReserve] = useState<string>("0");//电子评标室-是否预约电子评标室 2022.9.23 zhoujianlong 0-不预约 1-预约
const userData = getSessionUserData();//当前登录人用户信息
const [assistVisible, setAssistVisible] = useState<boolean>(false);//协办管理visible 2022.10.10 zhoujianlong
const [reserveStatus, setReserveStatus] = useState<boolean>(false);//成员管理-当前行是否预约了评标室 true-预约了 false-没预约
//外协管理
const [assistList, setAssistList] = useState<any>([]);//外协人员数据 assistList
const [assistNumber, setAssistNumber] = useState<string>("");//外协人员数量 assistNumber
@ -155,6 +157,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);
}}>成员管理</Button>
@ -1072,6 +1075,7 @@ const JudgingPanel: React.FC<{}> = (props: any) => {
updateKeyMemSet(-1);
checkBoxsSet([]);
changeMemberIdSet('');
setReserveStatus(false);
form.resetFields();
}
const columnsMember: ProColumns<any>[] = [//成员管理页面表格
@ -1484,19 +1488,20 @@ const JudgingPanel: React.FC<{}> = (props: any) => {
>
<Input style={{ width: "60%" }} onChange={onCertificateChange} />
</FormItem></Col></Row>
<Form.Item label="照片" style={{ marginBottom: 0 }}>
<Form.Item label="照片" required={reserveStatus} style={{ marginBottom: 0 }} tooltip="评审专家照片为专家进入电子评标室报道及人脸识别认证使用，若预约了电子评标室，请维护专家照片。">
<Form.Item
name="faceId"
style={{ display: 'inline-block', width: '60%' }}
extra={<span style={{ color: '#b30000' }}>评审专家照片为专家进入电子评标室报道及人脸识别认证使用，若预约了电子评标室，请维护专家照片。</span>}
style={{ display: 'inline-block', width: '80%' }}
rules={[{ required: reserveStatus, message: "请上传照片" }]}
extra={<span style={{ color: '#b30000' }}>要求本人清晰、免冠、正面彩色2寸头像照片，无逆光、无ps、无美颜，面部五官无遮挡，头像部约占照片高度的三分之二，照片保存格式为JPG格式，大小400k以下</span>}
>
<ExpertPhotoUpload maxSize={200} />
</Form.Item>
<Form.Item
style={{ display: 'inline-block', width: '40%', position: "relative", right: '24%' }}
>
{/* <Button type='primary' onClick={() => getExpertPhoto()}>获取照片</Button> */}
<ExpertPhotoUpload maxSize={400} uploadProps={{ accept: ".jpg,.jpeg" }} />
</Form.Item>
{/* <Form.Item
style={{ display: 'inline-block', width: '20%', position: "relative", right: '24%' }}
> */}
{/* <Button type='primary' onClick={() => getExpertPhoto()}>获取照片</Button> */}
{/* </Form.Item> */}
</Form.Item>
{/* <Row><Col span={24}><FormItem
name="type"
@ -1688,6 +1693,18 @@ const JudgingPanel: React.FC<{}> = (props: any) => {
// qita != undefined && qita.extractNumber==qita.juryMemberList.length ? params.push(...qita.juryMemberList) : null;
if (chackNum) {
let count = 0
for (let i = 0, length = params.length; i < length; i++) {
const item = params[i];
if (isEmpty(item.faceId)) {
count += 1;
}
}
if (count > 0) {
message.error(`请上传专家照片`);
loadingSet(false);
return;
}
const success = await saveMember({ juryMemberDTOList: params, roomId: roomId }).then((res) => {
return res.success
});
@ -1757,7 +1774,7 @@ const JudgingPanel: React.FC<{}> = (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);