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
cd2566f5
Commit
cd2566f5
authored
Jul 14, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 项目预算显示异常
parent
9b6267e8
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
86 additions
and
12 deletions
+86
-12
index.tsx
src/pages/procurement/callForBids/addNewBid/index.tsx
+30
-0
index.tsx
...pages/procurement/callForBids/callForBidsSearch/index.tsx
+51
-7
index.tsx
...s/readyCheckedConfirmFirst/components/basicInfo/index.tsx
+1
-1
index.tsx
.../readyCheckedConfirmSecond/components/basicInfo/index.tsx
+1
-1
index.tsx
...allForBids/readyConfirmBid/components/basicInfo/index.tsx
+1
-1
index.tsx
...t/callForBids/readyPassBid/components/basicInfo/index.tsx
+1
-1
index.tsx
src/pages/procurement/components/descriptionsInfo/index.tsx
+1
-1
No files found.
src/pages/procurement/callForBids/addNewBid/index.tsx
View file @
cd2566f5
...
...
@@ -139,6 +139,11 @@ const AddNewBid:React.FC<AddNewBidProps> = (props) => {
if
(
id
)
{
params
[
'id'
]
=
id
}
// else {
// // 新增或复制 剔除id操作
// omitID(params)
// }
// console.log(params, 'after')
try
{
addSchemaAction
.
getFieldState
(
'deliverAddressId'
,
state
=>
{
if
(
params
?.
deliverAddressId
)
{
...
...
@@ -174,6 +179,31 @@ const AddNewBid:React.FC<AddNewBidProps> = (props) => {
}
}
const
omitID
=
(
element
)
=>
{
// 数组 遍历剔除id
if
(
Array
.
isArray
(
element
))
{
element
.
forEach
((
e
,
i
)
=>
{
if
(
Object
.
prototype
.
hasOwnProperty
.
call
(
e
,
'id'
))
{
delete
e
.
id
}
omitID
(
e
)
})
}
// 对象遍历 移除外层id
else
if
(
element
&&
typeof
element
===
'object'
)
{
for
(
const
key
in
element
)
{
if
(
Object
.
prototype
.
hasOwnProperty
.
call
(
element
,
key
))
{
if
(
key
===
'id'
)
delete
element
[
key
]
// 如果key值为数组
const
item
=
element
[
key
];
if
(
Array
.
isArray
(
item
))
{
omitID
(
item
)
}
}
}
}
}
const
providerValue
=
{
// detailData: initFormValue,
schemaActions
:
addSchemaAction
,
...
...
src/pages/procurement/callForBids/callForBidsSearch/index.tsx
View file @
cd2566f5
import
React
,
{
useCallback
,
useRef
,
useState
}
from
'react'
import
{
Card
,
message
,
Button
}
from
'antd'
import
{
Card
,
message
,
Button
,
Dropdown
,
Menu
}
from
'antd'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
StandardTable
}
from
'god'
import
{
history
}
from
'umi'
...
...
@@ -16,6 +16,7 @@ import { createAsyncFormActions } from '@formily/antd'
import
moment
from
'moment'
import
{
dataChangeUnix
}
from
'../addNewBid/constant'
import
'../../constants/index.less'
import
{
CaretDownOutlined
}
from
'@ant-design/icons'
// import { BidInsideWorkState, BidOuterWorkState } from '@/constants/procurement'
const
destroyActions
=
createAsyncFormActions
()
...
...
@@ -44,15 +45,58 @@ const callForBidsSearch: React.FC<{}> = () => {
key
:
'ctl'
,
// width: 240,
// fixed: 'right',
render
:
(
text
,
record
)
=>
<>
<
Button
type=
'link'
onClick=
{
()
=>
handleCopy
(
record
.
id
)
}
>
复制
</
Button
>
{
record
.
isOpenTenderTime
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleChangeTime
(
record
)
}
>
修改开标时间
</
Button
>
}
{
record
.
isExpert
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleWithdraw
(
record
.
id
)
}
>
抽取专家
</
Button
>
}
{
record
.
isDiscardTender
&&
<
Button
type=
'link'
onClick=
{
()
=>
handleDestory
(
record
.
id
)
}
>
废标
</
Button
>
}
</>
render
:
(
text
,
record
)
=>
renderOptionButton
(
record
)
// {
// return <>
// <Button type='link' onClick={() => handleCopy(record.id)}>复制</Button>
// { record.isOpenTenderTime && <Button type='link' onClick={() => handleChangeTime(record)}>修改开标时间</Button> }
// { record.isExpert && <Button type='link' onClick={() => handleWithdraw(record.id)}>抽取专家</Button> }
// { record.isDiscardTender && <Button type='link' onClick={() => handleDestory(record.id)}>废标</Button> }
// </>
// }
}
])
const
renderOptionButton
=
(
record
:
any
)
=>
{
const
buttonGroup
=
{
'复制'
:
true
,
'修改开标时间'
:
record
.
isOpenTenderTime
,
'抽取专家'
:
record
.
isExpert
,
'废标'
:
record
.
isDiscardTender
}
const
operationHandler
=
{
'复制'
:
()
=>
handleCopy
(
record
.
id
),
'修改开标时间'
:
()
=>
handleChangeTime
(
record
),
'抽取专家'
:
()
=>
handleWithdraw
(
record
.
id
),
'废标'
:
()
=>
handleDestory
(
record
.
id
),
}
const
keyNames
=
Object
.
keys
(
buttonGroup
)
return
(<>
{
Object
.
values
(
buttonGroup
).
filter
(
Boolean
).
length
>
2
?
<>
<
Button
type=
'link'
onClick=
{
operationHandler
[
keyNames
[
0
]]
}
>
{
keyNames
[
0
]
}
</
Button
>
<
Dropdown
overlay=
{
<
Menu
>
{
keyNames
.
slice
(
1
,
keyNames
.
length
).
map
((
e
,
i
)
=>
(
<
Menu
.
Item
key=
{
`menuItem${i}`
}
>
<
Button
type=
'link'
onClick=
{
operationHandler
[
e
]
}
>
{
e
}
</
Button
>
</
Menu
.
Item
>
))
}
</
Menu
>
}
>
<
a
className=
"ant-dropdown-link"
onClick=
{
e
=>
e
.
preventDefault
()
}
>
更多
<
CaretDownOutlined
/>
</
a
>
</
Dropdown
>
</>
:
keyNames
.
map
((
e
,
i
)
=>
(
buttonGroup
[
e
]
?
<
Button
key=
{
`btnItem${i}`
}
type=
'link'
onClick=
{
operationHandler
[
e
]
}
>
{
e
}
</
Button
>
:
null
))
}
</>)
}
const
fetchTableData
=
async
(
params
)
=>
{
let
_params
=
params
.
inviteTenderInStatusList
?
{
...
params
,
inviteTenderInStatusList
:
[
params
.
inviteTenderInStatusList
]
}
:
{...
params
}
let
__params
=
_params
.
inviteTenderOutStatusList
?
{
...
_params
,
inviteTenderOutStatusList
:
[
_params
.
inviteTenderOutStatusList
]
}
:
{...
_params
}
...
...
src/pages/procurement/callForBids/readyCheckedConfirmFirst/components/basicInfo/index.tsx
View file @
cd2566f5
...
...
@@ -39,7 +39,7 @@ const BasicInfo: React.FC<IBasicInfo> = ({ title }) => {
span
:
8
,
fieldList
:
[
{
title
:
'招标项目:'
,
name
:
'projectName'
},
{
title
:
'项目预算:'
,
name
:
'budget'
,
render
:
(
t
)
=>
`¥
${
t
}
`
},
{
title
:
'项目预算:'
,
name
:
'budget'
,
render
:
(
t
)
=>
t
?
`¥
${
t
}
`
:
null
},
{
title
:
'采购类型:'
,
name
:
'purchaseType'
,
render
:
(
text
)
=>
PURCHASE_TYPE
[
text
]
},
{
title
:
'招标会员:'
,
name
:
'memberName'
},
]
...
...
src/pages/procurement/callForBids/readyCheckedConfirmSecond/components/basicInfo/index.tsx
View file @
cd2566f5
...
...
@@ -39,7 +39,7 @@ const BasicInfo: React.FC<IBasicInfo> = ({ title }) => {
span
:
8
,
fieldList
:
[
{
title
:
'招标项目:'
,
name
:
'projectName'
},
{
title
:
'项目预算:'
,
name
:
'budget'
,
render
:
(
t
)
=>
`¥
${
t
}
`
},
{
title
:
'项目预算:'
,
name
:
'budget'
,
render
:
(
t
)
=>
t
?
`¥
${
t
}
`
:
null
},
{
title
:
'采购类型:'
,
name
:
'purchaseType'
,
render
:
(
text
)
=>
PURCHASE_TYPE
[
text
]
},
{
title
:
'招标会员:'
,
name
:
'memberName'
},
]
...
...
src/pages/procurement/callForBids/readyConfirmBid/components/basicInfo/index.tsx
View file @
cd2566f5
...
...
@@ -39,7 +39,7 @@ const BasicInfo: React.FC<IBasicInfo> = ({ title }) => {
span
:
8
,
fieldList
:
[
{
title
:
'招标项目:'
,
name
:
'projectName'
},
{
title
:
'项目预算:'
,
name
:
'budget'
,
render
:
(
t
)
=>
`¥
${
t
}
`
},
{
title
:
'项目预算:'
,
name
:
'budget'
,
render
:
(
t
)
=>
t
?
`¥
${
t
}
`
:
null
},
{
title
:
'采购类型:'
,
name
:
'purchaseType'
,
render
:
(
text
)
=>
PURCHASE_TYPE
[
text
]
},
{
title
:
'招标会员:'
,
name
:
'memberName'
},
]
...
...
src/pages/procurement/callForBids/readyPassBid/components/basicInfo/index.tsx
View file @
cd2566f5
...
...
@@ -39,7 +39,7 @@ const BasicInfo: React.FC<IBasicInfo> = ({ title }) => {
span
:
8
,
fieldList
:
[
{
title
:
'招标项目:'
,
name
:
'projectName'
},
{
title
:
'项目预算:'
,
name
:
'budget'
,
render
:
(
t
)
=>
`¥
${
t
}
`
},
{
title
:
'项目预算:'
,
name
:
'budget'
,
render
:
(
t
)
=>
t
?
`¥
${
t
}
`
:
null
},
{
title
:
'采购类型:'
,
name
:
'purchaseType'
,
render
:
(
text
)
=>
PURCHASE_TYPE
[
text
]
},
{
title
:
'招标会员:'
,
name
:
'memberName'
},
]
...
...
src/pages/procurement/components/descriptionsInfo/index.tsx
View file @
cd2566f5
...
...
@@ -49,7 +49,7 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
{
title
:
'招标会员:'
,
name
:
'memberName'
},
{
title
:
'招标摘要:'
,
name
:
'remark'
},
]
:
[{
title
:
'招标项目:'
,
name
:
'projectName'
},
{
title
:
'项目预算:'
,
name
:
'budget'
,
render
:
(
t
)
=>
`¥
${
t
}
`
},
{
title
:
'项目预算:'
,
name
:
'budget'
,
render
:
(
t
)
=>
t
?
`¥
${
t
}
`
:
null
},
{
title
:
'采购类型:'
,
name
:
'purchaseType'
,
render
:
(
text
)
=>
PURCHASE_TYPE
[
text
]
},
{
title
:
'招标会员:'
,
name
:
'memberName'
},
{
title
:
'招标摘要:'
,
name
:
'remark'
},
...
...
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