Merge branch 'v2-220418' into 'v2-220418'

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

@@ -51,10 +51,12 @@ const readySubmitReportDetail: React.FC = () => {
       params.evaluationTenderRecommendList = recommandList.filter(item => !item?.id)
     }
     params.evaluationTenderFile = fileList
+
     // 在线
     if(data.isOnlineEvaluation) {
       params.evaluationTenderReportMemberList = childTableData?.length ? childTableData[0].map(item => ({ memberId: item.memberId, correctScore: item.modifyTotal })) : []
       if(!params.evaluationTenderReportMemberList.length) {
+        setLoading(false)
         return message.error(intl.formatMessage({ id: 'table.purchase.submit.text', defaultMessage: '请先进行评标相关操作' }))
       }
     } else {
@@ -94,7 +96,7 @@ const readySubmitReportDetail: React.FC = () => {
         />
         <OrderDetailWrapper>
           <PreLoading loading={!formContext.data} active paragraph={{rows: 6}}>
-          <div id="transferProcess">
+          <div id="transferProcess" style={{marginTop:100}}>
               <TransferProcess
                 cardTitle={intl.formatMessage({ id: 'table.purchase.liuzhuanjindu' })
 }                customTitleKey='name'