Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
A
admin-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
admin-ci-test
Commits
97a1ea98
提交
97a1ea98
authored
6月 08, 2023
作者:
ZhangLingKun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
功能:租赁订单退款审批
上级
f84bf515
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
116 行增加
和
1 行删除
+116
-1
orderManageType.ts
src/api/interface/orderManageType.ts
+8
-0
orderManage.ts
src/api/modules/orderManage.ts
+4
-0
index.tsx
...ges/orderManage/equipmentOrder/comp/orderRefund/index.tsx
+93
-0
index.tsx
src/pages/orderManage/equipmentOrder/index.tsx
+10
-1
index.tsx
...es/orderManage/productOrder/comp/detailDelivery/index.tsx
+1
-0
没有找到文件。
src/api/interface/orderManageType.ts
浏览文件 @
97a1ea98
...
@@ -395,3 +395,11 @@ export type platFormCloseOrderType = InterFunction<
...
@@ -395,3 +395,11 @@ export type platFormCloseOrderType = InterFunction<
{
orderInfoId
:
number
;
shutReason
:
string
},
{
orderInfoId
:
number
;
shutReason
:
string
},
NonNullable
<
unknown
>
NonNullable
<
unknown
>
>
;
>
;
// 后台管理——驳回/同意退款
export
type
refundOrderType
=
InterFunction
<
{
orderInfoId
:
number
;
refund
:
boolean
;
},
NonNullable
<
unknown
>
>
;
src/api/modules/orderManage.ts
浏览文件 @
97a1ea98
...
@@ -8,6 +8,7 @@ import {
...
@@ -8,6 +8,7 @@ import {
orderImageDetailType
,
orderImageDetailType
,
pfConfirmOrderWareType
,
pfConfirmOrderWareType
,
platFormCloseOrderType
,
platFormCloseOrderType
,
refundOrderType
,
renterTakeOrderType
,
renterTakeOrderType
,
sendOrderWareType
,
sendOrderWareType
,
}
from
'~/api/interface/orderManageType'
;
}
from
'~/api/interface/orderManageType'
;
...
@@ -52,4 +53,7 @@ export class OrderManageAPI {
...
@@ -52,4 +53,7 @@ export class OrderManageAPI {
// 后台管理关闭订单
// 后台管理关闭订单
static
platFormCloseOrder
:
platFormCloseOrderType
=
(
params
)
=>
static
platFormCloseOrder
:
platFormCloseOrderType
=
(
params
)
=>
axios
.
get
(
'/oms/RentalOrders/platFormCloseOrder'
,
{
params
});
axios
.
get
(
'/oms/RentalOrders/platFormCloseOrder'
,
{
params
});
// 后台管理——驳回/同意退款
static
refundOrder
:
refundOrderType
=
(
params
)
=>
axios
.
post
(
'/oms/refund/refund'
,
params
);
}
}
src/pages/orderManage/equipmentOrder/comp/orderRefund/index.tsx
0 → 100644
浏览文件 @
97a1ea98
import
{
InterListType
,
InterReqType
}
from
'~/api/interface'
;
import
{
listPcWechatOrderType
,
refundOrderType
}
from
'~/api/interface/orderManageType'
;
import
React
from
'react'
;
import
{
Form
,
message
,
Modal
,
Radio
}
from
'antd'
;
import
{
OrderManageAPI
}
from
'~/api'
;
// 表格数据类型
type
TableType
=
InterListType
<
listPcWechatOrderType
>
;
// 请求数据的类型
type
ReqType
=
InterReqType
<
refundOrderType
>
;
// 传参类型
interface
propType
{
title
:
string
;
open
:
boolean
;
closed
:
any
;
data
?:
TableType
[
0
];
}
const
OrderRefund
:
React
.
FC
<
propType
>
=
(
props
)
=>
{
OrderRefund
.
defaultProps
=
{
data
:
undefined
,
};
// 参数
const
{
title
,
open
,
closed
,
data
}
=
props
;
// 表单钩子
const
[
form
]
=
Form
.
useForm
<
ReqType
>
();
// 关闭弹窗
const
handleCancel
=
()
=>
{
form
.
resetFields
();
closed
();
};
// 确认事件
const
handleOk
=
()
=>
{
form
.
validateFields
()
.
then
(
async
(
values
)
=>
{
// console.log('确认事件 --->', values);
await
handleSubmit
(
values
);
})
.
catch
((
err
)
=>
{
message
.
warning
({
content
:
err
.
errorFields
[
0
].
errors
[
0
],
})
.
then
();
});
};
// 提交事件
const
handleSubmit
=
async
(
values
:
ReqType
)
=>
{
const
res
=
await
OrderManageAPI
.
refundOrder
({
...
values
,
orderInfoId
:
Number
(
data
?.
id
),
});
if
(
res
&&
res
.
code
===
'200'
)
{
message
.
success
(
'操作成功'
);
handleCancel
();
}
};
return
(
<
Modal
open=
{
open
}
title=
{
title
}
onCancel=
{
handleCancel
}
onOk=
{
handleOk
}
destroyOnClose
width=
{
400
}
>
<
Form
name=
'addForm'
form=
{
form
}
labelAlign=
'right'
labelCol=
{
{
span
:
6
}
}
wrapperCol=
{
{
span
:
12
}
}
>
<
Form
.
Item
label=
'是否同意'
name=
'refund'
rules=
{
[{
required
:
true
,
message
:
'请选择是否同意'
}]
}
>
<
Radio
.
Group
options=
{
[
{
label
:
'同意退款'
,
value
:
true
},
{
label
:
'拒绝退款'
,
value
:
false
},
]
}
/>
</
Form
.
Item
>
</
Form
>
</
Modal
>
);
};
export
default
OrderRefund
;
src/pages/orderManage/equipmentOrder/index.tsx
浏览文件 @
97a1ea98
...
@@ -10,6 +10,7 @@ import { OrderManageAPI } from '~/api';
...
@@ -10,6 +10,7 @@ import { OrderManageAPI } from '~/api';
import
OrderDeliver
from
'src/pages/orderManage/equipmentOrder/comp/orderDeliver'
;
import
OrderDeliver
from
'src/pages/orderManage/equipmentOrder/comp/orderDeliver'
;
import
OrderConfirm
from
'~/pages/orderManage/equipmentOrder/comp/orderConfirm'
;
import
OrderConfirm
from
'~/pages/orderManage/equipmentOrder/comp/orderConfirm'
;
import
OrderClosed
from
'~/pages/orderManage/equipmentOrder/comp/orderClosed'
;
import
OrderClosed
from
'~/pages/orderManage/equipmentOrder/comp/orderClosed'
;
import
OrderRefund
from
'~/pages/orderManage/equipmentOrder/comp/orderRefund'
;
// 表格数据类型
// 表格数据类型
type
TableType
=
InterListType
<
listPcWechatOrderType
>
;
type
TableType
=
InterListType
<
listPcWechatOrderType
>
;
...
@@ -25,7 +26,7 @@ const orderStatus = [
...
@@ -25,7 +26,7 @@ const orderStatus = [
{
value
:
'400'
,
label
:
'待归还'
},
{
value
:
'400'
,
label
:
'待归还'
},
{
value
:
'500'
,
label
:
'等待卖家确认'
,
button
:
'确认收货'
},
{
value
:
'500'
,
label
:
'等待卖家确认'
,
button
:
'确认收货'
},
{
value
:
'600'
,
label
:
'交易完成'
},
{
value
:
'600'
,
label
:
'交易完成'
},
{
value
:
'700'
,
label
:
'退款中'
},
{
value
:
'700'
,
label
:
'退款中'
,
button
:
'退款审批'
},
{
value
:
'999'
,
label
:
'订单关闭'
},
{
value
:
'999'
,
label
:
'订单关闭'
},
{
value
:
'1000'
,
label
:
'已取消'
},
{
value
:
'1000'
,
label
:
'已取消'
},
];
];
...
@@ -39,6 +40,8 @@ function EquipmentOrderView() {
...
@@ -39,6 +40,8 @@ function EquipmentOrderView() {
const
[
confirmVisible
,
setConfirmVisible
]
=
useState
<
boolean
>
(
false
);
const
[
confirmVisible
,
setConfirmVisible
]
=
useState
<
boolean
>
(
false
);
// 关闭弹窗是否显示
// 关闭弹窗是否显示
const
[
closedVisible
,
setClosedVisible
]
=
useState
<
boolean
>
(
false
);
const
[
closedVisible
,
setClosedVisible
]
=
useState
<
boolean
>
(
false
);
// 退款弹窗是否显示
const
[
refundVisible
,
setRefundVisible
]
=
useState
<
boolean
>
(
false
);
// 当前选择的是第几个按钮
// 当前选择的是第几个按钮
const
[
statusCodeButtonIndex
,
setStatusCodeButtonIndex
]
=
useState
<
number
>
(
0
);
const
[
statusCodeButtonIndex
,
setStatusCodeButtonIndex
]
=
useState
<
number
>
(
0
);
// 订单状态搜索列表
// 订单状态搜索列表
...
@@ -135,6 +138,9 @@ function EquipmentOrderView() {
...
@@ -135,6 +138,9 @@ function EquipmentOrderView() {
if
(
tranStatus
===
'500'
)
{
if
(
tranStatus
===
'500'
)
{
setConfirmVisible
(
true
);
setConfirmVisible
(
true
);
}
}
if
(
tranStatus
===
'700'
)
{
setRefundVisible
(
true
);
}
};
};
// 关闭弹窗
// 关闭弹窗
const
handleClosed
=
()
=>
{
const
handleClosed
=
()
=>
{
...
@@ -142,6 +148,7 @@ function EquipmentOrderView() {
...
@@ -142,6 +148,7 @@ function EquipmentOrderView() {
setDeliverVisible
(
false
);
setDeliverVisible
(
false
);
setConfirmVisible
(
false
);
setConfirmVisible
(
false
);
setClosedVisible
(
false
);
setClosedVisible
(
false
);
setRefundVisible
(
false
);
paginationChange
(
pagination
.
current
,
pagination
.
pageSize
);
paginationChange
(
pagination
.
current
,
pagination
.
pageSize
);
};
};
// componentDidMount
// componentDidMount
...
@@ -340,6 +347,8 @@ function EquipmentOrderView() {
...
@@ -340,6 +347,8 @@ function EquipmentOrderView() {
/>
/>
{
/*关闭订单*/
}
{
/*关闭订单*/
}
<
OrderClosed
open=
{
closedVisible
}
title=
{
'关闭订单'
}
data=
{
editData
}
closed=
{
handleClosed
}
/>
<
OrderClosed
open=
{
closedVisible
}
title=
{
'关闭订单'
}
data=
{
editData
}
closed=
{
handleClosed
}
/>
{
/*退款弹窗*/
}
<
OrderRefund
open=
{
refundVisible
}
title=
{
'退款审批'
}
data=
{
editData
}
closed=
{
handleClosed
}
/>
</>
</>
);
);
}
}
...
...
src/pages/orderManage/productOrder/comp/detailDelivery/index.tsx
浏览文件 @
97a1ea98
...
@@ -23,6 +23,7 @@ const vcuTypeList = [
...
@@ -23,6 +23,7 @@ const vcuTypeList = [
{
label
:
'收货验收'
,
value
:
1
},
{
label
:
'收货验收'
,
value
:
1
},
{
label
:
'归还验收'
,
value
:
2
},
{
label
:
'归还验收'
,
value
:
2
},
{
label
:
'平台收货'
,
value
:
3
},
{
label
:
'平台收货'
,
value
:
3
},
{
label
:
'退货申请'
,
value
:
4
},
];
];
const
DetailDelivery
:
React
.
FC
<
PropsType
>
=
(
props
)
=>
{
const
DetailDelivery
:
React
.
FC
<
PropsType
>
=
(
props
)
=>
{
const
{
detail
}
=
props
;
const
{
detail
}
=
props
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论