Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shenshaokai
jinfa-platform
Commits
dd096d6f
Commit
dd096d6f
authored
Jul 03, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理招投标详情没显示状态,提交资格预审没显示流程的问题
parent
7ec366e6
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
49 additions
and
49 deletions
+49
-49
index.tsx
...rocurement/callForBids/callForBidsSearch/detail/index.tsx
+18
-18
index.tsx
...rement/callForBids/readyQualifityChecked/detail/index.tsx
+8
-8
index.tsx
...ges/procurement/callForBids/tenderSearch/detail/index.tsx
+4
-4
index.tsx
src/pages/procurement/components/descriptionsInfo/index.tsx
+2
-2
index.tsx
src/pages/procurement/constants/index.tsx
+3
-3
index.ts
src/pages/procurement/tender/addBidRegister/schema/index.ts
+2
-2
index.tsx
...procurement/tender/readyQualifityChecked/detail/index.tsx
+10
-10
index.tsx
...rder/orderCollect/components/materialModalTable/index.tsx
+2
-2
No files found.
src/pages/procurement/callForBids/callForBidsSearch/detail/index.tsx
View file @
dd096d6f
...
...
@@ -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
>
...
...
src/pages/procurement/callForBids/readyQualifityChecked/detail/index.tsx
View file @
dd096d6f
...
...
@@ -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
.
is
Execut
e
?
'finish'
:
'wait'
,
status
:
item
.
is
Activ
e
?
'finish'
:
'wait'
,
}))
:
[]
}
...
...
@@ -155,7 +155,7 @@ const ReadyQualifityCheckedDetail: React.FC = () => {
formContext
.
data
?.
interiorWorkflowFlowRecordLogResponses
?
formContext
.
data
.
interiorWorkflowFlowRecordLogResponses
.
map
(
item
=>
({
...
item
,
status
:
item
.
is
Execut
e
?
'finish'
:
'wait'
,
status
:
item
.
is
Activ
e
?
'finish'
:
'wait'
,
}))
:
[]
}
...
...
src/pages/procurement/callForBids/tenderSearch/detail/index.tsx
View file @
dd096d6f
...
...
@@ -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
>
...
...
src/pages/procurement/components/descriptionsInfo/index.tsx
View file @
dd096d6f
...
...
@@ -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
:
'inviteTenderOutStatus
Value'
},
{
title
:
'内部状态:'
,
name
:
'inviteTenderInStatus
Value'
},
{
title
:
'发布时间:'
,
name
:
'createTime'
,
render
:
(
text
)
=>
formatTimeString
(
text
)
},
]
},
...
...
src/pages/procurement/constants/index.tsx
View file @
dd096d6f
...
...
@@ -25,15 +25,15 @@ export const processLogResponses = (resData) => {
const
externalLogs
=
externalTasks
.
map
(
item
=>
({
id
:
item
.
taskStep
,
name
:
item
.
taskName
,
operationRole
:
item
.
us
erRoleName
,
isActive
:
item
.
taskStep
<
=
currentOuterStep
operationRole
:
item
.
memb
erRoleName
,
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
,
...
...
src/pages/procurement/tender/addBidRegister/schema/index.ts
View file @
dd096d6f
...
...
@@ -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
,
},
...
...
src/pages/procurement/tender/readyQualifityChecked/detail/index.tsx
View file @
dd096d6f
...
...
@@ -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
.
is
Execut
e
?
'finish'
:
'wait'
,
status
:
item
.
is
Activ
e
?
'finish'
:
'wait'
,
}))
:
[]
}
innerVerifySteps=
{
formContext
.
data
?.
interiorWorkflowFlowRecordLogResponses
?
formContext
.
data
.
interiorWorkflowFlowRecordLogResponses
.
map
(
item
=>
({
formContext
?.
interiorWorkflowFlowRecordLogResponses
?
formContext
.
interiorWorkflowFlowRecordLogResponses
.
map
(
item
=>
({
...
item
,
status
:
item
.
is
Execut
e
?
'finish'
:
'wait'
,
status
:
item
.
is
Activ
e
?
'finish'
:
'wait'
,
}))
:
[]
}
...
...
src/pages/transaction/purchaseOrder/orderCollect/components/materialModalTable/index.tsx
View file @
dd096d6f
...
...
@@ -64,9 +64,9 @@ export const materialColumns: any[] = [
},
{
title
:
'供方库存'
,
dataIndex
:
'
bidCount
'
,
dataIndex
:
'
supplierInventory
'
,
align
:
'center'
,
key
:
'
bidCount
'
key
:
'
supplierInventory
'
},
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment