diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index aff90c576..586f231ec 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -589,6 +589,8 @@ public class OrderService {
OrderDetailInfoVO.OrderInfo order = new OrderDetailInfoVO.OrderInfo();
order.setOrderCode(orderBasicInfo.getOrderCode());
order.setOrderStatus(orderBasicInfo.getOrderStatus());
+ String describe = orderBasicInfoService.transformOrderStatusDescribe(orderBasicInfo.getOrderStatus(), orderBasicInfo.getPayStatus());
+ order.setOrderStatusDescribe(describe);
order.setStartTime(DateUtils.formatDateTime(orderBasicInfo.getChargeStartTime()));
order.setEndTime(DateUtils.formatDateTime(orderBasicInfo.getChargeEndTime()));
order.setCreateTime(DateUtils.formatDateTime(orderBasicInfo.getCreateTime()));
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 52305cb54..438edd0aa 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -29,7 +29,7 @@
>
-
-
- {{ status(scope.row.orderStatus) }}
-
-
+
@@ -212,19 +208,6 @@ export default {
this.orderRealTimeInfo = [data.orderRealTimeInfo];
this.orderDetail = [data.billingDetails];
},
- status(e) {
- let arr = [
- "未启动",
- "充电中",
- "待结算",
- "待补缴",
- "异常",
- "可疑",
- "订单完成",
- "超时关闭",
- ];
- return e ? arr[e] : arr[0];
- },
},
};