From 6a90f2d1feaf583c211d5f9fe95dff7f7c748ed3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 17:42:20 +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/tServerCarmodel/tServerCarmodel.js | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js
index 353db6c..9215e90 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js
@@ -25,11 +25,29 @@
return btn;
}
},
- {title: '车型名称', field: 'name', visible: true, align: 'center', valign: 'middle',
+ {title: '车型名称（中文）', field: 'chineseName', 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.chineseName != '' && row.chineseName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.chineseName + '" onfocus="TUser.tooltip()">' + row.chineseName + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '车型名称（英文）', field: 'englishName', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.englishName != '' && row.englishName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.englishName + '" onfocus="TUser.tooltip()">' + row.englishName + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '车型名称（法文）', field: 'frenchName', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.frenchName != '' && row.frenchName != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.frenchName + '" onfocus="TUser.tooltip()">' + row.frenchName + '</p>']
}
return btn;
}
--
Gitblit v1.7.1