Commit 0fb97966 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 调整新建投标关联商品为非强关联

parent 9ff28854
...@@ -57,6 +57,11 @@ const CallForBidsSearchDetail: React.FC = () => { ...@@ -57,6 +57,11 @@ const CallForBidsSearchDetail: React.FC = () => {
anchorTitleList.forEach((ele, index) => ele['title'] === '资格预审要求' && anchorTitleList.splice(index, 1)) anchorTitleList.forEach((ele, index) => ele['title'] === '资格预审要求' && anchorTitleList.splice(index, 1))
} }
// 招标完成 才显示招标结果
if(!data?.isFinish) {
anchorTitleList.forEach((ele, index) => ele['title'] === '招标结果' && anchorTitleList.splice(index, 1))
}
return ( return (
<div> <div>
<BidDetailContext.Provider value={formContext}> <BidDetailContext.Provider value={formContext}>
......
...@@ -51,7 +51,7 @@ const readySubmitReportDetail: React.FC = () => { ...@@ -51,7 +51,7 @@ const readySubmitReportDetail: React.FC = () => {
params.evaluationTenderRecommendList = recommandList.filter(item => !item?.id) params.evaluationTenderRecommendList = recommandList.filter(item => !item?.id)
} }
params.evaluationTenderFile = fileList params.evaluationTenderFile = fileList
params.evaluationTenderReportMemberList = childTableData[0].map(item => ({ memberId: item.memberId, correctScore: item.total })) params.evaluationTenderReportMemberList = childTableData?.length ? childTableData[0].map(item => ({ memberId: item.memberId, correctScore: item.total })) : []
PublicApi.postPurchaseExpertExtractReportSubmitEvaluationTenderReport(params).then(res => { PublicApi.postPurchaseExpertExtractReportSubmitEvaluationTenderReport(params).then(res => {
setLoading(true) setLoading(true)
if(res.code === 1000) { if(res.code === 1000) {
......
...@@ -109,12 +109,12 @@ const AddTender:React.FC<AddTenderProps> = (props) => { ...@@ -109,12 +109,12 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
return param return param
}) })
} }
// 校验是否关联商品 // // 校验是否关联商品
if(!params.submitTenderMateriel.some(v => v.commoditySkuId && v.commodityId)) { // if(!params.submitTenderMateriel.some(v => v.commoditySkuId && v.commodityId)) {
// if(!params.submitTenderMateriel.some(v => v.commodityId)) { // // if(!params.submitTenderMateriel.some(v => v.commodityId)) {
setBtnLoading(false) // setBtnLoading(false)
return message.error('请先关联投标商品') // return message.error('请先关联投标商品')
} // }
// 校验单价 // 校验单价
let judgementByCount = params.submitTenderMateriel?.length && params.submitTenderMateriel.map(item => { let judgementByCount = params.submitTenderMateriel?.length && params.submitTenderMateriel.map(item => {
if(item.price && typeof item.taxRate === 'number'){ if(item.price && typeof item.taxRate === 'number'){
...@@ -125,6 +125,7 @@ const AddTender:React.FC<AddTenderProps> = (props) => { ...@@ -125,6 +125,7 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
}) })
if(!judgementByCount || judgementByCount.includes(false)){ if(!judgementByCount || judgementByCount.includes(false)){
// throw new Error('请填写商品单价') // throw new Error('请填写商品单价')
setBtnLoading(false)
return message.error('请填写商品单价') return message.error('请填写商品单价')
} }
if(value?.id) params.id = value.id if(value?.id) params.id = value.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment