Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-17 40bc5a67fe0fa6a01711b7b7a12e38a6272510a8

 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) {