From 40bc5a67fe0fa6a01711b7b7a12e38a6272510a8 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 17 七月 2024 15:20:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js | 4 ++-- 1 files changed, 2 insertions(+), 2 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..df5ad1e 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 @@ -339,8 +339,8 @@ } TOrderPrivateCar.frozenOrder = function(){ if (this.check()) { - if (TOrderPrivateCar.seItem.state != 8 && TOrderPrivateCar.seItem.state != 9 ) { - swal("操作失败", "【已完成】状态下才能执行此操作", "warning"); + if (TOrderPrivateCar.seItem.state != 5 ) { + swal("操作失败", "【服务中】状态下才能执行此操作", "warning"); return; }else{ var ajax = new $ax(Feng.ctxPath + "/tOrderPrivateCar/frozenOrder", function (data) { -- Gitblit v1.7.1