From 26079aa3c34f47e952a9538a93d6f8a3bab9a0fc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 09:12:44 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js
index 9d85720..f554d9c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.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