From d9f1e1a3f50729de8594cd6e1278afa2f6ebf983 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 28 十一月 2023 20:34:21 +0800
Subject: [PATCH] 合并diamagnetic
---
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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 311de10..429e960 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
@@ -16,7 +16,13 @@
{field: 'selectItem', radio: true},
{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: 'registered', align: 'center', valign: 'middle',formatter: function (v, row) {
+ if (row.cancelClasses === undefined) {
+ return 0;
+ } else {
+ return v;
+ }
+ }},
{title: '实到学员', field: 'actualArrival', align: 'center', valign: 'middle',
formatter: function (v, row) {
if (row.cancelClasses === undefined) {
@@ -28,7 +34,7 @@
},
{title: '未到学员', field: 'nonArrival', align: 'center', valign: 'middle',
formatter: function (v, row) {
- if (row.absencesNumber === undefined) {
+ if (row.cancelClasses === undefined) {
return 0;
} else {
return v;
@@ -241,8 +247,27 @@
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="col-sm-11" style="padding: 20px;">' +
' <div class="form-group">\n' +
--
Gitblit v1.7.1