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
b2a1f09a
Commit
b2a1f09a
authored
Jan 28, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 添加按钮是否可操作限制
parent
5da33494
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
index.tsx
...ges/afterService/components/ExchangeDeliverInfo/index.tsx
+10
-1
index.tsx
...es/afterService/components/ExchangeReceivedInfo/index.tsx
+10
-1
index.tsx
...terService/exchangeManage/components/DetailInfo/index.tsx
+2
-0
No files found.
src/pages/afterService/components/ExchangeDeliverInfo/index.tsx
View file @
b2a1f09a
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 15:18:15
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-01-2
2 18:01:2
6
* @LastEditTime: 2021-01-2
8 10:28:0
6
* @Description: 换货发货统计、换货发货明细
*/
import
React
,
{
useState
}
from
'react'
;
...
...
@@ -69,6 +69,11 @@ interface ExchangeDeliverInfoProps {
* 订单记录地址
*/
target
:
string
;
/**
* 是否可操作
*/
isEdit
?:
boolean
;
};
const
ExchangeDeliverInfo
:
React
.
FC
<
ExchangeDeliverInfoProps
>
=
({
...
...
@@ -80,6 +85,7 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
onConfirmExchangeReceive
,
innerStatus
,
target
,
isEdit
=
false
,
})
=>
{
const
[
currentBatch
,
setCurrentBatch
]
=
useState
(
1
);
...
...
@@ -329,6 +335,7 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
</
Descriptions
.
Item
>
<
Descriptions
.
Item
>
{
(
isEdit
&&
!
isPurchaser
&&
item
.
innerStatus
===
MAIL_INNER_STATUS_UNCONFIRMED_DELIVER
&&
innerStatus
===
EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_DELIVERY
...
...
@@ -344,6 +351,7 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
</
a
>
)
}
{
(
isEdit
&&
isPurchaser
&&
item
.
innerStatus
===
MAIL_INNER_STATUS_CONFIRMED_DELIVER
&&
innerStatus
===
EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIVE
...
...
@@ -359,6 +367,7 @@ const ExchangeDeliverInfo: React.FC<ExchangeDeliverInfoProps> = ({
</
a
>
)
}
{
(
isEdit
&&
!
isPurchaser
&&
item
.
innerStatus
===
MAIL_INNER_STATUS_CONFIRMED_RECEIVING
&&
innerStatus
===
EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT
...
...
src/pages/afterService/components/ExchangeReceivedInfo/index.tsx
View file @
b2a1f09a
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 15:18:15
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-01-2
2 15:36:57
* @LastEditTime: 2021-01-2
8 10:29:01
* @Description: 换货收货统计、换货发货明细
*/
import
React
,
{
useState
}
from
'react'
;
...
...
@@ -72,6 +72,11 @@ interface ExchangeReceivedInfoProps {
* 订单记录地址
*/
target
:
string
;
/**
* 是否可操作
*/
isEdit
?:
boolean
;
};
const
ExchangeReceivedInfo
:
React
.
FC
<
ExchangeReceivedInfoProps
>
=
({
...
...
@@ -83,6 +88,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
onConfirmReturnReceive
,
innerStatus
,
target
,
isEdit
=
false
,
})
=>
{
const
[
currentBatch
,
setCurrentBatch
]
=
useState
(
1
);
...
...
@@ -339,6 +345,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
</
Descriptions
.
Item
>
<
Descriptions
.
Item
>
{
(
isEdit
&&
isPurchaser
&&
item
.
innerStatus
===
MAIL_INNER_STATUS_UNCONFIRMED_DELIVER
&&
innerStatus
===
EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY
...
...
@@ -354,6 +361,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
</
a
>
)
}
{
(
isEdit
&&
!
isPurchaser
&&
item
.
innerStatus
===
MAIL_INNER_STATUS_CONFIRMED_DELIVER
&&
innerStatus
===
EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE
...
...
@@ -369,6 +377,7 @@ const ExchangeReceivedInfo: React.FC<ExchangeReceivedInfoProps> = ({
</
a
>
)
}
{
(
isEdit
&&
isPurchaser
&&
item
.
innerStatus
===
MAIL_INNER_STATUS_CONFIRMED_RECEIVING
&&
innerStatus
===
EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT
...
...
src/pages/afterService/exchangeManage/components/DetailInfo/index.tsx
View file @
b2a1f09a
...
...
@@ -419,6 +419,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
onConfirmReturnReceive=
{
handleReceivedConfirmReturnReceive
}
innerStatus=
{
detailInfo
?.
innerStatus
}
target=
{
target
}
isEdit=
{
isEdit
}
/>
</
Suspense
>
</
Col
>
...
...
@@ -439,6 +440,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
onConfirmExchangeBack=
{
handleConfirmExchangeBack
}
innerStatus=
{
detailInfo
?.
innerStatus
}
target=
{
target
}
isEdit=
{
isEdit
}
/>
</
Suspense
>
</
Col
>
...
...
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