From 387f61d55a8e20bc772b026cba4f8c34dfce5665 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 二月 2024 11:20:28 +0800
Subject: [PATCH] 更新代码

---
 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js |   74 +++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
index 95dcd3a..8c82820 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js
@@ -25,11 +25,20 @@
                 return btn;
             }
         },
-        {title: '司机姓名', field: 'name', visible: true, align: 'center', valign: 'middle',
+        {title: '司机姓', field: 'lastName', visible: true, align: 'center', valign: 'middle',
             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) {
+                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.lastName + '" onfocus="TUser.tooltip()">' + row.lastName + '</p>']
+                }
+                return btn;
+            }
+        },
+        {title: '司机名', field: 'firstName', visible: true, align: 'center', valign: 'middle',
+            formatter: function (value, row) {
+                var btn = "";
+                if(row.firstName != '' && row.firstName != null) {
+                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.firstName + '" onfocus="TUser.tooltip()">' + row.firstName + '</p>']
                 }
                 return btn;
             }
@@ -93,19 +102,28 @@
                 return btn;
             }
         },
-        {title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle',
+        {title: '手机号运营商', field: 'phoneOperator', visible: true, align: 'center', valign: 'middle',width:'5%',
             formatter: function (value, row) {
                 var btn = "";
-                if(row.sex != '' && row.sex != null) {
-                    if (row.sex == 1) {
-                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="男" onfocus="TUser.tooltip()">男</p>']
-                    }else if (row.sex == 2){
-                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="女" onfocus="TUser.tooltip()">女</p>']
-                    }
+                if(row.phoneOperator != '' && row.phoneOperator != null) {
+                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.phoneOperator + '" onfocus="TUser.tooltip()">' + row.phoneOperator + '</p>']
                 }
                 return btn;
             }
         },
+        // {title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle',
+        //     formatter: function (value, row) {
+        //         var btn = "";
+        //         if(row.sex != '' && row.sex != null) {
+        //             if (row.sex == 1) {
+        //                 btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="男" onfocus="TUser.tooltip()">男</p>']
+        //             }else if (row.sex == 2){
+        //                 btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="女" onfocus="TUser.tooltip()">女</p>']
+        //             }
+        //         }
+        //         return btn;
+        //     }
+        // },
         {title: '出生日期', field: 'birthday', visible: true, align: 'center', valign: 'middle',width:'3%',
             formatter: function (value, row) {
                 var btn = "";
@@ -117,15 +135,15 @@
                 return btn;
             }
         },
-        {title: '驾驶证号码', field: 'driveCard', visible: true, align: 'center', valign: 'middle',
-            formatter: function (value, row) {
-                var btn = "";
-                if(row.driveCard != '' && row.driveCard != null) {
-                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.driveCard + '" onfocus="TUser.tooltip()">' + row.driveCard + '</p>']
-                }
-                return btn;
-            }
-        },
+        // {title: '驾驶证号码', field: 'driveCard', visible: true, align: 'center', valign: 'middle',
+        //     formatter: function (value, row) {
+        //         var btn = "";
+        //         if(row.driveCard != '' && row.driveCard != null) {
+        //             btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.driveCard + '" onfocus="TUser.tooltip()">' + row.driveCard + '</p>']
+        //         }
+        //         return btn;
+        //     }
+        // },
         {title: '驾龄', field: 'driverAge', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row) {
                 var btn = "";
@@ -137,15 +155,15 @@
                 return btn;
             }
         },
-        {title: '身份证号码', field: 'idCard', visible: true, align: 'center', valign: 'middle',
-            formatter: function (value, row) {
-                var btn = "";
-                if(row.idCard != '' && row.idCard != null) {
-                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.idCard + '" onfocus="TUser.tooltip()">' + row.idCard + '</p>']
-                }
-                return btn;
-            }
-        },
+        // {title: '身份证号码', field: 'idCard', visible: true, align: 'center', valign: 'middle',
+        //     formatter: function (value, row) {
+        //         var btn = "";
+        //         if(row.idCard != '' && row.idCard != null) {
+        //             btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.idCard + '" onfocus="TUser.tooltip()">' + row.idCard + '</p>']
+        //         }
+        //         return btn;
+        //     }
+        // },
         {title: '服务模式', field: 'serverStr', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row) {
                 var btn = "";

--
Gitblit v1.7.1