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
301e31ae
Commit
301e31ae
authored
Feb 24, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev
parents
847f3b7c
088e87e3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
useBusinessEffects.ts
...components/ReturnInfoDrawer/effects/useBusinessEffects.ts
+2
-2
constants.ts
src/pages/afterService/constants.ts
+5
-0
verify.tsx
...ervice/returnApplication/returnPrConfirmResult/verify.tsx
+5
-3
No files found.
src/pages/afterService/components/ReturnInfoDrawer/effects/useBusinessEffects.ts
View file @
301e31ae
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-03 18:30:47
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-0
1-21 11:29:52
* @LastEditTime: 2021-0
2-24 17:25:15
* @Description: 联动逻辑相关
*/
import
lodash
from
'lodash'
;
...
...
@@ -38,7 +38,7 @@ export const useBusinessEffects = (context, actions) => {
const
newData
=
[...
getFieldValue
(
'payList'
)].
map
(
item
=>
{
return
{
...
item
,
refundAmount
:
+
(
new
BigNumber
(
+
value
).
multipliedBy
(
purchasePriceValue
).
multipliedBy
(
new
BigNumber
(
item
.
payRatio
).
dividedBy
(
100
))).
toFixed
(
2
)
,
refundAmount
:
item
.
payTime
?
+
(
new
BigNumber
(
+
value
).
multipliedBy
(
purchasePriceValue
).
multipliedBy
(
new
BigNumber
(
item
.
payRatio
).
dividedBy
(
100
))).
toFixed
(
2
)
:
0
,
};
});
setFieldValue
(
'payList'
,
newData
);
...
...
src/pages/afterService/constants.ts
View file @
301e31ae
...
...
@@ -289,6 +289,10 @@ export const REFUND_OUTER_STATUS_NOT_RECEIVED = 3;
* 退款到账
*/
export
const
REFUND_OUTER_STATUS_RECEIVED
=
4
;
/**
* 无须退款
*/
export
const
REFUND_OUTER_STATUS_NEED_NOT
=
5
;
// 退款外部状态 StatusTag map
export
const
REFUND_OUTER_STATUS_TAG_MAP
=
{
...
...
@@ -296,6 +300,7 @@ export const REFUND_OUTER_STATUS_TAG_MAP = {
[
REFUND_OUTER_STATUS_UNCONFIRMED_REFUND
]:
'primary'
,
[
REFUND_OUTER_STATUS_NOT_RECEIVED
]:
'warning'
,
[
REFUND_OUTER_STATUS_RECEIVED
]:
'success'
,
[
REFUND_OUTER_STATUS_NEED_NOT
]:
'success'
,
};
...
...
src/pages/afterService/returnApplication/returnPrConfirmResult/verify.tsx
View file @
301e31ae
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:34
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-02-
19 11:21:59
* @LastEditTime: 2021-02-
24 16:52:30
* @Description:
*/
import
React
from
'react'
;
...
...
@@ -11,7 +11,7 @@ import { history } from 'umi';
import
{
PublicApi
}
from
'@/services/api'
;
import
{
FormOutlined
,
ExclamationCircleOutlined
}
from
'@ant-design/icons'
;
import
{
usePageStatus
}
from
'@/hooks/usePageStatus'
;
import
{
REFUND_OUTER_STATUS_RECEIVED
}
from
'../../constants'
;
import
{
REFUND_OUTER_STATUS_RECEIVED
,
REFUND_OUTER_STATUS_NEED_NOT
}
from
'../../constants'
;
import
DetailInfo
,
{
DetailInfoData
}
from
'../components/DetailInfo'
;
const
{
confirm
}
=
Modal
;
...
...
@@ -46,7 +46,9 @@ const ReturnPrConfirmResultVerify: React.FC = () => {
headExtra=
{
(
info
:
DetailInfoData
)
=>
{
const
{
refundList
=
[]
}
=
info
||
{};
// 是否全部已退款,只有当退款明细中所有退款金额大于0的记录的状态都为确认退款到账时本按钮才可点击
const
isAllRefunded
=
refundList
.
every
((
item
)
=>
item
.
detailList
.
every
((
detail
)
=>
detail
.
refundAmount
>
0
&&
detail
.
outerStatus
===
REFUND_OUTER_STATUS_RECEIVED
));
// 或 该批次无需退款
const
isAllRefunded
=
refundList
.
every
((
item
)
=>
item
.
detailList
.
every
((
detail
)
=>
(
detail
.
refundAmount
>
0
&&
detail
.
outerStatus
===
REFUND_OUTER_STATUS_RECEIVED
)
||
detail
.
outerStatus
===
REFUND_OUTER_STATUS_NEED_NOT
));
return
[
isAllRefunded
?
(
...
...
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