From 8c1cf98149c48f3ccc6db8574d6bdb76ff541772 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 04 七月 2025 15:25:24 +0800
Subject: [PATCH] bug修改
---
ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/financialStatement/paymentOrderStatistics/paymentOrderStatistics.js | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 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 119c0f3..b05f9ad 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'},
@@ -26,7 +35,7 @@
{title: '支付时间', field: 'paymentTime', visible: true, align: 'center', valign: 'middle'},
{title: '操作', field: 'id', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
- return '<a onclick="PaymentOrderStatistics.openPaymentOrderStatisticsDetail(' + value + ')" style="color: blue;">订单详情</a>';
+ return '<a onclick="PaymentOrderStatistics.openPaymentOrderStatisticsDetail(' + value + ','+row.orderType+')" style="color: blue;">订单详情</a>';
}
}
];
@@ -65,16 +74,30 @@
/**
* 打开查看详情
*/
-PaymentOrderStatistics.openPaymentOrderStatisticsDetail = function (id) {
- var index = layer.open({
- type: 2,
- title: '出租车订单详情',
- area: ['100%', '100%'], //宽高
- fix: false, //不固定
- maxmin: true,
- content: Feng.ctxPath + '/tOrderTaxi/tOrderTaxi_update/' + TOrderTaxi.seItem.id
- });
- this.layerIndex = index;
+PaymentOrderStatistics.openPaymentOrderStatisticsDetail = function (id, orderType) {
+ console.log("dahgbhjbsubcjksnb"+id);
+ console.log("dahgbhjbsubcjksnb"+orderType);
+ if(orderType==2){
+ var index = layer.open({
+ type: 2,
+ title: '出租车订单详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tOrderTaxi/tOrderTaxi_update/' + id
+ });
+ this.layerIndex = index;
+ }else {
+ var index = layer.open({
+ type: 2,
+ title: '跨城出行订单详情',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tOrderCrossCity/tOrderCrossCity_update/' + id
+ });
+ this.layerIndex = index;
+ }
};
@@ -85,8 +108,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 +126,7 @@
queryData['driverPhone'] = $("#driverPhone").val();
queryData['createTime'] = $("#createTime").val();
queryData['paymentTime'] = $("#paymentTime").val();
+ queryData['orderType'] = $("#orderType").val();
PaymentOrderStatistics.table.refresh({query: queryData});
};
@@ -113,6 +138,7 @@
$("#driverPhone").val("");
$("#createTime").val("");
$("#paymentTime").val("");
+ $("#orderType").val("");
PaymentOrderStatistics.search();
};
--
Gitblit v1.7.1