评审小组管理

src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx

@@ -132,7 +132,7 @@ const JudgingPanel: React.FC<{}> = () => {
                 await apply({ id: record.id });
                 actionRef.current?.reload();
                 spinSet(false)
-              }}>提交申请</Button>
+              }}>提交</Button>
             </>
           )
         } else if (record.status == 1) {//已提交申请
@@ -144,11 +144,7 @@ const JudgingPanel: React.FC<{}> = () => {
             <>
               {returnCheck(record, true)}
               <Button type='text' onClick={async () => {
-                await queryOpenStatus(record.id);
+                handleMember(record);
-                categorySet(record.juryCategoryVOList);
-                juryIdSet(record.id);
-                memberCountSet(memberCount + 1);
-                setMemberVis(true);
               }}>成员管理</Button>
             </>
           );
@@ -163,27 +159,8 @@ const JudgingPanel: React.FC<{}> = () => {
       <Button type='text'
         hidden={!check && btnAuthority(['ebtp-agency-project-manager', 'ebtp-purchase'])}
         onClick={() => {
-          // queryVoList({ id: record.id }).then((res) => {
-          //   if (res.code == 200) {
-          //     updateDataSet(res.data);
-          // console.log("res.data",res.data);
-          //   }
-          // });
-          // updateDataSet(record);
-          // console.log("record", record);
-          // //剔除代表
-          // let list = [...record.juryCategoryVOList];
-          // list.map((item: any, index: any) => {
-          //   if (item.category == 1) {
-          //     list.splice(index, 1);
-          //   }
-          // });
-          // cqDataSet(list);
-          // setModalVis(true);
-          // sectionCountSet(sectionCount + 1);
           handleUpdate(record);
           disabledSet(check);
-          // checkSectionNameSet(record.sectionName);
         }}>{check ? '查看' : '修改'}</Button>
     )
   }
@@ -220,6 +197,15 @@ const JudgingPanel: React.FC<{}> = () => {
     checkSectionNameSet(res.data.sectionName);
 
   };
+  const handleMember = async (record: any) => {
+    form.resetFields();
+    const res = await queryVoList({ id: record.id });
+    await queryOpenStatus(record.id);
+    categorySet(res.data.juryCategoryVOList);
+    juryIdSet(record.id);
+    memberCountSet(memberCount + 1);
+    setMemberVis(true);
+  };
 
   //删除
   const del = async (fields: any) => {
@@ -484,12 +470,10 @@ const JudgingPanel: React.FC<{}> = () => {
       message.error("所选标段评标委员会人数不一致");
       return;
     }
-    console.log("checkedList", checkedList);
 
     const juryNumber = parseInt(uniqueJuryNumbers[0]) || 0;
     const repNumber = parseInt(form.getFieldValue('representativeNumber')) || 0;
 
-    console.log(juryNumber, repNumber);
     if (repNumber < 0 || repNumber > juryNumber) {
       message.error(`直接录入数量应在 0 ~ ${juryNumber} 之间`);
       form.setFieldsValue({ representativeNumber: undefined, expertNumber: undefined });
@@ -765,7 +749,6 @@ const JudgingPanel: React.FC<{}> = () => {
         specNum += Number(item?.extractNumber);
       }
     }
-    console.log("expertNumber", schemaData?.expertNumber, "specNum", specNum);
     if (Number(schemaData?.expertNumber) !== specNum) {
       res = false;
       message.error("抽取专业人数与专家需求人数不符！");
@@ -815,8 +798,6 @@ const JudgingPanel: React.FC<{}> = () => {
           //原下一步逻辑开始
           let juryRoomList: any = [];
           form.validateFields().then(async (formVals) => {
-            console.log("enhancedData", enhancedData);
-            console.log("tableData", tableData);
             const finalVals = {
               ...formVals,
               extractSpecialityList: tableData,
@@ -855,6 +836,7 @@ const JudgingPanel: React.FC<{}> = () => {
             formVals.startTime != undefined ? formVals.startTime = formVals.startTime.format('yyyy-MM-DD HH:mm:ss') : null;
             formVals.endTime != undefined ? formVals.endTime = formVals.endTime.format('yyyy-MM-DD HH:mm:ss') : null;
             const _cqData = cqData.length > 0 ? [{ ...cqData[0], extractNumber: count }] : [{ category: "2", extractMethod: "2", extractNumber: count, subCategory: "4" }]//抽取数量录入
+            console.log("_cqData", _cqData);
             let params = { ...formVals, juryRoomList: juryRoomList, projectId: proId, juryCategoryVOList: _cqData, reserveStatus: 0, extractSpecialityList: enhancedData };
             if (updateData != undefined) {
               params['id'] = updateData.id;
@@ -914,18 +896,18 @@ const JudgingPanel: React.FC<{}> = () => {
     { title: '手机号码', dataIndex: 'mobile', },
     { title: '证件号码', dataIndex: 'certificate', },
     { title: '工作单位', dataIndex: 'workunit', },
-    { title: '通知状态', dataIndex: 'status', },
+    // { title: '通知状态', dataIndex: 'status', },
-    { title: '通知结果备注', dataIndex: 'remark', },
+    // { title: '通知结果备注', dataIndex: 'remark', },
-    {
+    // {
-      title: '照片',
+    //   title: '照片',
-      dataIndex: 'faceId',
+    //   dataIndex: 'faceId',
-      render: (_, record) => {
+    //   render: (_, record) => {
-        if (record.faceId) {
+    //     if (record.faceId) {
-          return <Image height={80} width={60} src={downloadPath + '?fileId=' + record.faceId} />
+    //       return <Image height={80} width={60} src={downloadPath + '?fileId=' + record.faceId} />
-        };
+    //     };
-        return '-';
+    //     return '-';
-      }
+    //   }
-    },
+    // },
     {
       title: '操作', dataIndex: 'option', width: 180,
       valueType: 'option',
@@ -1060,12 +1042,16 @@ const JudgingPanel: React.FC<{}> = () => {
     });
   }, [memberCount]);
   async function queryOpenStatus(id: any) {//查是否开启评标  id:评委会id
-    await roomStatus(id).then((res) => {
+    //TODO ZYX假数据-start
-      if (res.data) {
+    openSet(false);
-        openSet(res.data.anyOpenRoom);
+    allEndSet(false);
-        allEndSet(res.data.allEndRoom);
+    // await roomStatus(id).then((res) => {
-      }
+    //   if (res.data) {
-    })
+    //     openSet(res.data.anyOpenRoom);
+    //     allEndSet(res.data.allEndRoom);
+    //   }
+    // })
+    //TODO ZYX假数据-end
   }
   const returnPanel = () => {//返回手风琴
     return (
@@ -1543,7 +1529,6 @@ const JudgingPanel: React.FC<{}> = () => {
       const result = await getCrotchListUsingGET();
       if (result && result.success) {
         const map = dataMapFormat(result.data!);
-        console.log("map", map);
         setProfessionalMap(map[0]);
       }
     } catch (error) {