Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/procurement/callForBids/readySubmitReport/components/remarkBidReport/index.tsx

@@ -36,8 +36,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
   const { data, submitData, submitCtl } = useContext(ReportDetailContext)
   const currentRef = useRef<any>({})
   const [transferRadio, setTransferRadio] = useState<number>(0)
-  const [loading, setLoading] = useState<boolean>(false)
-  const { fileList, recommandList, childTableData, offlineData, offlineColumn } = submitData
+  const { recommandList, childTableData, offlineData, offlineColumn } = submitData
   const { setFileList, setRecommandList, setChildrenTableData, setOfflineData, setOfflineColumn } = submitCtl
 
   const [evaluationRecord, setEvaluationRecord] = useState<any>([])
@@ -45,10 +44,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
   const [templateSort, setTemplateSort] = useState<any>([])
   const getTemplateRef = useRef<boolean>(true)
 
-  // 线下评标数据
-  // const [offlineData, setOfflineData] = useState<any>([])
-  // const [offlineColumn, setOfflineColumn] = useState<any>([])
-
   useEffect(() => {
     if(data?.evaluationTenderRecommendList.length) {
       setRecommandList(data.evaluationTenderRecommendList)
@@ -102,9 +97,9 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
 
       // 计算总分 计算平均分
       const computedData = groupBy(dataSource, 'memberName')
-      const computedScore = Object.keys(computedData).map((item, index) => {
+      const computedScore = Object.keys(computedData).map((item) => {
         let expertNumber = Object.keys(groupBy(computedData[item], 'expertExtractRecordId')).length
-        let total = computedData[item].reduce((a, b) => a + b.score, 0) || null
+        let total = computedData[item].reduce((a, b) => a + b.score, 0) || 0
 
         return {
           memberName: item,
@@ -145,12 +140,10 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
         }]
         let childTableColumnResult = []
         const childDataSource = groupBy(dataBySort[item], 'memberName')
-        console.log(childDataSource, 'childDataSource')
         Object.keys(childDataSource).forEach((_item, _index) => {
           // 动态子表格列 // 合并同会员下的专家评标
           // 相同同会员名下的分数数据 只需要取一个
           const computedMemberScoreItem = computedScore.filter(_v => _v.memberName === _item)[0]
-          console.log(computedMemberScoreItem, childDataSource[_item])
           let objectItem: any = {
             memberId: childDataSource[_item][0]['memberId'],
             memberName: _item,
@@ -179,7 +172,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
       })
       setChildrenTableData(childrenTableDataSource)
       setChildrenTableColumns(childTableDataColumns)
-      console.log(childrenTableDataSource, childTableDataColumns)
     }
   }, [data, templateSort])
 
@@ -361,7 +353,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
 
   // 非在线保存
   const handleOfflineSave = (row) => {
-    console.log(row)
     setOfflineData(() => offlineData.map(element => {
         if(element.memberId === row.memberId) {
           let computed = omit({...row}, ['editable', 'memberId', 'memberName', 'noAverage', 'total'])
@@ -570,9 +561,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
       onSubmit={handleSubmit}
       actions={modalActions}
       schema={addRecommandMemberSchema}
-      effects={($, ctx) => {
-      }}
-      modalProps={{confirmLoading: loading}}
     />
   </>)
 }

src/pages/procurement/callForBids/readySubmitReport/detail/index.tsx

-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { history } from 'umi'
 import { Button, Row, Col, Radio, Table } from 'antd';
 import style from './index.less'