From 009f795a6e93cbb94e4a316e0efa8cb7124743f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js
index b9e17bb..e5d4041 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js
@@ -18,8 +18,8 @@
{title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'15%',
formatter: function (value, row) {
var btn = "";
- if(row.name != '' && row.name != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>']
+ if(row.lastName != '' && row.lastName != null && row.firstName != '' && row.firstName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.firstName + ' ' + row.lastName + '" onfocus="TUser.tooltip()">' + row.firstName + ' ' + row.lastName + '</p>']
}
return btn;
}
--
Gitblit v1.7.1