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
黄庭坚
jinfa-platform
Commits
6182b73b
Commit
6182b73b
authored
Sep 01, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 商品查看上游供应商商品详情,订单支付添加资金模式字段,提交评标报告未评数据去重处理
parent
d56c8db6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
11 deletions
+23
-11
index.tsx
src/pages/commodity/products/index.tsx
+7
-5
index.tsx
...ds/readySubmitReport/components/remarkBidReport/index.tsx
+6
-0
index.tsx
src/pages/transaction/components/orderPayModal/index.tsx
+10
-5
index.tsx
src/pages/transaction/components/orderPayTabs/index.tsx
+0
-1
No files found.
src/pages/commodity/products/index.tsx
View file @
6182b73b
...
@@ -174,7 +174,7 @@ const Products: React.FC<{}> = () => {
...
@@ -174,7 +174,7 @@ const Products: React.FC<{}> = () => {
];
];
const
previewUpper
=
(
upId
)
=>
{
const
previewUpper
=
(
upId
)
=>
{
history
.
push
(
`/memberCenter/commodityAbility/commodity/products/detail?id=
${
upId
}
`
)
}
}
/** 参照后台数据生成 */
/** 参照后台数据生成 */
...
@@ -464,10 +464,12 @@ const Products: React.FC<{}> = () => {
...
@@ -464,10 +464,12 @@ const Products: React.FC<{}> = () => {
const
handleBatch
=
(
type
:
string
)
=>
{
const
handleBatch
=
(
type
:
string
)
=>
{
// 判断 批量操作的商品类型相同、并且满足可上(审核通过,下架)下架()的状态
// 判断 批量操作的商品类型相同、并且满足可上(审核通过,下架)下架()的状态
const
rows
=
[...
currentRefRow
.
current
]
const
rows
=
[...
currentRefRow
.
current
]
const
canUp
=
currentRefRow
.
current
.
every
(
item
=>
item
.
status
===
4
||
item
.
status
===
6
)
const
canUp
=
rows
.
every
(
item
=>
item
.
status
===
4
||
item
.
status
===
6
)
const
canDown
=
!
currentRefRow
.
current
.
some
(
item
=>
item
.
status
!==
5
)
const
canDown
=
!
rows
.
some
(
item
=>
item
.
status
!==
5
)
const
isSamilar
=
currentRefRow
.
current
.
every
(
item
=>
item
.
priceType
===
rows
[
0
][
'priceType'
])
const
isSamilar
=
rows
.
every
(
item
=>
item
.
priceType
===
rows
[
0
][
'priceType'
])
console
.
log
(
type
,
currentRefRow
.
current
,
canUp
,
canDown
,
isSamilar
)
if
(
!
rows
.
length
)
{
return
message
.
error
(
'请选择需要批量操作的商品'
)
}
if
(
!
isSamilar
)
{
if
(
!
isSamilar
)
{
return
message
.
error
(
'批量操作仅限产品定价类型相同的商品'
)
return
message
.
error
(
'批量操作仅限产品定价类型相同的商品'
)
}
}
...
...
src/pages/procurement/callForBids/readySubmitReport/components/remarkBidReport/index.tsx
View file @
6182b73b
...
@@ -95,6 +95,12 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({editable}) => {
...
@@ -95,6 +95,12 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({editable}) => {
}
}
}
}
// 数据去重处理(主要针对没有专家评,但评标模板评标分类有重复)
dataSource
=
Object
.
values
([...
dataSource
].
map
(
item
=>
({
...
item
,
mockId
:
`
${
item
.
memberId
}
_
${
item
.
expertExtractRecordId
}
_
${
item
.
sort
}
`
})).
reduce
((
item
,
next
)
=>
{
item
[
next
.
mockId
]
=
next
return
item
},{}))
// 计算总分 计算平均分
// 计算总分 计算平均分
const
computedData
=
groupBy
(
dataSource
,
'memberName'
)
const
computedData
=
groupBy
(
dataSource
,
'memberName'
)
const
computedScore
=
Object
.
keys
(
computedData
).
map
((
item
)
=>
{
const
computedScore
=
Object
.
keys
(
computedData
).
map
((
item
)
=>
{
...
...
src/pages/transaction/components/orderPayModal/index.tsx
View file @
6182b73b
...
@@ -133,7 +133,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
...
@@ -133,7 +133,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
setCurrent
(
1
)
setCurrent
(
1
)
setPayStep
(
1
)
setPayStep
(
1
)
// 获取对公账户信息
// 获取对公账户信息
PublicApi
.
getSettleAccountsCo
rporateAccountConfig
({
memberId
:
data
.
vendorMemberId
,
memberRoleId
:
data
.
vendorRoleId
}).
then
(
res
=>
{
PublicApi
.
getSettleAccountsCo
mmonCorporateAccountDetail
({
memberId
:
data
.
vendorMemberId
,
roleId
:
data
.
vendorRoleId
,
type
:
checked
.
fundMode
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setBlankAccountInfo
(
res
.
data
)
setBlankAccountInfo
(
res
.
data
)
setSettleAccountsError
(
true
)
setSettleAccountsError
(
true
)
...
@@ -276,6 +276,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
...
@@ -276,6 +276,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
paymentInformationId
:
payInfoObj
.
id
,
paymentInformationId
:
payInfoObj
.
id
,
payType
:
checked
.
payType
,
payType
:
checked
.
payType
,
payChannel
:
checked
.
id
,
payChannel
:
checked
.
id
,
fundMode
:
checked
.
fundMode
,
}
}
if
(
payStep
===
2
)
{
if
(
payStep
===
2
)
{
if
(
code
.
length
!=
number
.
length
){
if
(
code
.
length
!=
number
.
length
){
...
@@ -387,10 +388,14 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
...
@@ -387,10 +388,14 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
(
item
[
'payChannels'
]
as
any
[]).
map
(
v
=>
<
div
(
item
[
'payChannels'
]
as
any
[]).
map
(
v
=>
<
div
key=
{
v
.
payChannel
}
key=
{
v
.
payChannel
}
className=
{
cx
(
style
.
payRadio
,
(
checked
&&
v
.
payChannel
===
checked
.
id
)
?
style
.
active
:
''
)
}
className=
{
cx
(
style
.
payRadio
,
(
checked
&&
v
.
payChannel
===
checked
.
id
)
?
style
.
active
:
''
)
}
onClick=
{
()
=>
setChecked
({
id
:
v
.
payChannel
,
channel
:
v
.
payChannelName
,
payType
:
item
.
payType
,
payTypeName
:
item
.
payTypeName
})
}
>
onClick=
{
()
=>
setChecked
({
{
id
:
v
.
payChannel
,
v
.
payChannelName
channel
:
v
.
payChannelName
,
}
payType
:
item
.
payType
,
payTypeName
:
item
.
payTypeName
,
fundMode
:
item
.
fundMode
})
}
>
{
v
.
payChannelName
}
</
div
>)
</
div
>)
}
}
</
div
>
</
div
>
...
...
src/pages/transaction/components/orderPayTabs/index.tsx
View file @
6182b73b
...
@@ -28,7 +28,6 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = () => {
...
@@ -28,7 +28,6 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = () => {
// 过滤支付信息 取第一个待支付或者未到账的id
// 过滤支付信息 取第一个待支付或者未到账的id
if
(
data
?.
payments
?.
length
)
{
if
(
data
?.
payments
?.
length
)
{
let
payments
=
data
.
payments
.
sort
((
a
,
b
)
=>
a
.
batchNo
-
b
.
batchNo
).
filter
(
item
=>
item
.
showPayment
)
let
payments
=
data
.
payments
.
sort
((
a
,
b
)
=>
a
.
batchNo
-
b
.
batchNo
).
filter
(
item
=>
item
.
showPayment
)
console
.
log
(
data
.
payments
.
sort
((
a
,
b
)
=>
a
.
batchNo
-
b
.
batchNo
),
payments
,
'lo'
)
if
(
payments
.
length
)
{
if
(
payments
.
length
)
{
ctl
.
setPayId
(
payments
[
0
].
paymentId
)
ctl
.
setPayId
(
payments
[
0
].
paymentId
)
}
}
...
...
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