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
1a04ac87
Commit
1a04ac87
authored
Aug 25, 2022
by
李腾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 售后订单管理-服务订单隐藏物流相关按钮
parent
6e2fbf1b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
74 additions
and
58 deletions
+74
-58
index.jsx
src/pages/AfterSaleManage/PassAudit/index.jsx
+46
-38
index.jsx
src/pages/AfterSaleManage/Pending/index.jsx
+27
-19
index.jsx
src/pages/orderManage/queryOrder/index.jsx
+1
-1
No files found.
src/pages/AfterSaleManage/PassAudit/index.jsx
View file @
1a04ac87
...
@@ -125,44 +125,52 @@ export default () => {
...
@@ -125,44 +125,52 @@ export default () => {
width
:
300
,
width
:
300
,
dataIndex
:
'
action
'
,
dataIndex
:
'
action
'
,
fixed
:
'
right
'
,
fixed
:
'
right
'
,
render
:
(
_
,
r
)
=>
[
render
:
(
_
,
r
)
=>
{
<
Popconfirm
const
operations
=
[
title=
"确定允许退款?"
<
Popconfirm
onConfirm=
{
()
=>
refund
(
r
)
}
title=
"确定允许退款?"
okText=
"确认"
onConfirm=
{
()
=>
refund
(
r
)
}
cancelText=
"取消"
okText=
"确认"
key=
"pop"
cancelText=
"取消"
disabled=
{
!
r
.
showRefund
}
key=
"pop"
>
disabled=
{
!
r
.
showRefund
}
<
Button
key=
"link1"
className=
"mr10 mt10"
type=
"primary"
disabled=
{
!
r
.
showRefund
}
>
>
{
r
.
showRefunded
?
'
已退款
'
:
'
允许退款
'
}
<
Button
key=
"link1"
className=
"mr10 mt10"
type=
"primary"
disabled=
{
!
r
.
showRefund
}
>
</
Button
>
{
r
.
showRefunded
?
'
已退款
'
:
'
允许退款
'
}
</
Popconfirm
>,
</
Button
>
<
Button
</
Popconfirm
>,
key=
"link2"
<
Button
onClick=
{
()
=>
reject
(
r
)
}
key=
"link2"
type=
"primary"
onClick=
{
()
=>
reject
(
r
)
}
className=
"mr10 mt10"
type=
"primary"
disabled=
{
!
r
.
showRefuse
}
className=
"mr10 mt10"
>
disabled=
{
!
r
.
showRefuse
}
驳回
>
</
Button
>,
驳回
<
Button
key=
"link3"
onClick=
{
()
=>
viewDetail
(
r
)
}
type=
"primary"
className=
"mr10 mt10"
>
</
Button
>,
订单详情
<
Button
key=
"link3"
onClick=
{
()
=>
viewDetail
(
r
)
}
type=
"primary"
className=
"mr10 mt10"
>
</
Button
>,
订单详情
<
Button
</
Button
>,
key=
"link4"
<
Button
onClick=
{
()
=>
handleCom
(
r
)
}
key=
"link4"
type=
"primary"
onClick=
{
()
=>
handleCom
(
r
)
}
className=
"mr10 mt10"
type=
"primary"
disabled=
{
!
r
.
showLogistics
}
className=
"mr10 mt10"
>
disabled=
{
!
r
.
showLogistics
}
查看物流
>
</
Button
>,
查看物流
<
Button
className=
"mr10 mt10"
type=
"primary"
onClick=
{
()
=>
viewLog
(
r
)
}
>
</
Button
>,
查看记录
<
Button
className=
"mr10 mt10"
type=
"primary"
onClick=
{
()
=>
viewLog
(
r
)
}
>
</
Button
>,
查看记录
],
</
Button
>,
];
// 服务订单删除物流拦截
if
(
!
[
'
vip
'
,
'
self
'
].
includes
(
r
.
supplierType
))
{
operations
.
splice
(
3
,
1
);
}
return
operations
;
},
},
},
];
];
return
(
return
(
...
...
src/pages/AfterSaleManage/Pending/index.jsx
View file @
1a04ac87
...
@@ -178,25 +178,33 @@ export default () => {
...
@@ -178,25 +178,33 @@ export default () => {
dataIndex
:
'
action
'
,
dataIndex
:
'
action
'
,
width
:
250
,
width
:
250
,
fixed
:
'
right
'
,
fixed
:
'
right
'
,
render
:
(
val
,
r
)
=>
[
render
:
(
val
,
r
)
=>
{
<
Button
key=
"link1"
onClick=
{
()
=>
openAudit
(
r
)
}
className=
"mr10"
type=
"primary"
>
const
operations
=
[
审核
<
Button
key=
"link1"
onClick=
{
()
=>
openAudit
(
r
)
}
className=
"mr10 mt10"
type=
"primary"
>
</
Button
>,
审核
<
Button
</
Button
>,
disabled=
{
r
.
serviceType
!==
1
||
(
r
.
serviceType
===
1
&&
r
.
intercept
)
}
<
Button
onClick=
{
()
=>
openLogistics
(
r
)
}
disabled=
{
r
.
serviceType
!==
1
||
(
r
.
serviceType
===
1
&&
r
.
intercept
)
}
className=
"mr10"
onClick=
{
()
=>
openLogistics
(
r
)
}
type=
"primary"
className=
"mr10 mt10"
>
type=
"primary"
物流拦截
>
</
Button
>,
物流拦截
<
Button
className=
"mr10 mt10"
key=
"link"
onClick=
{
()
=>
viewDetail
(
r
)
}
type=
"primary"
>
</
Button
>,
订单详情
<
Button
className=
"mr10 mt10"
key=
"link"
onClick=
{
()
=>
viewDetail
(
r
)
}
type=
"primary"
>
</
Button
>,
订单详情
<
Button
type=
"primary"
onClick=
{
()
=>
viewLog
(
r
)
}
>
</
Button
>,
查看记录
<
Button
className=
"mr10 mt10"
type=
"primary"
onClick=
{
()
=>
viewLog
(
r
)
}
>
</
Button
>,
查看记录
],
</
Button
>,
];
// 服务订单删除物流拦截
if
(
!
[
'
vip
'
,
'
self
'
].
includes
(
r
.
supplierType
))
{
operations
.
splice
(
1
,
1
);
}
return
operations
;
},
},
},
];
];
return
(
return
(
...
...
src/pages/orderManage/queryOrder/index.jsx
View file @
1a04ac87
...
@@ -281,7 +281,7 @@ const OrderList = ref => {
...
@@ -281,7 +281,7 @@ const OrderList = ref => {
</
div
>
</
div
>
));
));
}
}
return
'
-
'
;
return
<
div
align=
"center"
>
-
</
div
>
;
},
},
},
},
{
{
...
...
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