From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
index 76482c7..af852c8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js
@@ -67,6 +67,17 @@
return btn;
}
},
+ {title: '出生日期', field: 'birthday', visible: true, align: 'center', valign: 'middle',width:'3%',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.birthday != '' && row.birthday != null) {
+ var birthday = row.birthday;
+ birthday = birthday.substring(0, birthday.indexOf(" "));
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + birthday + '" onfocus="TUser.tooltip()">' + birthday + '</p>']
+ }
+ return btn;
+ }
+ },
{title: '司机来源', field: 'addType', visible: true, align: 'center', valign: 'middle',width:'5%',
formatter: function (value, row) {
var btn = "";
@@ -149,13 +160,13 @@
return ''
}
}
- },
+ },/*
{title: '车队', field: 'teamId', visible: true, align: 'center', valign: 'middle',width:'15%',editable:{
type: 'select',
title: '车队',
source: YesDriver.teamList,
emptytext: "暂无车队"
- }},
+ }},*/
{title: '关联线路', field: 'lineStr', visible: true, align: 'center', valign: 'middle',width:'7%',
formatter: function (value, row) {
var btn = "";
--
Gitblit v1.7.1