Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
e4a5ee31
Commit
e4a5ee31
authored
Nov 02, 2022
by
李腾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 仅退款,且用户端选择“已收到货”,【物流拦截】按钮隐藏不展示
parent
c62a0a3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
data.js
src/pages/AfterSaleManage/data.js
+6
-2
index.jsx
src/pages/AfterSaleManage/index.jsx
+4
-2
No files found.
src/pages/AfterSaleManage/data.js
View file @
e4a5ee31
...
@@ -442,7 +442,7 @@ export const getColumns = props => {
...
@@ -442,7 +442,7 @@ export const getColumns = props => {
key
=
"
link7
"
key
=
"
link7
"
onClick
=
{()
=>
openLogistics
(
record
)}
onClick
=
{()
=>
openLogistics
(
record
)}
{...
btnProps
}
{...
btnProps
}
disabled
=
{
serviceType
!==
1
||
(
serviceType
===
1
&&
intercept
)
||
isReceived
===
1
}
disabled
=
{
serviceType
!==
1
||
(
serviceType
===
1
&&
intercept
)}
>
>
物流拦截
物流拦截
<
/Button
>
<
/Button
>
...
@@ -483,8 +483,12 @@ export const getColumns = props => {
...
@@ -483,8 +483,12 @@ export const getColumns = props => {
<
/Button
>
<
/Button
>
);
);
/** @name applyTpye=2 */
// 仅退款状态 && 用户已收到货 不展示物流拦截按钮
if
(
serviceType
===
1
&&
isReceived
===
1
)
{
logisticsInterceptionBtn
=
''
;
}
// 无权限 不展示审核、驳回、物流拦截
if
(
!
canEditable
)
{
if
(
!
canEditable
)
{
auditBtn
=
''
;
auditBtn
=
''
;
refuseBtn
=
''
;
refuseBtn
=
''
;
...
...
src/pages/AfterSaleManage/index.jsx
View file @
e4a5ee31
...
@@ -40,7 +40,7 @@ const AfterSale = props => {
...
@@ -40,7 +40,7 @@ const AfterSale = props => {
const
{
permissions
}
=
props
;
const
{
permissions
}
=
props
;
const
canEditable
=
permissions
[
AFTER_SALE_ORDER
.
EDITABLE
];
const
canEditable
=
permissions
[
AFTER_SALE_ORDER
.
EDITABLE
];
const
location
=
useLocation
();
const
location
=
useLocation
();
const
pageQueryOrderNo
=
location
.
query
?.
orderNo
||
''
;
const
[
pageQueryOrderNo
,
setPageQueryOrderNo
]
=
useState
(
location
.
query
?.
orderNo
||
''
)
;
const
actionRef
=
useRef
();
const
actionRef
=
useRef
();
const
formRef
=
useRef
();
const
formRef
=
useRef
();
...
@@ -318,7 +318,7 @@ const AfterSale = props => {
...
@@ -318,7 +318,7 @@ const AfterSale = props => {
const
requestParams
=
{
const
requestParams
=
{
page
,
page
,
size
,
size
,
orderNo
:
pageQueryOrderNo
,
orderNo
:
pageQueryOrderNo
,
// 首次请求需要直接使用 此方式,因为params中首次请求不存在orderNo
...
params
,
...
params
,
startDate
,
startDate
,
endDate
,
endDate
,
...
@@ -331,6 +331,8 @@ const AfterSale = props => {
...
@@ -331,6 +331,8 @@ const AfterSale = props => {
endDate
,
endDate
,
});
});
const
res
=
await
searchList
(
requestParams
);
const
res
=
await
searchList
(
requestParams
);
// 初始化获取订单编号后删除临时存储的订单编号
setPageQueryOrderNo
(
''
);
const
{
records
=
[],
total
}
=
res
.
data
;
const
{
records
=
[],
total
}
=
res
.
data
;
if
(
countRes
.
code
===
'
0000
'
)
{
if
(
countRes
.
code
===
'
0000
'
)
{
...
...
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