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
17ffe033
Commit
17ffe033
authored
Aug 13, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
bb308619
bb9144f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
16 deletions
+4
-16
index.tsx
...ds/readySubmitReport/components/remarkBidReport/index.tsx
+3
-15
index.tsx
...rocurement/callForBids/readySubmitReport/detail/index.tsx
+1
-1
No files found.
src/pages/procurement/callForBids/readySubmitReport/components/remarkBidReport/index.tsx
View file @
17ffe033
...
@@ -36,8 +36,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
...
@@ -36,8 +36,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
const
{
data
,
submitData
,
submitCtl
}
=
useContext
(
ReportDetailContext
)
const
{
data
,
submitData
,
submitCtl
}
=
useContext
(
ReportDetailContext
)
const
currentRef
=
useRef
<
any
>
({})
const
currentRef
=
useRef
<
any
>
({})
const
[
transferRadio
,
setTransferRadio
]
=
useState
<
number
>
(
0
)
const
[
transferRadio
,
setTransferRadio
]
=
useState
<
number
>
(
0
)
const
[
loading
,
setLoading
]
=
useState
<
boolean
>
(
false
)
const
{
recommandList
,
childTableData
,
offlineData
,
offlineColumn
}
=
submitData
const
{
fileList
,
recommandList
,
childTableData
,
offlineData
,
offlineColumn
}
=
submitData
const
{
setFileList
,
setRecommandList
,
setChildrenTableData
,
setOfflineData
,
setOfflineColumn
}
=
submitCtl
const
{
setFileList
,
setRecommandList
,
setChildrenTableData
,
setOfflineData
,
setOfflineColumn
}
=
submitCtl
const
[
evaluationRecord
,
setEvaluationRecord
]
=
useState
<
any
>
([])
const
[
evaluationRecord
,
setEvaluationRecord
]
=
useState
<
any
>
([])
...
@@ -45,10 +44,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
...
@@ -45,10 +44,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
const
[
templateSort
,
setTemplateSort
]
=
useState
<
any
>
([])
const
[
templateSort
,
setTemplateSort
]
=
useState
<
any
>
([])
const
getTemplateRef
=
useRef
<
boolean
>
(
true
)
const
getTemplateRef
=
useRef
<
boolean
>
(
true
)
// 线下评标数据
// const [offlineData, setOfflineData] = useState<any>([])
// const [offlineColumn, setOfflineColumn] = useState<any>([])
useEffect
(()
=>
{
useEffect
(()
=>
{
if
(
data
?.
evaluationTenderRecommendList
.
length
)
{
if
(
data
?.
evaluationTenderRecommendList
.
length
)
{
setRecommandList
(
data
.
evaluationTenderRecommendList
)
setRecommandList
(
data
.
evaluationTenderRecommendList
)
...
@@ -102,9 +97,9 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
...
@@ -102,9 +97,9 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
// 计算总分 计算平均分
// 计算总分 计算平均分
const
computedData
=
groupBy
(
dataSource
,
'memberName'
)
const
computedData
=
groupBy
(
dataSource
,
'memberName'
)
const
computedScore
=
Object
.
keys
(
computedData
).
map
((
item
,
index
)
=>
{
const
computedScore
=
Object
.
keys
(
computedData
).
map
((
item
)
=>
{
let
expertNumber
=
Object
.
keys
(
groupBy
(
computedData
[
item
],
'expertExtractRecordId'
)).
length
let
expertNumber
=
Object
.
keys
(
groupBy
(
computedData
[
item
],
'expertExtractRecordId'
)).
length
let
total
=
computedData
[
item
].
reduce
((
a
,
b
)
=>
a
+
b
.
score
,
0
)
||
null
let
total
=
computedData
[
item
].
reduce
((
a
,
b
)
=>
a
+
b
.
score
,
0
)
||
0
return
{
return
{
memberName
:
item
,
memberName
:
item
,
...
@@ -145,12 +140,10 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
...
@@ -145,12 +140,10 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
}]
}]
let
childTableColumnResult
=
[]
let
childTableColumnResult
=
[]
const
childDataSource
=
groupBy
(
dataBySort
[
item
],
'memberName'
)
const
childDataSource
=
groupBy
(
dataBySort
[
item
],
'memberName'
)
console
.
log
(
childDataSource
,
'childDataSource'
)
Object
.
keys
(
childDataSource
).
forEach
((
_item
,
_index
)
=>
{
Object
.
keys
(
childDataSource
).
forEach
((
_item
,
_index
)
=>
{
// 动态子表格列 // 合并同会员下的专家评标
// 动态子表格列 // 合并同会员下的专家评标
// 相同同会员名下的分数数据 只需要取一个
// 相同同会员名下的分数数据 只需要取一个
const
computedMemberScoreItem
=
computedScore
.
filter
(
_v
=>
_v
.
memberName
===
_item
)[
0
]
const
computedMemberScoreItem
=
computedScore
.
filter
(
_v
=>
_v
.
memberName
===
_item
)[
0
]
console
.
log
(
computedMemberScoreItem
,
childDataSource
[
_item
])
let
objectItem
:
any
=
{
let
objectItem
:
any
=
{
memberId
:
childDataSource
[
_item
][
0
][
'memberId'
],
memberId
:
childDataSource
[
_item
][
0
][
'memberId'
],
memberName
:
_item
,
memberName
:
_item
,
...
@@ -179,7 +172,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
...
@@ -179,7 +172,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
})
})
setChildrenTableData
(
childrenTableDataSource
)
setChildrenTableData
(
childrenTableDataSource
)
setChildrenTableColumns
(
childTableDataColumns
)
setChildrenTableColumns
(
childTableDataColumns
)
console
.
log
(
childrenTableDataSource
,
childTableDataColumns
)
}
}
},
[
data
,
templateSort
])
},
[
data
,
templateSort
])
...
@@ -361,7 +353,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
...
@@ -361,7 +353,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
// 非在线保存
// 非在线保存
const
handleOfflineSave
=
(
row
)
=>
{
const
handleOfflineSave
=
(
row
)
=>
{
console
.
log
(
row
)
setOfflineData
(()
=>
offlineData
.
map
(
element
=>
{
setOfflineData
(()
=>
offlineData
.
map
(
element
=>
{
if
(
element
.
memberId
===
row
.
memberId
)
{
if
(
element
.
memberId
===
row
.
memberId
)
{
let
computed
=
omit
({...
row
},
[
'editable'
,
'memberId'
,
'memberName'
,
'noAverage'
,
'total'
])
let
computed
=
omit
({...
row
},
[
'editable'
,
'memberId'
,
'memberName'
,
'noAverage'
,
'total'
])
...
@@ -570,9 +561,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
...
@@ -570,9 +561,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
onSubmit=
{
handleSubmit
}
onSubmit=
{
handleSubmit
}
actions=
{
modalActions
}
actions=
{
modalActions
}
schema=
{
addRecommandMemberSchema
}
schema=
{
addRecommandMemberSchema
}
effects=
{
(
$
,
ctx
)
=>
{
}
}
modalProps=
{
{
confirmLoading
:
loading
}
}
/>
/>
</>)
</>)
}
}
...
...
src/pages/procurement/callForBids/readySubmitReport/detail/index.tsx
View file @
17ffe033
import
React
,
{
useState
,
useEffect
}
from
'react'
;
import
React
,
{
useState
}
from
'react'
;
import
{
history
}
from
'umi'
import
{
history
}
from
'umi'
import
{
Button
,
Row
,
Col
,
Radio
,
Table
}
from
'antd'
;
import
{
Button
,
Row
,
Col
,
Radio
,
Table
}
from
'antd'
;
import
style
from
'./index.less'
import
style
from
'./index.less'
...
...
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