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/classRecord2.js | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js
index fd03170..f214101 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js
@@ -14,7 +14,7 @@
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',
@@ -59,7 +59,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 '未上传';
@@ -191,6 +191,7 @@
, yes: function () {
let courseId = $('#courseId').val();
let integral = $('#integral').val();
+ let packId = $('#id').val();
if(null == courseId || '' == courseId){
Feng.error("请选择有效的课程");
return
@@ -212,6 +213,7 @@
});
ajax.set("id", ClassRecord.seItem.id);
ajax.set("courseId", courseId);
+ ajax.set("packId", packId);
ajax.set("integral", integral);
ajax.start();
},
@@ -280,10 +282,10 @@
Feng.error("请上传凭证图片");
return
}
- if(null == deductClassHour || '' == deductClassHour){
- Feng.error("请输入有效的扣除课时数");
- return
- }
+ // if(null == deductClassHour || '' == deductClassHour){
+ // Feng.error("请输入有效的扣除课时数");
+ // return
+ // }
let div_array = $('#cancelClasses').find('div');
let str = '';
for (let i = 0; i < div_array.length; i++) {
--
Gitblit v1.7.1