From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js
index 2ea181e..3784635 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js
@@ -1,5 +1,5 @@
/**
- * 旅游包车订单管理初始化
+ * 包车订单管理初始化
*/
var TOrderCharteredCar = {
id: "TOrderCharteredCarTable", //表格id
@@ -26,15 +26,15 @@
}
},
{title: '用户ID', field: 'userId', visible: false, align: 'center', valign: 'middle', width:'200px'},
- {title: '提交用户', field: 'userName', visible: true, align: 'center', valign: 'middle', width:'200px',
+ {title: '所选服务', field: 'serviceName', visible: true, align: 'center', valign: 'middle', width:'200px',
formatter: function (value, row) {
var btn = "";
if(row.userName != '' && row.userName != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.userName + '" onfocus="TUser.tooltip()">' + row.userName + '</p>']
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.serviceName + '" onfocus="TUser.tooltip()">' + row.serviceName + '</p>']
}
return btn;
}
- },
+ }, {title: '服务价格', field: 'price', visible: true, align: 'center', valign: 'middle', width:'200px'},
{title: '用车时间', field: 'traveltime', visible: true, align: 'center', valign: 'middle', width:'200px',
formatter: function (value, row) {
if(typeof value != 'undefined'){
@@ -42,28 +42,38 @@
}
}
},
- {title: '用车时长【天】', field: 'carTime', visible: true, align: 'center', valign: 'middle', width:'200px',
+ {title: '用车时长', field: 'carTime', visible: true, align: 'center', valign: 'middle', width:'200px',
formatter: function (value, row) {
var btn = "";
if(row.carTime != '' && row.carTime != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.carTime + '" onfocus="TUser.tooltip()">' + row.carTime + '</p>']
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.carTime + '" onfocus="TUser.tooltip()">' + row.carTime + '</p>天']
}
return btn;
}
},
- {title: '用车类型', field: 'serverCarModel', visible: true, align: 'center', valign: 'middle', width:'200px'},
- {title: '用车需求', field: 'modelUse', visible: true, align: 'center', valign: 'middle', width:'200px',
- formatter: function (value, row) {
- var btn = "";
- if(row.modelUse != '' && row.modelUse != null) {
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.modelUse + '" onfocus="TUser.tooltip()">' + row.modelUse + '</p>']
- }
- return btn;
- }
- },
- {title: '乘车人数', field: 'peopleNumber', visible: true, align: 'center', valign: 'middle', width:'200px'},
- {title: '价格区间', field: 'price', visible: true, align: 'center', valign: 'middle', width:'200px'},
- {title: '联系人', field: 'contactPerson', visible: true, align: 'center', valign: 'middle', width:'200px',
+ // {title: '乘车人', field: 'userName', visible: true, align: 'center', valign: 'middle', width:'200px',
+ // formatter: function (value, row) {
+ // var btn = "";
+ // if(row.userName != '' && row.userName != null) {
+ // btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.userName + '" onfocus="TUser.tooltip()">' + row.userName + '</p>']
+ // }
+ // return btn;
+ // }
+ // },
+
+ // {title: '用车类型', field: 'serverCarModel', visible: true, align: 'center', valign: 'middle', width:'200px'},
+ // {title: '用车需求', field: 'modelUse', visible: true, align: 'center', valign: 'middle', width:'200px',
+ // formatter: function (value, row) {
+ // var btn = "";
+ // if(row.modelUse != '' && row.modelUse != null) {
+ // btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.modelUse + '" onfocus="TUser.tooltip()">' + row.modelUse + '</p>']
+ // }
+ // return btn;
+ // }
+ // },
+ // {title: '乘车人数', field: 'peopleNumber', visible: true, align: 'center', valign: 'middle', width:'200px'},
+
+ {title: '乘车人', field: 'contactPerson', visible: true, align: 'center', valign: 'middle', width:'200px',
formatter: function (value, row) {
var btn = "";
if(row.contactPerson != '' && row.contactPerson != null) {
@@ -77,6 +87,19 @@
var btn = "";
if(row.contactPhone != '' && row.contactPhone != null) {
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.contactPhone + '" onfocus="TUser.tooltip()">' + row.contactPhone + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '备注', field: 'newRemark', visible: true, align: 'center', valign: 'middle', width:'300px',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.remark != '' && row.remark != null) {
+ var str = row.newRemark;
+ // if (str.length > 20){
+ // str = str.substring(0,20)+'...<br><button class="btn btn-outline btn-primary" onclick="TOrderCharter.buttonClick(' + row.id + ')">查看更多</button>';
+ // }
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.newRemark + '" onfocus="TUser.tooltip()">' + str + '</p>']
}
return btn;
}
@@ -127,7 +150,7 @@
};
/**
- * 删除旅游包车订单
+ * 删除包车订单
*/
TOrderCharteredCar.delete = function () {
if (this.check()) {
@@ -185,7 +208,7 @@
};
/**
- * 查询旅游包车订单列表
+ * 查询包车订单列表
*/
TOrderCharteredCar.search = function () {
var queryData = {};
--
Gitblit v1.7.1