From 30459375a6131321678f60ded567954f42b462f2 Mon Sep 17 00:00:00 2001
From: admin-lmm <2497833386@QQ.com>
Date: Tue, 22 Aug 2023 10:37:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E6=94=B6=E6=97=A5=E6=8A=A5=E7=82=B9?=
=?UTF-8?q?=E5=87=BB=E4=BA=A4=E6=98=93=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E5=BD=93=E6=97=A5=E7=9A=84=E6=B8=85=E5=88=86=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jsowell-ui/src/api/order/order.js | 80 ++++++++--------
.../pile/merchant/components/revenue.vue | 92 +++++++------------
2 files changed, 79 insertions(+), 93 deletions(-)
diff --git a/jsowell-ui/src/api/order/order.js b/jsowell-ui/src/api/order/order.js
index f1b2c3213..b8a574375 100644
--- a/jsowell-ui/src/api/order/order.js
+++ b/jsowell-ui/src/api/order/order.js
@@ -1,79 +1,87 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
// 查询订单列表
export function listOrder(query) {
return request({
- url: '/order/order/list',
- method: 'get',
- params: query
- })
+ url: "/order/order/list",
+ method: "get",
+ params: query,
+ });
}
// 查询订单详细
export function getOrder(orderCode) {
return request({
- url: '/order/orderDetail/' + orderCode,
- method: 'get'
- })
+ url: "/order/orderDetail/" + orderCode,
+ method: "get",
+ });
}
// 新增订单
export function addOrder(data) {
return request({
- url: '/order/order',
- method: 'post',
- data: data
- })
+ url: "/order/order",
+ method: "post",
+ data: data,
+ });
}
// 修改订单
export function updateOrder(data) {
return request({
- url: '/order/order',
- method: 'put',
- data: data
- })
+ url: "/order/order",
+ method: "put",
+ data: data,
+ });
}
// 删除订单
export function delOrder(id) {
return request({
- url: '/order/order/' + id,
- method: 'delete'
- })
+ url: "/order/order/" + id,
+ method: "delete",
+ });
}
// 获取订单总金额
export function totalData(query) {
return request({
- url: '/order/order/totalData',
- method: 'get',
- params: query
- })
+ url: "/order/order/totalData",
+ method: "get",
+ params: query,
+ });
}
export function manualSettlementOrder(data) {
return request({
- url: '/order/manualSettlementOrder',
- method: 'post',
- data: data
- })
+ url: "/order/manualSettlementOrder",
+ method: "post",
+ data: data,
+ });
}
// 获取运营商订单列表
export function getMerchantOrderList(data) {
- return request({
- url: '/order/getMerchantOrderList',
- method: 'post',
- data: data
- })
+ return request({
+ url: "/order/getMerchantOrderList",
+ method: "post",
+ data: data,
+ });
}
// 试订单退款接口
export function retryRefundOrder(data) {
return request({
- url: '/order/retryRefundOrder',
- method: 'post',
- data: data
- })
+ url: "/order/retryRefundOrder",
+ method: "post",
+ data: data,
+ });
+}
+// 获取营收报表当前日期的订单详情
+export function getOrderReportDetail(data) {
+ return request({
+ url: "/order/report/getStationOrderReportDetail",
+ method: "post",
+ data,
+ });
}
diff --git a/jsowell-ui/src/views/pile/merchant/components/revenue.vue b/jsowell-ui/src/views/pile/merchant/components/revenue.vue
index 94dee1ac6..990744f83 100644
--- a/jsowell-ui/src/views/pile/merchant/components/revenue.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/revenue.vue
@@ -98,39 +98,27 @@
- 站点id：{{ getOrderId }} --- 交易日期：{{ getOrderTradeDate }}
-
-
-
-
+
+
+
+
+
+ {{
+ scope.row.clearingStatus === "0" ? "未清分" : "已清分"
+ }}
+
+
+
+
+
-
-