From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js
index f3dfaa7..c2d777f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js
@@ -14,16 +14,32 @@
ClassRecord.initColumn = function () {
let columns = [
{field: 'selectItem', radio: true},
- {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '日期', field: 'classDate', align: 'center', valign: 'middle'},
- {title: '报名学员', field: 'registered', align: 'center', valign: 'middle'},
- {title: '实到学员', field: 'actualArrival', align: 'center', valign: 'middle'},
- {title: '未到学员', field: 'nonArrival', align: 'center', valign: 'middle'},
+ {title: '请假学员', field: 'registered', align: 'center', valign: 'middle'},
+ {title: '实到学员', field: 'actualArrival', align: 'center', valign: 'middle',
+ formatter: function (v, row) {
+ if (row.cancelClasses === undefined) {
+ return 0;
+ } else {
+ return v;
+ }
+ }
+ },
+ {title: '未到学员', field: 'nonArrival', align: 'center', valign: 'middle',
+ formatter: function (v, row) {
+ if (row.absencesNumber === undefined) {
+ return 0;
+ } else {
+ return v;
+ }
+ }
+ },
{title: '课后练习', field: 'courseId', align: 'center', valign: 'middle',
formatter: function (v) {
- if(typeof v == "undefined"){
+ if (typeof v === "undefined") {
return '未布置';
- }else{
+ } else {
return '已布置';
}
}
@@ -43,11 +59,11 @@
}
},
{title: '扣除课时', field: 'deductClassHour', align: 'center', valign: 'middle'},
- {title: '取消记录', field: 'absencesNumber', align: 'center', valign: 'middle',
+ {title: '消课凭证', field: 'cancelClasses', align: 'center', valign: 'middle',
formatter: function (v) {
- if(typeof v == "undefined"){
+ if (typeof v === "undefined") {
return '未上传';
- }else{
+ } else {
return '已上传';
}
}
@@ -223,10 +239,30 @@
};
-ClassRecord.cancellationRecord = function(){
+ClassRecord.cancellationRecord = function(i){
if(this.check()){
+ console.log("看看时间")
+ console.log( ClassRecord.seItem.classDate
+ )
+ var timeString = ClassRecord.seItem.classDate;
+ var parts = timeString.split(' '); // 以空格分割字符串
+ var datePart = parts[0]; // 获取日期部分
+ var endTime = parts[1].split('-')[1]; // 获取时间段的结束时间
+ var res=datePart+" "+endTime;
+ console.log("最终结果");
+ console.log(res);
+ // 获取当前时间
+ let now = new Date();
+// 将指定时间转换为 Date 对象
+ let specifiedTime = new Date(res);
+ // 比较当前时间是否大于指定时间
+ if (now > specifiedTime) {
+ console.log("当前时间大于指定时间");
+ Feng.error("当前课程还未结束，不能上传消课记录")
+ return
+ }
let htmlStr =
- '<div class="form-horizontal">' +
+ '<div class="form-horizontal">' +
' <div class="col-sm-11" style="padding: 20px;">' +
' <div class="form-group">\n' +
' <label class="col-sm-2"></label>'+
@@ -247,7 +283,7 @@
' <div class="form-group">\n' +
' <label class="col-sm-2"></label>'+
' <label class="control-label" style="text-align: left;">扣除课时数：</label>\n' +
- ' <input id="deductClassHour" type="number" min="0" style="background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;">' +
+ ' <input id="deductClassHour" value="'+i+'" type="number" min="0" style="background-color: #FFFFFF;background-image: none;border: 1px solid #e5e6e7;border-radius: 1px;color: inherit;padding: 6px 12px;">' +
' </div>' +
' </div>' +
'</div>';
@@ -283,7 +319,7 @@
if(res.code == 200){
Feng.success("保存成功!");
layer.closeAll();
- RegistrationRecord.table.refresh();
+ ClassRecord.table.refresh();
}else{
Feng.error(res.msg);
}
--
Gitblit v1.7.1