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

2023-07-05 14:42:50 +08:00
parent 6d73c004cc
commit 48b39daad1
4 changed files with 36 additions and 27 deletions
--- a/src/components/ElecBidEvaluation/ExpertPhotoUpload.tsx
+++ b/src/components/ElecBidEvaluation/ExpertPhotoUpload.tsx
@ -144,7 +144,7 @@ const ExpertPhotoUpload: React.FC<ExpertPhotoUpload> = (props) => {
            >
                {uploadProps?.disabled || fileList.length >= 1 ? null : uploadButton}
            </Upload>
-            <Modal visible={previewVisible} title="查看" footer={null} onCancel={handleCancel} centered>
+            <Modal visible={previewVisible} title="查看" width={'461px'} footer={null} onCancel={handleCancel} centered>
                <img alt="example" style={{ width: '100%' }} src={previewImage} />
            </Modal>
        </>
--- 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<OutsourcingManageProps> = (props) => {
            >
              <Input style={{ width: "60%" }} />
            </Form.Item></Col></Row>
-            <Form.Item label="照片" style={{ marginBottom: 0 }}>
+            <Form.Item label="照片" required 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: true, message: "请上传照片" }]}
+                extra={<span style={{ color: '#b30000' }}>要求本人清晰、免冠、正面彩色2寸（413*579px）头像照片，无逆光、无ps、无美颜，面部五官无遮挡，头像部约占照片高度的三分之二，照片保存格式为JPG格式，大小200k以下</span>}
              >
-                <ExpertPhotoUpload maxSize={200} />
+                <ExpertPhotoUpload maxSize={200} uploadProps={{ accept: ".jpg,.jpeg" }} />
              </Form.Item>
-              <Form.Item
+              {/* <Form.Item
                style={{ display: 'inline-block', width: '40%', position: "relative", right: '24%' }}
              >
-              </Form.Item>
+              </Form.Item> */}
            </Form.Item>
            <Row><Col span={24}><Form.Item {...tailLayoutDrawer}>
              <Button type="primary" loading={loading} hidden={btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])} onClick={async () => {
--- a/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx
+++ b/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx
@ -59,6 +59,7 @@ const JudgingPanel: React.FC<{}> = () => {
  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-没预约

  function getShouName() {
    const method = getProMethod();
@ -167,6 +168,7 @@ const JudgingPanel: React.FC<{}> = () => {
                await queryOpenStatus(record.id);
                categorySet(record.juryCategoryVOList);
                juryIdSet(record.id);
+                setReserveStatus(record.reserveStatus === 1);
                memberCountSet(memberCount + 1);
                setMemberVis(true);
              }}>成员管理</Button>
@ -1204,6 +1206,7 @@ const JudgingPanel: React.FC<{}> = () => {
    checkBoxsSet([]);
    changeMemberIdSet('');
    setCheckedList([]);
+    setReserveStatus(false);
    form.resetFields();
  }
  const columnsMember: ProColumns<any>[] = [//成员管理页面表格
@ -1616,19 +1619,20 @@ const JudgingPanel: React.FC<{}> = () => {
            >
              <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寸（413*579px）头像照片，无逆光、无ps、无美颜，面部五官无遮挡，头像部约占照片高度的三分之二，照片保存格式为JPG格式，大小200k以下</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={200} 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"
@ -1889,7 +1893,7 @@ const JudgingPanel: React.FC<{}> = () => {
          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);
--- 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<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 +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);
              }}>成员管理</Button>
@ -1072,6 +1074,7 @@ const JudgingPanel: React.FC<{}> = (props: any) => {
    updateKeyMemSet(-1);
    checkBoxsSet([]);
    changeMemberIdSet('');
+    setReserveStatus(false);
    form.resetFields();
  }
  const columnsMember: ProColumns<any>[] = [//成员管理页面表格
@ -1484,19 +1487,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寸（413*579px）头像照片，无逆光、无ps、无美颜，面部五官无遮挡，头像部约占照片高度的三分之二，照片保存格式为JPG格式，大小200k以下</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={200} 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"
@ -1757,7 +1761,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);