From e345b36025818615eb68d37819eaff312d1fb986 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 12:51:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.js | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.js b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.js
index 1b5542c..2d10f43 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.js
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.js
@@ -17,6 +17,15 @@
{title: '', field: 'id', visible: false, align: 'center', valign: 'middle'},
{title: '支付流水号', field: 'paymentCode', visible: true, align: 'center', valign: 'middle'},
{title: '订单号', field: 'orderNum', visible: true, align: 'center', valign: 'middle'},
+ {title: '订单类型', field: 'orderType', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if(row.orderType == 2) {
+ return '出租车订单';
+ } else {
+ return '跨城出行订单';
+ }
+ }
+ },
{title: '支付用户手机号', field: 'userPhone', visible: true, align: 'center', valign: 'middle'},
{title: '支付金额', field: 'amount', visible: true, align: 'center', valign: 'middle'},
{title: '接单司机手机号', field: 'driverPhone', visible: true, align: 'center', valign: 'middle'},
@@ -85,8 +94,9 @@
let driverPhone = $("#driverPhone").val();
let createTime = $("#createTime").val();
let paymentTime = $("#paymentTime").val();
+ let orderType = $("#orderType").val();
window.location.href = Feng.ctxPath + '/financialStatement/paymentOrderStatisticsList_export?paymentCode=' + paymentCode + "&orderCode=" + orderCode +
- "&userPhone=" + userPhone + "&driverPhone=" + driverPhone + "&createTime=" + createTime + "&paymentTime=" + paymentTime
+ "&userPhone=" + userPhone + "&driverPhone=" + driverPhone + "&createTime=" + createTime + "&paymentTime=" + paymentTime + "&orderType=" + orderType
}
@@ -102,6 +112,7 @@
queryData['driverPhone'] = $("#driverPhone").val();
queryData['createTime'] = $("#createTime").val();
queryData['paymentTime'] = $("#paymentTime").val();
+ queryData['orderType'] = $("#orderType").val();
PaymentOrderStatistics.table.refresh({query: queryData});
};
@@ -113,6 +124,7 @@
$("#driverPhone").val("");
$("#createTime").val("");
$("#paymentTime").val("");
+ $("#orderType").val("");
PaymentOrderStatistics.search();
};
--
Gitblit v1.7.1