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
linweijiong
jinfa-platform
Commits
e3fccb17
Commit
e3fccb17
authored
Jan 18, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: 修改判断条件
parent
724d6c4b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
index.tsx
src/pages/afterService/components/ReturnDetailInfo/index.tsx
+11
-6
index.tsx
...Service/returnApplication/components/DetailInfo/index.tsx
+1
-0
index.tsx
...afterService/returnManage/components/DetailInfo/index.tsx
+1
-0
No files found.
src/pages/afterService/components/ReturnDetailInfo/index.tsx
View file @
e3fccb17
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 18:02:18
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-01-18 1
0:47:55
* @LastEditTime: 2021-01-18 1
7:50:38
* @Description: 退款明细
*/
import
React
,
{
useState
}
from
'react'
;
...
...
@@ -18,8 +18,8 @@ import {
PAY_CHANNEL_BALANCE
,
PAY_CHANNEL_CREDIT
,
PAY_CHANNEL_COD
,
RETURN_
INN
ER_STATUS_TO_BE_REFUNDED
,
RETURN_
INN
ER_STATUS_UNCONFIRMED_REFUNDED
,
RETURN_
OUT
ER_STATUS_TO_BE_REFUNDED
,
RETURN_
OUT
ER_STATUS_UNCONFIRMED_REFUNDED
,
}
from
'@/constants'
;
import
Stamp
from
'../Stamp'
;
import
CheckVoucherModal
from
'../CheckVoucherModal'
;
...
...
@@ -59,6 +59,10 @@ interface ReturnDetailInfoProps {
*/
innerStatus
:
number
;
/**
* 退货申请单外部状态
*/
outerStatus
:
number
;
/**
* 采购商id
*/
purchaserId
:
number
,
...
...
@@ -81,7 +85,8 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
onRefund
,
onConfirm
,
isPurchaser
=
false
,
innerStatus
,
innerStatus
,
outerStatus
,
purchaserId
,
purchaserRoleId
,
supplierId
,
...
...
@@ -303,7 +308,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
<
div
className=
{
styles
[
'deliver-item-actions'
]
}
>
{
!
isPurchaser
&&
innerStatus
===
RETURN_INN
ER_STATUS_TO_BE_REFUNDED
&&
outerStatus
===
RETURN_OUT
ER_STATUS_TO_BE_REFUNDED
&&
!!
item
.
canRefund
&&
(
item
.
outerStatus
===
REFUND_OUTER_STATUS_NOT_RECEIVED
||
item
.
innerStatus
===
REFUND_INNER_STATUS_NO_REFUND
||
...
...
@@ -322,7 +327,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
<>
{
isPurchaser
&&
innerStatus
===
RETURN_INN
ER_STATUS_UNCONFIRMED_REFUNDED
&&
(
outerStatus
===
RETURN_OUT
ER_STATUS_UNCONFIRMED_REFUNDED
&&
(
item
.
outerStatus
===
REFUND_OUTER_STATUS_UNCONFIRMED_REFUND
||
item
.
outerStatus
===
REFUND_OUTER_STATUS_NOT_RECEIVED
)
&&
(
...
...
src/pages/afterService/returnApplication/components/DetailInfo/index.tsx
View file @
e3fccb17
...
...
@@ -425,6 +425,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
dataSource=
{
detailInfo
&&
detailInfo
.
refundList
?
detailInfo
.
refundList
:
[]
}
onConfirm=
{
handleConfirm
}
innerStatus=
{
detailInfo
?.
innerStatus
}
outerStatus=
{
detailInfo
?.
outerStatus
}
purchaserId=
{
detailInfo
?.
memberId
}
purchaserRoleId=
{
detailInfo
?.
roleId
}
supplierId=
{
detailInfo
?.
parentMemberId
}
...
...
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @
e3fccb17
...
...
@@ -471,6 +471,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
dataSource=
{
detailInfo
&&
detailInfo
.
refundList
?
detailInfo
.
refundList
:
[]
}
onRefund=
{
handleRefund
}
innerStatus=
{
detailInfo
?.
innerStatus
}
outerStatus=
{
detailInfo
?.
outerStatus
}
purchaserId=
{
detailInfo
?.
memberId
}
purchaserRoleId=
{
detailInfo
?.
roleId
}
supplierId=
{
detailInfo
?.
parentMemberId
}
...
...
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