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
a7ca0f5b
Commit
a7ca0f5b
authored
Apr 01, 2022
by
Bill
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'chore-v2-220318' into 'v2-220318'
merge: merge v2 into v2-220318 See merge request linkseeks-design/pro-platform!111
parents
b139467d
3de51497
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
18 deletions
+31
-18
index.tsx
src/pages/transaction/purchaserEvaluation/analysis/index.tsx
+8
-5
index.tsx
...ges/transaction/purchaserEvaluation/unevaluated/index.tsx
+8
-4
index.tsx
src/pages/transaction/supplierEvaluation/analysis/index.tsx
+7
-5
index.tsx
...ages/transaction/supplierEvaluation/unevaluated/index.tsx
+8
-4
No files found.
src/pages/transaction/purchaserEvaluation/analysis/index.tsx
View file @
a7ca0f5b
import
React
,
{
useEffect
,
useState
}
from
'react'
;
import
{
Tabs
,
Row
,
Col
,
Button
}
from
'antd'
;
import
{
getIntl
,
history
}
from
'umi'
;
import
{
getIntl
,
history
,
IRouteComponentProps
}
from
'umi'
;
import
{
observer
,
inject
}
from
'mobx-react'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
getMemberCommentConsumerCountTradeHistoryPage
,
getMemberCommentConsumerCountTradeSummary
,
getMemberCommentConsumerReceiveTradeHistoryPage
,
getMemberCommentConsumerSendTradeHistoryPage
}
from
'@/services/MemberV2Api'
;
...
...
@@ -16,6 +16,7 @@ import styles from './index.less';
const
{
TabPane
}
=
Tabs
;
const
intl
=
getIntl
();
interface
ReceivedSearch
{
/**
* 评价星级(1-5)
...
...
@@ -46,13 +47,15 @@ interface EstimateSumItems {
sum
?:
number
,
};
interface
AnalysisProps
{
interface
AnalysisProps
extends
IRouteComponentProps
{
EvaluationStore
?:
IEvaluationModule
;
};
const
Analysis
:
React
.
FC
<
AnalysisProps
>
=
({
EvaluationStore
,
match
,
})
=>
{
const
url
=
match
.
path
.
split
(
'/'
).
slice
(
0
,
-
1
).
join
(
'/'
);
const
[
evaluateSum
,
setEvaluateSum
]
=
useState
([]);
const
[
evaluatePie
,
setEvaluatePie
]
=
useState
([]);
...
...
@@ -301,15 +304,15 @@ const Analysis: React.FC<AnalysisProps> = ({
},
[]);
const
handleJumpReceived
=
record
=>
{
history
.
push
(
`
/memberCenter/tranactionAbility/purchaserEvaluation
/received/detail?id=
${
record
.
id
}
`
);
history
.
push
(
`
${
url
}
/received/detail?id=
${
record
.
id
}
`
);
};
const
handleEditSent
=
record
=>
{
history
.
push
(
`
/memberCenter/tranactionAbility/purchaserEvaluation
/sent/edit?id=
${
record
.
id
}
`
);
history
.
push
(
`
${
url
}
/sent/edit?id=
${
record
.
id
}
`
);
};
const
handleJumpSent
=
record
=>
{
history
.
push
(
`
/memberCenter/tranactionAbility/purchaserEvaluation
/sent/detail?id=
${
record
.
id
}
`
);
history
.
push
(
`
${
url
}
/sent/detail?id=
${
record
.
id
}
`
);
};
return
(
...
...
src/pages/transaction/purchaserEvaluation/unevaluated/index.tsx
View file @
a7ca0f5b
import
React
,
{
useState
,
useRef
}
from
'react'
;
import
{
Card
,
Badge
,
Button
}
from
'antd'
;
import
{
getIntl
,
Link
}
from
'umi'
;
import
{
getIntl
,
Link
,
IRouteComponentProps
}
from
'umi'
;
import
StandardTable
from
'@/components/StandardTable'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
...
...
@@ -15,10 +15,14 @@ import NiceForm from '@/components/NiceForm';
import
StatusTag
from
'@/components/StatusTag'
;
import
{
listSearchSchema
}
from
'./schema'
;
import
styles
from
'./index.less'
;
const
intl
=
getIntl
();
const
formActions
=
createFormActions
();
const
Unevaluated
:
React
.
FC
=
()
=>
{
interface
IProps
extends
IRouteComponentProps
{}
const
Unevaluated
:
React
.
FC
<
IProps
>
=
(
props
)
=>
{
const
{
match
}
=
props
;
const
ref
=
useRef
<
any
>
({});
...
...
@@ -29,7 +33,7 @@ const Unevaluated: React.FC = () => {
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
<
EyePreview
url=
{
`
/memberCenter/tranactionAbility/purchaserEvaluation/unevaluated
/order?id=${record.id}`
}
url=
{
`
${match.path}
/order?id=${record.id}`
}
>
{
text
}
</
EyePreview
>
...
...
@@ -83,7 +87,7 @@ const Unevaluated: React.FC = () => {
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
<>
<
Link
to=
{
`
/memberCenter/tranactionAbility/purchaserEvaluation/unevaluated
/evaluate?id=${record.id}`
}
>
<
Link
to=
{
`
${match.path}
/evaluate?id=${record.id}`
}
>
{
!
record
.
completeCommentStatus
&&
(
<
Button
type=
"link"
...
...
src/pages/transaction/supplierEvaluation/analysis/index.tsx
View file @
a7ca0f5b
import
React
,
{
useEffect
,
useState
,
useRef
}
from
'react'
;
import
{
Tabs
,
Row
,
Col
}
from
'antd'
;
import
{
getIntl
,
history
}
from
'umi'
;
import
{
getIntl
,
history
,
IRouteComponentProps
}
from
'umi'
;
import
{
observer
,
inject
}
from
'mobx-react'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
import
{
getMemberCommentSupplyCountTradeSummary
,
getMemberCommentSupplyCountTradeHistoryPage
,
getMemberCommentSupplyReceiveTradeHistoryPage
,
getMemberCommentSupplySendTradeHistoryPage
,
postMemberCommentSupplyReceiveTradeHistoryReply
}
from
'@/services/MemberV2Api'
;
...
...
@@ -48,13 +48,15 @@ interface EstimateSumItems {
sum
?:
number
,
};
interface
AnalysisProps
{
interface
AnalysisProps
extends
IRouteComponentProps
{
EvaluationStore
?:
IEvaluationModule
;
};
const
Analysis
:
React
.
FC
<
AnalysisProps
>
=
({
EvaluationStore
,
match
,
})
=>
{
const
url
=
match
.
path
.
split
(
'/'
).
slice
(
0
,
-
1
).
join
(
'/'
);
const
[
evaluateSum
,
setEvaluateSum
]
=
useState
([]);
const
[
evaluatePie
,
setEvaluatePie
]
=
useState
([]);
...
...
@@ -323,15 +325,15 @@ const Analysis: React.FC<AnalysisProps> = ({
},
[]);
const
handleJumpReceived
=
record
=>
{
history
.
push
(
`
/memberCenter/tranactionAbility/supplierEvaluation
/received/detail?id=
${
record
.
id
}
`
);
history
.
push
(
`
${
url
}
/received/detail?id=
${
record
.
id
}
`
);
};
const
handleEditSent
=
record
=>
{
history
.
push
(
`
/memberCenter/tranactionAbility/supplierEvaluation
/sent/edit?id=
${
record
.
id
}
`
);
history
.
push
(
`
${
url
}
/sent/edit?id=
${
record
.
id
}
`
);
};
const
handleJumpSent
=
record
=>
{
history
.
push
(
`
/memberCenter/tranactionAbility/supplierEvaluation
/sent/detail?id=
${
record
.
id
}
`
);
history
.
push
(
`
${
url
}
/sent/detail?id=
${
record
.
id
}
`
);
};
const
handleVisibleExplainModal
=
(
flag
?:
boolean
)
=>
{
...
...
src/pages/transaction/supplierEvaluation/unevaluated/index.tsx
View file @
a7ca0f5b
import
React
,
{
useState
,
useRef
}
from
'react'
;
import
{
Card
,
Badge
,
Button
}
from
'antd'
;
import
{
getIntl
,
Link
}
from
'umi'
;
import
{
getIntl
,
IRouteComponentProps
,
Link
}
from
'umi'
;
import
StandardTable
from
'@/components/StandardTable'
;
import
{
ColumnType
}
from
'antd/lib/table/interface'
;
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
;
...
...
@@ -18,7 +18,11 @@ import styles from './index.less';
const
formActions
=
createFormActions
();
const
intl
=
getIntl
();
const
Unevaluated
:
React
.
FC
=
()
=>
{
interface
IProps
extends
IRouteComponentProps
{}
const
Unevaluated
:
React
.
FC
<
IProps
>
=
(
props
)
=>
{
const
{
match
}
=
props
;
const
ref
=
useRef
<
any
>
({});
...
...
@@ -29,7 +33,7 @@ const Unevaluated: React.FC = () => {
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
<
EyePreview
url=
{
`
/memberCenter/tranactionAbility/supplierEvaluation/unevaluated
/order?id=${record.id}`
}
url=
{
`
${match.path}
/order?id=${record.id}`
}
>
{
text
}
</
EyePreview
>
...
...
@@ -83,7 +87,7 @@ const Unevaluated: React.FC = () => {
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
<>
<
Link
to=
{
`
/memberCenter/tranactionAbility/supplierEvaluation/unevaluated
/evaluate?id=${record.id}`
}
>
<
Link
to=
{
`
${match.path}
/evaluate?id=${record.id}`
}
>
{
!
record
.
completeCommentStatus
&&
(
<
Button
type=
"link"
...
...
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