Commit 9b6267e8 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 处理招投标系列问题

parent 77be9e7b
......@@ -98,7 +98,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
memberId: childDataSource[_item][0]['memberId'],
memberName: _item,
total: computedMemberScoreItem['total'],
average: computedMemberScoreItem['average'],
average: computedMemberScoreItem['average'] ? computedMemberScoreItem['average'].toFixed(2) : null,
expertNumber: computedMemberScoreItem['expertNumber'],
}
let columns: any = []
......
......@@ -98,7 +98,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
memberId: childDataSource[_item][0]['memberId'],
memberName: _item,
total: computedMemberScoreItem['total'],
average: computedMemberScoreItem['average'],
average: computedMemberScoreItem['average'] ? computedMemberScoreItem['average'].toFixed(2) : null,
expertNumber: computedMemberScoreItem['expertNumber'],
}
let columns: any = []
......
......@@ -29,7 +29,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
useEffect(() => {
if(data?.memberList.length) {
const { memberList } = data
const _memberList = memberList.filter(every => every.submitTender).map(item => ({
const _memberList = memberList.filter(every => every.submitTender && every.isSubmit).map(item => ({
...item,
totalAmount: (item.submitTender.submitTenderMateriel.reduce((a, b) => a + b.price * b.inviteTenderMateriel.count, 0)).toFixed(2)
})).sort((a, b) => b.totalAmount - a.totalAmount)
......
......@@ -98,7 +98,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
memberId: childDataSource[_item][0]['memberId'],
memberName: _item,
total: computedMemberScoreItem['total'],
average: computedMemberScoreItem['average'],
average: computedMemberScoreItem['average'] ? computedMemberScoreItem['average'].toFixed(2) : null,
expertNumber: computedMemberScoreItem['expertNumber'],
}
let columns: any = []
......
......@@ -98,7 +98,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
memberId: childDataSource[_item][0]['memberId'],
memberName: _item,
total: computedMemberScoreItem['total'],
average: computedMemberScoreItem['average'],
average: computedMemberScoreItem['average'] ? computedMemberScoreItem['average'].toFixed(2) : null,
expertNumber: computedMemberScoreItem['expertNumber'],
}
let columns: any = []
......
......@@ -127,7 +127,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
memberId: childDataSource[_item][0]['memberId'],
memberName: _item,
total: computedMemberScoreItem['total'],
average: computedMemberScoreItem['average'],
average: computedMemberScoreItem['average'] ? computedMemberScoreItem['average'].toFixed(2) : null,
expertNumber: computedMemberScoreItem['expertNumber'],
editable,
}
......
......@@ -100,7 +100,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
memberId: childDataSource[_item][0]['memberId'],
memberName: _item,
total: computedMemberScoreItem['total'],
average: computedMemberScoreItem['average'],
average: computedMemberScoreItem['average'] ? computedMemberScoreItem['average'].toFixed(2) : null,
expertNumber: computedMemberScoreItem['expertNumber'],
}
let columns: any = []
......
......@@ -63,6 +63,7 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
const [initFormValue, setInitFormValue] = useState<any>({
submitTenderMateriel: []
})
const [code, setCode] = useState<any>({})
// 关联报价商品
const productRef = useRef<any>({})
......@@ -80,6 +81,7 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
PublicApi.getPurchaseSubmitTenderGetSubmitTender({submitTenderId: id}).then(res => {
if(res.code === 1000) {
const pocessedData = processTenderData(res.data)
setCode(res.data.inviteTender)
setInitFormValue(pocessedData)
}
})
......@@ -151,6 +153,8 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
}
}
const InviterCodeJump = () => <a target="_blank" href={`/memberCenter/procurementAbility/callForBids/callForBidsSearch/detail?id=${code.id}`}>{code.code}</a>
return (
<PageHeaderWrapper
style={{margin: 0}}
......@@ -172,7 +176,8 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
schema={formSchema}
onSubmit={handleSubmit}
components={{
ArrayTable
ArrayTable,
InviterCodeJump
}}
effects={($, ctx) => {
$('onFormMount').subscribe(async () => {
......
......@@ -44,6 +44,7 @@ export const formSchema: ISchema = {
type: 'string',
title: '招标编号',
readOnly: true,
'x-component': 'InviterCodeJump',
},
memberName: {
type: 'string',
......
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