From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 fe7937e..4d4f177 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,12 +14,18 @@
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: '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.absencesNumber === undefined) {
+ if (row.cancelClasses === undefined) {
return 0;
} else {
return v;
@@ -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;
@@ -59,7 +65,7 @@
}
},
{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") {
return '未上传';
@@ -241,8 +247,21 @@
ClassRecord.cancellationRecord = function(i){
if(this.check()){
- let htmlStr =
+ 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 htmlStr =
'<div class="form-horizontal">' +
' <div class="col-sm-11" style="padding: 20px;">' +
' <div class="form-group">\n' +
@@ -291,7 +310,7 @@
}
let div_array = $('#cancelClasses').find('div');
let str = '';
- for (let i = 0; i < div_array.length; i++) {
+ for (let i = 1; i < div_array.length; i++) {
let v = $($(div_array[i]).find('img')[0]).attr('src');
str += v + ";";
}
@@ -300,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