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
cf3c15c8
Commit
cf3c15c8
authored
Feb 20, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 拆分可编辑状态
parent
aff1a078
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
14 deletions
+37
-14
index.tsx
...terService/exchangeManage/components/DetailInfo/index.tsx
+24
-9
verify.tsx
...erService/exchangeManage/exchangePrConfirmBack/verify.tsx
+1
-1
verify.tsx
.../afterService/exchangeManage/exchangePrDeliver/verify.tsx
+1
-1
verify.tsx
...afterService/exchangeManage/exchangePrReceived/verify.tsx
+8
-1
verify.tsx
...s/afterService/exchangeManage/exchangePrSubmit/verify.tsx
+3
-2
No files found.
src/pages/afterService/exchangeManage/components/DetailInfo/index.tsx
View file @
cf3c15c8
...
...
@@ -54,9 +54,21 @@ interface DetailInfoProps {
*/
id
:
string
;
/**
* 是否是
编辑的
* 是否是
可编辑 是否需要退货
*/
isEdit
?:
boolean
;
isEditReturn
?:
boolean
;
/**
* 是否是 可以编辑 地址的
*/
isEditAddress
?:
boolean
;
/**
* 是否是 可以编辑 退货发货相关
*/
isEditRefundDeliver
?:
boolean
;
/**
* 是否是 可以编辑 换货发货相关
*/
isEditExchangeDeliver
?:
boolean
;
/**
* 历史记录目标路径
*/
...
...
@@ -73,7 +85,10 @@ interface DetailInfo extends GetAsReplaceGoodsGetDetailBySupplierResponse {
const
DetailInfo
:
React
.
FC
<
DetailInfoProps
>
=
({
id
,
isEdit
=
false
,
isEditReturn
=
false
,
isEditAddress
=
false
,
isEditRefundDeliver
=
false
,
isEditExchangeDeliver
=
false
,
target
,
headExtra
,
})
=>
{
...
...
@@ -130,7 +145,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
};
const
handleReturn
=
record
=>
{
if
(
!
isEdit
||
!
id
)
{
if
(
!
isEdit
Return
||
!
id
)
{
return
;
}
const
msg
=
message
.
loading
({
...
...
@@ -225,7 +240,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
align
:
'center'
,
render
:
(
text
,
record
)
=>
(
<>
{
!
isEdit
?
(
{
!
isEdit
Return
?
(
text
)
:
(
<
Switch
checked=
{
record
.
isNeedReturn
}
onChange=
{
()
=>
handleReturn
(
record
)
}
/>
...
...
@@ -422,7 +437,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
onConfirmReturnReceive=
{
handleReceivedConfirmReturnReceive
}
innerStatus=
{
detailInfo
?.
innerStatus
}
target=
{
target
}
isEdit=
{
isEdit
}
isEdit=
{
isEdit
RefundDeliver
}
/>
</
Suspense
>
</
Col
>
...
...
@@ -443,7 +458,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
onConfirmExchangeBack=
{
handleConfirmExchangeBack
}
innerStatus=
{
detailInfo
?.
innerStatus
}
target=
{
target
}
isEdit=
{
isEdit
}
isEdit=
{
isEdit
ExchangeDeliver
}
/>
</
Suspense
>
</
Col
>
...
...
@@ -477,7 +492,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
phone
:
detailInfo
?.
returnGoodsAddress
?.
sendUserTel
,
fullAddress
:
detailInfo
?.
returnGoodsAddress
?.
sendAddress
,
}
}
isEdit=
{
isEdit
&&
detailInfo
?.
innerStatus
===
EXCHANGE_INNER_STATUS_UNCOMMITTED
}
isEdit=
{
isEdit
Address
&&
detailInfo
?.
innerStatus
===
EXCHANGE_INNER_STATUS_UNCOMMITTED
}
onSubmit=
{
handleReturnAddressSubmit
}
/>
</
Suspense
>
...
...
@@ -499,7 +514,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
phone
:
detailInfo
?.
replaceGoodsAddress
?.
sendUserTel
,
fullAddress
:
detailInfo
?.
replaceGoodsAddress
?.
sendAddress
,
}
}
isEdit=
{
isEdit
&&
detailInfo
?.
innerStatus
===
EXCHANGE_INNER_STATUS_UNCOMMITTED
}
isEdit=
{
isEdit
Address
&&
detailInfo
?.
innerStatus
===
EXCHANGE_INNER_STATUS_UNCOMMITTED
}
onSubmit=
{
handleExchangeAddressSubmit
}
/>
</
Suspense
>
...
...
src/pages/afterService/exchangeManage/exchangePrConfirmBack/verify.tsx
View file @
cf3c15c8
...
...
@@ -103,7 +103,7 @@ const ExchangePrConfirmBackVerify: React.FC = () => {
</
Space
>
)
}
target=
"/memberCenter/afterService/exchangeManage/exchangePrConfirmBack"
isEdit
isEdit
ExchangeDeliver
/>
</>
);
...
...
src/pages/afterService/exchangeManage/exchangePrDeliver/verify.tsx
View file @
cf3c15c8
...
...
@@ -52,7 +52,7 @@ const ExchangePrDeliverVerify: React.FC = () => {
</>
)
}
target=
"/memberCenter/afterService/exchangeManage/exchangePrDeliver"
isEdit
isEdit
ExchangeDeliver
/>
<
ManualDeliveryModal
...
...
src/pages/afterService/exchangeManage/exchangePrReceived/verify.tsx
View file @
cf3c15c8
/*
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:34
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-02-20 17:10:14
* @Description:
*/
import
React
,
{
useState
}
from
'react'
;
import
{
Button
}
from
'antd'
;
import
{
history
}
from
'umi'
;
...
...
@@ -74,7 +81,7 @@ const ExchangePrReceivedVerify: React.FC = () => {
)
}
}
target=
"/memberCenter/afterService/exchangeManage/exchangePrReceived"
isEdit
isEdit
RefundDeliver
/>
</>
);
...
...
src/pages/afterService/exchangeManage/exchangePrSubmit/verify.tsx
View file @
cf3c15c8
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 17:22:07
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-02-
19 20:34:16
* @LastEditTime: 2021-02-
20 17:06:52
* @Description:
*/
import
React
,
{
useState
}
from
'react'
;
...
...
@@ -152,7 +152,8 @@ const ExchangePrSubmitVerify: React.FC = () => {
提交审核
</
Button
>
)
}
isEdit
isEditReturn
isEditAddress
/>
<
VerifyModal
...
...
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