From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
index 6b48130..5e091dc 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js
@@ -169,9 +169,12 @@
},
{title: '订单金额', field: 'orderMoney', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
- var btn = "";
+ var btn = "0";
if(row.orderMoney != '' && row.orderMoney != null) {
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.orderMoney + '" onfocus="TUser.tooltip()">' + row.orderMoney + '</p>']
+ }
+ if(row.state == 10 && row.cancel_money != null){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.cancel_money + '" onfocus="TUser.tooltip()">' + row.cancel_money + '</p>']
}
return btn;
}
@@ -339,10 +342,7 @@
}
TOrderPrivateCar.frozenOrder = function(){
if (this.check()) {
- if (TOrderPrivateCar.seItem.state != 8 && TOrderPrivateCar.seItem.state != 9 ) {
- swal("操作失败", "【已完成】状态下才能执行此操作", "warning");
- return;
- }else{
+ if (TOrderPrivateCar.seItem.isFrozen == 2){
var ajax = new $ax(Feng.ctxPath + "/tOrderPrivateCar/frozenOrder", function (data) {
swal("操作订单成功", "您已经成功操作了。", "success");
TOrderPrivateCar.table.refresh();
@@ -353,8 +353,26 @@
});
ajax.set("tOrderPrivateCarId", TOrderPrivateCar.seItem.id);
ajax.start();
+ }else{
+ if (TOrderPrivateCar.seItem.state != 5 ) {
+ swal("操作失败", "【服务中】状态下才能执行此操作", "warning");
+ return;
+ }else{
+ var ajax = new $ax(Feng.ctxPath + "/tOrderPrivateCar/frozenOrder", function (data) {
+ swal("操作订单成功", "您已经成功操作了。", "success");
+ TOrderPrivateCar.table.refresh();
+ layer.closeAll()
+ }, function (data) {
+ swal("操作订单失败", data.responseJSON.message + "！", "warning");
+ layer.closeAll()
+ });
+ ajax.set("tOrderPrivateCarId", TOrderPrivateCar.seItem.id);
+ ajax.start();
+ }
}
+
+
}
}
/**
--
Gitblit v1.7.1