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

fix: 处理招投标详情没显示状态,提交资格预审没显示流程的问题

parent 7ec366e6
......@@ -30,27 +30,27 @@ const CallForBidsSearchDetail: React.FC = () => {
{ title: '流转记录', id: 'transferRecord', componentName: "BidTransformRecord" },
]
// 已经报名 才有报名信息
if(data?.inviteTenderOutStatus < BidOuterWorkState.Not_Submitted_Qualifications_Check) {
anchorTitleList.splice(5, 1)
}
// // 已经报名 才有报名信息 @注释原因:无法通过状态判断
// if(data?.inviteTenderOutStatus < BidOuterWorkState.Not_Submitted_Qualifications_Check) {
// anchorTitleList.splice(5, 1)
// }
// 已经资格预审 才有资格预审信息
if(data?.inviteTenderOutStatus < BidOuterWorkState.Not_Submit_Tender && !data?.isQualificationCheck) {
// anchorTitleList.splice(7, 1)
anchorTitleList.forEach((ele, index) => ele['title'] === '资格预审信息' && anchorTitleList.splice(index, 1))
}
// // 已经资格预审 才有资格预审信息
// if(data?.inviteTenderOutStatus < BidOuterWorkState.Not_Submit_Tender && !data?.isQualificationCheck) {
// // anchorTitleList.splice(7, 1)
// anchorTitleList.forEach((ele, index) => ele['title'] === '资格预审信息' && anchorTitleList.splice(index, 1))
// }
// 已经评标 才有评标报告
if(data?.inviteTenderOutStatus < BidOuterWorkState.Not_Finish_Notice) {
// anchorTitleList.splice(9, 1)
anchorTitleList.forEach((ele, index) => ele['title'] === '评标报告' && anchorTitleList.splice(index, 1))
}
// // 已经评标 才有评标报告
// if(data?.inviteTenderOutStatus < BidOuterWorkState.Not_Finish_Notice) {
// // anchorTitleList.splice(9, 1)
// anchorTitleList.forEach((ele, index) => ele['title'] === '评标报告' && anchorTitleList.splice(index, 1))
// }
// 已经完成招标 才有招标结果
if(data?.inviteTenderOutStatus < BidOuterWorkState.Finish_Invite_Tender) {
anchorTitleList.splice(-2, 1)
}
// // 已经完成招标 才有招标结果
// if(data?.inviteTenderOutStatus < BidOuterWorkState.Finish_Invite_Tender) {
// anchorTitleList.splice(-2, 1)
// }
return (
<div>
......
......@@ -139,15 +139,15 @@ const ReadyQualifityCheckedDetail: React.FC = () => {
<div id="transferProcess">
<TransferProcess
cardTitle="流转进度"
customTitleKey='operationalProcess'
customKey='state'
outerVerifyCurrent={findLastIndexFlowState(formContext.data?.externalWorkflowFlowRecordLogResponses || [])}
innerVerifyCurrent={findLastIndexFlowState(formContext.data?.interiorWorkflowFlowRecordLogResponses || [])}
customTitleKey='name'
customKey='id'
outerVerifyCurrent={findLastIndexFlowState(formContext?.externalWorkflowFlowRecordLogResponses || [])}
innerVerifyCurrent={findLastIndexFlowState(formContext?.interiorWorkflowFlowRecordLogResponses || [])}
outerVerifySteps={
formContext.data?.externalWorkflowFlowRecordLogResponses ?
formContext.data.externalWorkflowFlowRecordLogResponses.map(item => ({
formContext?.externalWorkflowFlowRecordLogResponses ?
formContext.externalWorkflowFlowRecordLogResponses.map(item => ({
...item,
status: item.isExecute ? 'finish' : 'wait',
status: item.isActive ? 'finish' : 'wait',
})) :
[]
}
......@@ -155,7 +155,7 @@ const ReadyQualifityCheckedDetail: React.FC = () => {
formContext.data?.interiorWorkflowFlowRecordLogResponses ?
formContext.data.interiorWorkflowFlowRecordLogResponses.map(item => ({
...item,
status: item.isExecute ? 'finish' : 'wait',
status: item.isActive ? 'finish' : 'wait',
})) :
[]
}
......
......@@ -26,10 +26,10 @@ const TenderSearchDetail: React.FC = () => {
{ title: '流转记录', id: 'transferRecord', componentName: "BidTransformRecord" },
]
// 没有完成的标 隐藏中标结果、中标明细
if(data?.inviteTender?.inviteTenderOutStatus !== BidOuterWorkState.Finish_Invite_Tender) {
anchorTitleList.splice(1, 2)
}
// // 没有完成的标 隐藏中标结果、中标明细 @注释原因:无法通过状态判断
// if(data?.inviteTender?.inviteTenderOutStatus !== BidOuterWorkState.Finish_Invite_Tender) {
// anchorTitleList.splice(1, 2)
// }
return (
<div>
......
......@@ -48,8 +48,8 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
span: 8,
fieldList: [
{ title: '招标编号:', name: 'code' },
{ title: '外部状态:', name: 'inviteTenderOutStatus', render: (text) => BidOutStateTexts[text]},
{ title: '内部状态:', name: 'inviteTenderInStatus', render: (text) => BidInStateTexts[text] },
{ title: '外部状态:', name: 'inviteTenderOutStatusValue'},
{ title: '内部状态:', name: 'inviteTenderInStatusValue'},
{ title: '发布时间:', name: 'createTime', render: (text) => formatTimeString(text) },
]
},
......
......@@ -25,15 +25,15 @@ export const processLogResponses = (resData) => {
const externalLogs = externalTasks.map(item => ({
id: item.taskStep,
name: item.taskName,
operationRole: item.userRoleName,
isActive: item.taskStep <= currentOuterStep
operationRole: item.memberRoleName,
isActive: item.taskStep < currentOuterStep
}))
const subTasks = externalTasks.filter(item => item.taskStep === currentOuterStep)
const interiorLogs = subTasks.length ? subTasks[0]['subTasks'].map(item => ({
id: item.taskStep,
name: item.taskName,
operationRole: item.userRoleName,
isActive: item.taskStep <= currentInnerStep
isActive: currentInnerStep === 0 ? true : (item.taskStep < currentInnerStep)
})) : null
return {
interiorLogs,
......
......@@ -157,7 +157,7 @@ export const formSchema: ISchema = {
type: 'object',
'x-component': 'Mega-Layout',
'x-component-props': {
label: '注册手机',
label: '联系人电话',
required: true,
wrapperCol: 24,
className: "clearParentMargin"
......@@ -218,7 +218,7 @@ export const formSchema: ISchema = {
type: 'object',
'x-component': 'Mega-Layout',
'x-component-props': {
label: '投标单位地址',
label: '地址',
required: true,
wrapperCol: 24,
},
......
......@@ -176,23 +176,23 @@ const ReadyQualifityCheckedDetail: React.FC = () => {
<div id="transferProcess">
<TransferProcess
cardTitle="流转进度"
customTitleKey='operationalProcess'
customKey='state'
outerVerifyCurrent={findLastIndexFlowState(formContext.data?.externalWorkflowFlowRecordLogResponses || [])}
innerVerifyCurrent={findLastIndexFlowState(formContext.data?.interiorWorkflowFlowRecordLogResponses || [])}
customTitleKey='name'
customKey='id'
outerVerifyCurrent={findLastIndexFlowState(formContext?.externalWorkflowFlowRecordLogResponses || [])}
innerVerifyCurrent={findLastIndexFlowState(formContext?.interiorWorkflowFlowRecordLogResponses || [])}
outerVerifySteps={
formContext.data?.externalWorkflowFlowRecordLogResponses ?
formContext.data.externalWorkflowFlowRecordLogResponses.map(item => ({
formContext?.externalWorkflowFlowRecordLogResponses ?
formContext.externalWorkflowFlowRecordLogResponses.map(item => ({
...item,
status: item.isExecute ? 'finish' : 'wait',
status: item.isActive ? 'finish' : 'wait',
})) :
[]
}
innerVerifySteps={
formContext.data?.interiorWorkflowFlowRecordLogResponses ?
formContext.data.interiorWorkflowFlowRecordLogResponses.map(item => ({
formContext?.interiorWorkflowFlowRecordLogResponses ?
formContext.interiorWorkflowFlowRecordLogResponses.map(item => ({
...item,
status: item.isExecute ? 'finish' : 'wait',
status: item.isActive ? 'finish' : 'wait',
})) :
[]
}
......
......@@ -64,9 +64,9 @@ export const materialColumns: any[] = [
},
{
title: '供方库存',
dataIndex: 'bidCount',
dataIndex: 'supplierInventory',
align: 'center',
key: 'bidCount'
key: 'supplierInventory'
},
]
......
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