From 615991ba24e3c646900000734954659fc1a2531c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 24 六月 2025 15:38:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
index d811cfa..e391545 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
@@ -96,8 +96,63 @@
return btn;
}
},
+ {title: '今日接单', field: 'dayReceivingOrders', visible: true, align: 'center', valign: 'middle',width:'9%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.dayReceivingOrders != '' && row.dayReceivingOrders != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.dayReceivingOrders + '" onfocus="TUser.tooltip()">' + row.dayReceivingOrders + '</p>']
+ }else{
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '累计接单', field: 'sumReceivingOrders', visible: true, align: 'center', valign: 'middle',width:'9%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.sumReceivingOrders != '' && row.sumReceivingOrders != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.sumReceivingOrders + '" onfocus="TUser.tooltip()">' + row.sumReceivingOrders + '</p>']
+ }else{
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '当天收入', field: 'dayIncome', visible: true, align: 'center', valign: 'middle',width:'9%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.dayIncome != '' && row.dayIncome != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.dayIncome + '" onfocus="TUser.tooltip()">' + row.dayIncome + '</p>']
+ }else{
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '共计收入', field: 'sumIncome', visible: true, align: 'center', valign: 'middle',width:'9%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.sumIncome != '' && row.sumIncome != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.sumIncome + '" onfocus="TUser.tooltip()">' + row.sumIncome + '</p>']
+ }else{
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="-" onfocus="TUser.tooltip()">-</p>']
+ }
+ return btn;
+ }
+ },
{title: '评分', field: 'fraction', visible: true, align: 'center', valign: 'middle',width:'8%'},
-
+ {title: '邀请次数', field: 'inviteNumber', visible: true, align: 'center', valign: 'middle',width:'5%',
+ formatter: function (value, row) {
+ var temp = row.id
+ var btn = "";
+ if(row.inviteNumber != '' && row.inviteNumber != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color: #00b7ee" title="' + row.inviteNumber + '" onfocus="TUser.tooltip()" onclick="YesDriver.inviteList('+temp+')">' + row.inviteNumber + '</p>']
+ }else {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color: #00b7ee" title="0" onfocus="TUser.tooltip()" onclick="YesDriver.inviteList('+temp+')">0</p>']
+ }
+ return btn;
+ }
+ },
{title: '历史<br/>接单数', field: 'historyNum', visible: true, align: 'center', valign: 'middle',width:'7%',
formatter: function (value, row) {
var btn = "";
@@ -129,7 +184,17 @@
}
];
};
-
+YesDriver.inviteList = function (id) {
+ var index = layer.open({
+ type: 2,
+ title: '邀请明细',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tDriver/invite/'+ id
+ });
+ this.layerIndex = index;
+};
/**
* 余额修改
*/
--
Gitblit v1.7.1