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
39ae76a6
Commit
39ae76a6
authored
Aug 11, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理提交评标报告评标项分类显示异常
parent
bb95613b
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
12 deletions
+30
-12
index.tsx
...s/procurement/callForBids/addRemarkBidCommittee/index.tsx
+1
-1
index.tsx
...ds/readySubmitReport/components/remarkBidReport/index.tsx
+7
-8
constant.tsx
src/pages/procurement/components/bidParticulars/constant.tsx
+6
-0
index.tsx
src/pages/procurement/components/bidParticulars/index.tsx
+11
-1
index.tsx
...pages/transaction/purchaseOrder/orderCollectB2b/index.tsx
+1
-0
usePaymentInfo.tsx
...on/purchaseOrder/orderCollectB2b/model/usePaymentInfo.tsx
+1
-1
index.tsx
...r/orderCollectSrm/components/contractModalTable/index.tsx
+3
-1
No files found.
src/pages/procurement/callForBids/addRemarkBidCommittee/index.tsx
View file @
39ae76a6
...
...
@@ -302,7 +302,7 @@ const AddRemarkBidCommittee:React.FC<AddRemarkBidCommitteeProps> = (props) => {
onBack=
{
()
=>
history
.
goBack
()
}
backIcon=
{
<
ReutrnEle
description=
"返回"
/>
}
title=
{
pageStatus
===
PageStatus
.
ADD
?
'新增专家抽取'
:
(
pageStatus
===
PageStatus
.
EDIT
?
'编辑专家抽取'
:
'查看专家抽取'
)
}
extra=
{
[
extra=
{
(
pageStatus
===
PageStatus
.
PREVIEW
)
?
[]
:
[
<
Button
key=
"1"
onClick=
{
()
=>
addSchemaAction
.
submit
()
}
loading=
{
btnLoading
}
type=
"primary"
icon=
{
<
SaveOutlined
/>
}
>
保存
</
Button
>,
...
...
src/pages/procurement/callForBids/readySubmitReport/components/remarkBidReport/index.tsx
View file @
39ae76a6
...
...
@@ -108,8 +108,8 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
return
{
memberName
:
item
,
total
,
average
:
total
/
expertNumber
||
null
,
total
:
total
.
toFixed
(
2
)
,
average
:
(
total
/
expertNumber
).
toFixed
(
2
)
||
null
,
expertNumber
,
}
})
...
...
@@ -145,15 +145,17 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
}]
let
childTableColumnResult
=
[]
const
childDataSource
=
groupBy
(
dataBySort
[
item
],
'memberName'
)
console
.
log
(
childDataSource
,
'childDataSource'
)
Object
.
keys
(
childDataSource
).
forEach
((
_item
,
_index
)
=>
{
// 动态子表格列 // 合并同会员下的专家评标
// 相同同会员名下的分数数据 只需要取一个
const
computedMemberScoreItem
=
computedScore
.
filter
(
_v
=>
_v
.
memberName
===
_item
)[
0
]
console
.
log
(
computedMemberScoreItem
,
childDataSource
[
_item
])
let
objectItem
:
any
=
{
memberId
:
childDataSource
[
_item
][
0
][
'memberId'
],
memberName
:
_item
,
total
:
computedMemberScoreItem
[
'total'
],
average
:
computedMemberScoreItem
[
'average'
]
?
computedMemberScoreItem
[
'average'
]
.
toFixed
(
2
)
:
null
,
average
:
computedMemberScoreItem
[
'average'
]
?
Number
(
computedMemberScoreItem
[
'average'
])
.
toFixed
(
2
)
:
null
,
expertNumber
:
computedMemberScoreItem
[
'expertNumber'
],
editable
,
}
...
...
@@ -177,6 +179,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
})
setChildrenTableData
(
childrenTableDataSource
)
setChildrenTableColumns
(
childTableDataColumns
)
console
.
log
(
childrenTableDataSource
,
childTableDataColumns
)
}
},
[
data
,
templateSort
])
...
...
@@ -346,7 +349,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
return
{
...
_e
,
total
:
Number
(
row
.
total
),
average
:
Number
(
row
.
total
)
/
row
.
expertNumber
,
average
:
(
Number
(
row
.
total
)
/
row
.
expertNumber
).
toFixed
(
2
)
,
}
}
else
{
return
_e
...
...
@@ -374,10 +377,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
)
}
useEffect
(()
=>
{
console
.
log
(
offlineData
)
},
[
offlineData
])
return
(<>
<
div
id=
"extractExpertList"
>
<
MellowCard
...
...
src/pages/procurement/components/bidParticulars/constant.tsx
View file @
39ae76a6
...
...
@@ -40,6 +40,12 @@ export const columns = [
key
:
'price'
,
render
:
t
=>
`¥
${
t
}
`
},
// {
// title: '中标数量',
// dataIndex: 'awardTenderRatio',
// key: 'awardTenderRatio',
// render: (t, r) => (Number(t)/100 * Number(r.count)).toFixed(2)
// },
{
title
:
'金额(含税)'
,
dataIndex
:
'money'
,
...
...
src/pages/procurement/components/bidParticulars/index.tsx
View file @
39ae76a6
...
...
@@ -49,6 +49,16 @@ const BidParticulars: React.FC<BidParticularsProps> = ({cardTitle}) => {
totalMoney
+=
item
.
price
*
item
.
inviteTenderMateriel
.
count
})
:
[]
let
tempCol
:
any
=
[...
columns
]
// 中标数量
if
(
cardTitle
===
'中标明细'
)
{
tempCol
[
tempCol
.
length
-
1
]
=
{
title
:
'中标数量'
,
dataIndex
:
'awardTenderRatio'
,
key
:
'awardTenderRatio'
,
render
:
(
t
,
r
)
=>
(
Number
(
t
)
/
100
*
Number
(
r
.
count
)).
toFixed
(
2
)
}
}
// 总计
tempCol
[
tempCol
.
length
]
=
{
title
:
<
span
>
金额(含税)
<
br
/>
合计: ¥
{
totalMoney
}
</
span
>,
dataIndex
:
'money'
,
...
...
@@ -139,7 +149,7 @@ const BidParticulars: React.FC<BidParticularsProps> = ({cardTitle}) => {
}
}
}
}
dataSource=
{
tableData
}
dataSource=
{
cardTitle
===
'中标明细'
?
tableData
.
filter
(
item
=>
item
.
awardTenderRatio
)
:
tableData
}
rowKey=
"id"
pagination=
{
{
size
:
"small"
}
}
/>
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/index.tsx
View file @
39ae76a6
...
...
@@ -170,6 +170,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
},
[])
const
handleSubmit
=
async
(
value
)
=>
{
console
.
log
(
value
,
'value'
)
const
_orderProductRequests
=
JSON
.
parse
(
JSON
.
stringify
(
value
.
products
))
try
{
...
...
src/pages/transaction/purchaseOrder/orderCollectB2b/model/usePaymentInfo.tsx
View file @
39ae76a6
...
...
@@ -35,7 +35,7 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
roleId
:
memberRoleId
,
shopId
:
ctx
.
getFieldValue
(
'shopId'
),
orderMode
:
ctx
.
getFieldValue
(
'orderMode'
),
product
Ids
:
ctx
.
getFieldValue
(
'products'
).
map
(
item
=>
item
.
productId
)
product
s
:
ctx
.
getFieldValue
(
'products'
).
map
(
item
=>
({
productId
:
item
.
commodityId
,
skuId
:
item
.
productId
})
)
}).
then
(
res
=>
{
const
{
code
,
data
}
=
res
if
(
code
===
1000
)
{
...
...
src/pages/transaction/purchaseOrder/orderCollectSrm/components/contractModalTable/index.tsx
View file @
39ae76a6
...
...
@@ -47,7 +47,9 @@ const ContractModalTable:React.FC<ContractModalTableProps> = (props) => {
sourceType
=
2
;
break
;
}
rowSelectionCtl
.
setSelectedRowKeys
([
contract
[
'contractId'
]])
if
(
contract
)
{
rowSelectionCtl
.
setSelectedRowKeys
([
contract
[
'id'
]
||
contract
[
'contractId'
]])
}
setOriginType
(
sourceType
)
}
},
[
visible
])
...
...
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