From 016ddc332273c36e437a6f3b5f0a25574d5b7b78 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 05 九月 2025 09:12:43 +0800
Subject: [PATCH] bug修改
---
ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/report/tDriverIncomeTable.js | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/report/tDriverIncomeTable.js b/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/report/tDriverIncomeTable.js
index ac4007a..2b85615 100644
--- a/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/report/tDriverIncomeTable.js
+++ b/ManagementZYTravel/guns-admin/src/main/webapp/static/modular/system/report/tDriverIncomeTable.js
@@ -17,22 +17,11 @@
{title: '姓名', field: 'driverName', visible: true, align: 'center', valign: 'middle',width:'100px'},
{title: '账号/手机号', field: 'driverPhone', visible: true, align: 'center', valign: 'middle',width:'100px'},
{title: '所属分公司', field: 'companyName', visible: true, align: 'center', valign: 'middle',width:'100px'},
- {title: '订单总数', field: 'privateCarTotalNum', visible: true,sortable : true, align: 'center', valign: 'middle',width:'100px'},
- {title: '未支付订单数', field: 'privateCarNotPayNum', visible: true,sortable : true, align: 'center', valign: 'middle',width:'100px'},
- {title: '取消订单数', field: 'privateCarcancelNum', visible: true,sortable : true, align: 'center', valign: 'middle',width:'100px'},
+ {title: '已完成订单数', field: 'privateCarTotalNum', visible: true,sortable : true, align: 'center', valign: 'middle',width:'100px'},
{title: '订单总金额', field: 'privateCarTotalMoney', visible: true,sortable : true, align: 'center', valign: 'middle',width:'100px'},
- {title: '未支付订金额', field: 'privateCarNotPayMoney', visible: true,sortable : true, align: 'center', valign: 'middle',width:'100px'},
- {title: '运营状态', field: 'driverState', visible: true, align: 'center', valign: 'middle',width:'100px',formatter: function (value,row) {
- if(row.driverState=='3'){
- return '<span class="label label-primary">服务中</span>';
- }else if(row.driverState=='2'){
- return '<span class="label label-warning">听单中</span>';
- }else if(row.driverState=='1'){
- return '<span class="label label-error">离线</span>';
- }else{
- return ''
- }
- }},
+ {title: '实付金额', field: 'payMoney', visible: true,sortable : true, align: 'center', valign: 'middle',width:'100px'},
+ {title: '司机收入', field: 'driverMoney', visible: true,sortable : true, align: 'center', valign: 'middle',width:'100px'},
+ {title: '平台手续费', field: 'platformMoney', visible: true,sortable : true, align: 'center', valign: 'middle',width:'100px'},
]
};
@@ -42,15 +31,28 @@
* 查询车辆品牌管理列表
*/
DriverIncomelData.search = function () {
+ // 统计
+ var ajax = new $ax(Feng.ctxPath + "/report/queryDriverIncomeDataSum", function (data) {
+ // 将金额设置进label文本
+ $("#totalOrderCount").text(data.totalOrderCount);
+ $("#totalPayMoney").text(data.totalPayMoney);
+ $("#totalIncome").text(data.totalIncome);
+ $("#totalPlatformMoney").text(data.totalPlatformMoney);
+ }, function (data) {
+ });
+ ajax.set("driverName",$("#driverName").val());
+ ajax.set("time",$("#time").val());
+ ajax.set("companyId",$("#company").val());
+ ajax.start();
var queryData = {};
- queryData['type'] = $("#type").val();
+ queryData['driverName'] = $("#driverName").val();
queryData['time'] = $("#time").val();
queryData['companyId'] = $("#company").val();
DriverIncomelData.table.refresh({query: queryData});
};
DriverIncomelData.resetSearch = function () {
- $("#type").val("1");
+ $("#driverName").val("");
$("#time").val("");
$("#company").val("");
DriverIncomelData.search();
@@ -72,5 +74,19 @@
type: 1,
time: rangeDate
})
+ console.log("统计统计统计统计统计统计统计")
+ // 统计
+ var ajax = new $ax(Feng.ctxPath + "/report/queryDriverIncomeDataSum", function (data) {
+ // 将金额设置进label文本
+ $("#totalOrderCount").text(data.totalOrderCount);
+ $("#totalPayMoney").text(data.totalPayMoney);
+ $("#totalIncome").text(data.totalIncome);
+ $("#totalPlatformMoney").text(data.totalPlatformMoney);
+ }, function (data) {
+ });
+ ajax.set("driverName",$("#driverName").val());
+ ajax.set("time",$("#time").val());
+ ajax.set("companyId",$("#company").val());
+ ajax.start();
DriverIncomelData.table = table.init();
});
--
Gitblit v1.7.1