Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 f0753e3b608ba47deaaf4619924bb8765003fd1d

 cloud-server-management/src/main/webapp/static/modular/system/coursePackage/coursePackageStudent.js

@@ -42,16 +42,7 @@
                    }
                }
            }
        },
        {title: '预定状态', field: 'reservationStatus', align: 'center', valign: 'middle',hidden:true,
            formatter: function (v) {
                if (v == 0) {
                    return '已取消';
                } else {
                    return '正常';
                }
            }
        },
        }
    ];
    return columns;
};
@@ -75,6 +66,10 @@

/**
 * 取消预约
 * if(CoursePackageStudent.seItem.signInOrNot == 1){
            Feng.error("不能取消预约操作");
            return
        }
 */
CoursePackageStudent.cancelReservation = function () {
    if (this.check()) {
@@ -82,25 +77,22 @@
            Feng.error("不能重复操作");
            return
        }
        if(CoursePackageStudent.seItem.signInOrNot == 1){
            Feng.error("不能取消预约操作");
            return
        }

        let operation = function(){
            let ajax = new $ax(Feng.ctxPath + "/coursePackage/cancelReservation", function (res) {
                if(res.code == 200){
                    Feng.success("取消成功!");
                    Feng.success("请假成功!");
                    CoursePackageStudent.table.refresh();
                }else{
                    Feng.error(res.msg);
                }
            }, function (data) {
                Feng.error("取消失败!" + data.responseJSON.message + "!");
                Feng.error("请假失败!" + data.responseJSON.message + "!");
            });
            ajax.set("id", CoursePackageStudent.seItem.id);
            ajax.start();
        };
        Feng.confirm("是否取消预约",operation);
        Feng.confirm("是否请假",operation);
    }
};

@@ -112,7 +104,7 @@
            return
        }
        if(CoursePackageStudent.seItem.reservationStatus == 0){
            Feng.error("该数据已取消预约");
            Feng.error("当前学员已请假");
            return
        }
        let operation = function(){