From dce6a1514c748aa9dc8208625345f049488f11e1 Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 6 Jul 2023 13:36:40 +0800
Subject: [PATCH] =?UTF-8?q?7.6=20=E4=BF=9D=E5=AD=98=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=B8=93=E5=AE=B6=E7=85=A7=E7=89=87=E6=98=AF=E5=90=A6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JudgingPanel/List/OutsourcingManage.tsx        | 12 ++++++++++++
 .../ProjectManager/JudgingPanel/List/index.tsx     | 14 +++++++++++++-
 src/pages/ZZhaoMu/JudgingPanel/index.tsx           | 13 +++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/pages/Tender/ProjectManager/JudgingPanel/List/OutsourcingManage.tsx b/src/pages/Tender/ProjectManager/JudgingPanel/List/OutsourcingManage.tsx
index 6a4de8a..753b9de 100644
--- a/src/pages/Tender/ProjectManager/JudgingPanel/List/OutsourcingManage.tsx
+++ b/src/pages/Tender/ProjectManager/JudgingPanel/List/OutsourcingManage.tsx
@@ -7,6 +7,7 @@ import React, { useEffect, useState } from "react";
 import './judgList.less';
 import '@/assets/xsy_style.less';
 import { saveAssistPeople } from "./service";
+import { isEmpty } from "@/utils/CommonUtils";
 
 interface OutsourcingManageProps {
   modalVisible: boolean,
@@ -124,6 +125,17 @@ const OutsourcingManage: React.FC<OutsourcingManageProps> = (props) => {
         // }}
         onOk={() => {
           if (Number(assistNumber) == dataSource.length) {
+            let count = 0
+            for (let i = 0, length = dataSource.length; i < length; i++) {
+              const item = dataSource[i];
+              if (isEmpty(item.faceId)) {
+                count += 1;
+              }
+            }
+            if (count > 0) {
+              message.error(`请上传专家照片`);
+              return;
+            }
             const params = {
               juryId,
               assistList: [...dataSource],
diff --git a/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx b/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx
index 6183d1f..1f70ff0 100644
--- a/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx
+++ b/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx
@@ -4,7 +4,7 @@ import ProTable, { ActionType, ProColumns } from '@ant-design/pro-table';
 import { getList, getSecs, saveGroup, delOne, saveMember, changeEx, queryVoList, changeMember, applyFor, roomStatus, juryTem, rePassWord, getUserPhoto, unlockAccount } from './service';
 import moment from 'moment';
 import { getDefId, getProId, getProMethod, getSessionProjectData, getSessionUserData } from '@/utils/session';
-import { getURLInformation } from '@/utils/CommonUtils';
+import { getURLInformation, isEmpty } from '@/utils/CommonUtils';
 import './judgList.less';
 import '@/assets/xsy_style.less';
 import FileDown from '@/utils/Download';
@@ -1824,6 +1824,18 @@ const JudgingPanel: React.FC<{}> = () => {
           // 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 }).then((res) => {
               return res.success
             });
diff --git a/src/pages/ZZhaoMu/JudgingPanel/index.tsx b/src/pages/ZZhaoMu/JudgingPanel/index.tsx
index ecec0b4..81fd9aa 100644
--- a/src/pages/ZZhaoMu/JudgingPanel/index.tsx
+++ b/src/pages/ZZhaoMu/JudgingPanel/index.tsx
@@ -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;
@@ -1692,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
             });