From 51e1b16fcef453674897b96df4466f3fb58b83f7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 28 九月 2025 18:03:38 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
index 2cfa38e..34198e7 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
@@ -173,9 +173,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;
}
@@ -196,12 +199,21 @@
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="服务中" onfocus="TUser.tooltip()">服务中</p>']
} else if (row.state == 6){
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="完成服务" onfocus="TUser.tooltip()">完成服务</p>']
- } else if (row.state == 7){
+ }else if (row.state == 8){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="待评价" onfocus="TUser.tooltip()">待评价</p>']
+ }
+ else if (row.state == 7){
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="待支付" onfocus="TUser.tooltip()">待支付</p>']
} else if (row.state == 9){
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="已完成" onfocus="TUser.tooltip()">已完成</p>']
} else if (row.state == 10){
btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="已取消" onfocus="TUser.tooltip()">已取消</p>']
+ } else if (row.state == 11){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="改派中" onfocus="TUser.tooltip()">改派中</p>']
+ } else if (row.state == 12){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="取消待支付" onfocus="TUser.tooltip()">取消待支付</p>']
+ } else if (row.state == 13){
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="补差价" onfocus="TUser.tooltip()">补差价</p>']
}
}
return btn;
@@ -252,7 +264,8 @@
} else {
nickname = "【" + nickname + "】";
}
- if (TOrderLogistics.seItem.state == 9 || TOrderLogistics.seItem.state == 10 ) {
+ if (TOrderLogistics.seItem.state == 6 || TOrderLogistics.seItem.state == 7 || TOrderLogistics.seItem.state == 8 ||
+ TOrderLogistics.seItem.state == 9 || TOrderLogistics.seItem.state == 10 ) {
swal("取消失败", "【已完成】【已取消】状态下不能执行此操作", "warning");
return;
}
--
Gitblit v1.7.1