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
1dc1671c
Commit
1dc1671c
authored
Apr 13, 2022
by
leimo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2-220418-fixPurchaseBid' into 'v2-220418'
fix: 采购竞价报价台显示问题 See merge request linkseeks-design/pro-platform!242
parents
a0e5646b
8942d43a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
index.tsx
...omponents/detail/components/quotationDeskLayout/index.tsx
+1
-1
index.tsx
...ction/purchaseAbility/onlineBid/readyBid/detail/index.tsx
+2
-2
index.tsx
...purchaseAbility/purchaseBid/readyBid/management/index.tsx
+2
-2
No files found.
src/pages/transaction/purchaseAbility/components/detail/components/quotationDeskLayout/index.tsx
View file @
1dc1671c
...
@@ -29,7 +29,7 @@ const QuotationDesk: React.FC<QuotationDeskProps> = (props: any) => {
...
@@ -29,7 +29,7 @@ const QuotationDesk: React.FC<QuotationDeskProps> = (props: any) => {
_obj
[
`
${
item
.
type
}
`
]
=
item
.
title
;
_obj
[
`
${
item
.
type
}
`
]
=
item
.
title
;
});
});
return
{
return
{
value
:
{
min
:
0
},
value
:
{
min
:
0
,
type
:
'log'
},
time
:
{
range
:
[
0
,
1
]
},
time
:
{
range
:
[
0
,
1
]
},
type
:
{
type
:
{
formatter
:
v
=>
{
formatter
:
v
=>
{
...
...
src/pages/transaction/purchaseAbility/onlineBid/readyBid/detail/index.tsx
View file @
1dc1671c
...
@@ -86,12 +86,12 @@ const Detail = () => {
...
@@ -86,12 +86,12 @@ const Detail = () => {
_quotationDesks
=
socketObj
.
quotationDesks
_quotationDesks
=
socketObj
.
quotationDesks
}
}
_quotationDesks
.
forEach
((
item
)
=>
{
_quotationDesks
.
forEach
((
item
)
=>
{
_offerList
.
push
({
type
:
'offer'
,
time
:
formatTimeString
(
item
.
offerTime
||
item
.
peportTime
,
'HH:mm:ss'
),
value
:
parseInt
(
priceFormat
(
item
.
price
||
item
.
sumPice
,
0
))
});
_offerList
.
push
({
type
:
'offer'
,
time
:
formatTimeString
(
item
.
offerTime
||
item
.
peportTime
,
'HH:mm:ss'
),
value
:
item
.
price
||
item
.
sumPice
});
})
})
_list
.
push
({
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.quotedAmount'
}),
type
:
'offer'
,
list
:
_offerList
});
_list
.
push
({
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.quotedAmount'
}),
type
:
'offer'
,
list
:
_offerList
});
if
(
data
.
isOpenPurchase
)
{
if
(
data
.
isOpenPurchase
)
{
_quotationDesks
.
forEach
((
item
)
=>
{
_quotationDesks
.
forEach
((
item
)
=>
{
_minList
.
push
({
type
:
'min'
,
time
:
formatTimeString
(
item
.
offerTime
||
item
.
peportTime
,
'HH:mm:ss'
),
value
:
parseInt
(
priceFormat
(
item
.
minPrice
,
0
))
});
_minList
.
push
({
type
:
'min'
,
time
:
formatTimeString
(
item
.
offerTime
||
item
.
peportTime
,
'HH:mm:ss'
),
value
:
item
.
minPrice
});
})
})
_list
.
push
({
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.minPrice1'
}),
type
:
'min'
,
list
:
_minList
});
_list
.
push
({
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.minPrice1'
}),
type
:
'min'
,
list
:
_minList
});
}
}
...
...
src/pages/transaction/purchaseAbility/purchaseBid/readyBid/management/index.tsx
View file @
1dc1671c
...
@@ -55,7 +55,7 @@ const Management = () => {
...
@@ -55,7 +55,7 @@ const Management = () => {
setLowestList
({
setLowestList
({
type
:
'min'
,
type
:
'min'
,
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.minPrice1'
}),
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.minPrice1'
}),
list
:
_data
.
awardProcesss
?
_data
.
awardProcesss
.
map
((
item
)
=>
{
return
{
type
:
'min'
,
time
:
formatTimeString
(
item
.
peportTime
,
'HH:mm:ss'
),
value
:
parseInt
(
priceFormat
(
item
.
sumPice
,
0
))
}
}).
reverse
()
:
[]
list
:
_data
.
awardProcesss
?
_data
.
awardProcesss
.
map
((
item
)
=>
{
return
{
type
:
'min'
,
time
:
formatTimeString
(
item
.
peportTime
,
'HH:mm:ss'
),
value
:
item
.
sumPice
}
}).
reverse
()
:
[]
})
})
}
}
},
[
purchaseBiddingMessage
])
},
[
purchaseBiddingMessage
])
...
@@ -117,7 +117,7 @@ const Management = () => {
...
@@ -117,7 +117,7 @@ const Management = () => {
setLowestList
({
setLowestList
({
type
:
'min'
,
type
:
'min'
,
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.minPrice1'
}),
title
:
intl
.
formatMessage
({
id
:
'detail.purchase.minPrice1'
}),
list
:
data
?
data
.
map
((
item
)
=>
{
return
{
type
:
'min'
,
time
:
formatTimeString
(
item
.
peportTime
,
'HH:mm:ss'
),
value
:
parseInt
(
priceFormat
(
item
.
sumPice
,
0
))
}
}).
reverse
()
:
[]
list
:
data
?
data
.
map
((
item
)
=>
{
return
{
type
:
'min'
,
time
:
formatTimeString
(
item
.
peportTime
,
'HH:mm:ss'
),
value
:
item
.
sumPice
}
}).
reverse
()
:
[]
})
})
})
})
}
}
...
...
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