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
aff1a078
Commit
aff1a078
authored
Feb 20, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 拆分可编辑状态
parent
d6417922
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
11 deletions
+32
-11
index.tsx
src/pages/afterService/components/ReturnDetailInfo/index.tsx
+1
-1
index.tsx
...Service/returnApplication/components/DetailInfo/index.tsx
+21
-6
verify.tsx
...rService/returnApplication/returnPrConfirmBack/verify.tsx
+1
-1
verify.tsx
...ervice/returnApplication/returnPrConfirmFinish/verify.tsx
+7
-1
verify.tsx
...ervice/returnApplication/returnPrConfirmResult/verify.tsx
+1
-1
verify.tsx
...afterService/returnApplication/returnPrDeliver/verify.tsx
+1
-1
No files found.
src/pages/afterService/components/ReturnDetailInfo/index.tsx
View file @
aff1a078
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 18:02:18
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-02-20 1
5:16:18
* @LastEditTime: 2021-02-20 1
6:54:41
* @Description: 退款明细
*/
import
React
,
{
useState
}
from
'react'
;
...
...
src/pages/afterService/returnApplication/components/DetailInfo/index.tsx
View file @
aff1a078
...
...
@@ -57,9 +57,21 @@ interface DetailInfoProps {
*/
id
:
string
;
/**
* 是否是
编辑的
* 是否是
可编辑 是否需要退货
*/
isEdit
?:
boolean
;
isEditReturn
?:
boolean
;
/**
* 是否是 可以退款的
*/
isEditRefund
?:
boolean
;
/**
* 是否是 可以编辑 地址的
*/
isEditAddress
?:
boolean
;
/**
* 是否是 可以编辑 退货发货相关
*/
isEditRefundDeliver
?:
boolean
;
/**
* 历史记录目标路径
*/
...
...
@@ -72,7 +84,9 @@ interface DetailInfoProps {
const
DetailInfo
:
React
.
FC
<
DetailInfoProps
>
=
({
id
,
isEdit
=
false
,
isEditRefund
=
false
,
isEditAddress
=
false
,
isEditRefundDeliver
=
false
,
target
,
headExtra
=
null
,
})
=>
{
...
...
@@ -413,7 +427,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
isPurchaser=
{
true
}
innerStatus=
{
detailInfo
?.
innerStatus
}
target=
{
target
}
isEdit=
{
isEdit
}
isEdit=
{
isEdit
RefundDeliver
}
/>
</
Suspense
>
</
Col
>
...
...
@@ -440,7 +454,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
purchaserRoleId=
{
detailInfo
?.
roleId
}
supplierId=
{
detailInfo
?.
parentMemberId
}
supplierRoleId=
{
detailInfo
?.
parentMemberRoleId
}
isEdit=
{
isEdit
}
isEdit=
{
isEdit
Refund
}
isPurchaser
/>
</
Suspense
>
...
...
@@ -459,6 +473,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
</
Col
>
<
Col
span=
{
detailInfo
&&
detailInfo
.
outerStatus
===
RETURN_OUTER_STATUS_FINISHED
?
12
:
15
}
>
{
/* 退货地址信息 */
}
<
Suspense
fallback=
{
null
}
>
<
ReturnAddressInfo
deliveryAddress=
{
{
...
...
@@ -474,7 +489,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
fullAddress
:
detailInfo
?.
returnGoodsAddress
?.
sendAddress
,
}
}
onSubmit=
{
()
=>
{}
}
isEdit=
{
isEdit
&&
detailInfo
?.
innerStatus
===
RETURN_INNER_STATUS_UNCOMMITTED
}
isEdit=
{
isEdit
Address
&&
detailInfo
?.
innerStatus
===
RETURN_INNER_STATUS_UNCOMMITTED
}
/>
</
Suspense
>
</
Col
>
...
...
src/pages/afterService/returnApplication/returnPrConfirmBack/verify.tsx
View file @
aff1a078
...
...
@@ -141,7 +141,7 @@ const ReturnPrConfirmBackVerify: React.FC = () => {
</
Space
>
)
}
target=
"/memberCenter/afterService/returnApplication/returnPrConfirmBack"
isEdit
isEdit
RefundDeliver
/>
</>
);
...
...
src/pages/afterService/returnApplication/returnPrConfirmFinish/verify.tsx
View file @
aff1a078
/*
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:34
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-02-20 16:56:18
* @Description:
*/
import
React
,
{
useState
}
from
'react'
;
import
{
Button
}
from
'antd'
;
import
{
history
}
from
'umi'
;
...
...
@@ -43,7 +50,6 @@ const ReturnPrConfirmFinishVerify: React.FC = () => {
</
Button
>
)
}
target=
"/memberCenter/afterService/returnApplication/returnPrConfirmFinish"
isEdit
/>
<
FinishedModal
...
...
src/pages/afterService/returnApplication/returnPrConfirmResult/verify.tsx
View file @
aff1a078
...
...
@@ -62,7 +62,7 @@ const ReturnPrConfirmResultVerify: React.FC = () => {
]
}
}
target=
"/memberCenter/afterService/returnApplication/returnPrConfirmResult"
isEdit
isEdit
Refund
/>
</>
);
...
...
src/pages/afterService/returnApplication/returnPrDeliver/verify.tsx
View file @
aff1a078
...
...
@@ -52,7 +52,7 @@ const ReturnPrDeliverVerify: React.FC = () => {
</>
)
}
target=
"/memberCenter/afterService/returnApplication/returnPrDeliver"
isEdit
isEdit
RefundDeliver
/>
<
ManualDeliveryModal
...
...
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