diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
index 8bfb59c4..37ca2f24 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
@@ -8,7 +8,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
var kkJieciTableData = [],
classSelectData = [],
sessionTagList = [];
- window.classist = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionClass/levelList.json').data;
+ window.classList = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionClass/levelList.json').data;
var teacherOpenCourseScheduleSessionId = $("input[name='teacherOpenCourseScheduleSessionId']").val();//排课id
var classData = Common.getAjax('/jlw/schoolClass/getValues.json').data;//上课班级多选框data
classData.forEach(function (item, index) {
@@ -44,20 +44,38 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
$("input:checkbox[value='"+value+"']").attr('checked','true');
})
}
- var kkJieciTableValue = $('#kkJieciTable').data('value');
- if (!$.isEmpty(kkJieciTableValue)) {
- //kkJieciTableData
- console.log(kkJieciTableValue)
- console.log(Object.values(kkJieciTableValue))
-
- }
- form.render();//刷新表单
-
kkJieciTableData = Common.getAjax('/jlw/teacherOpenCourseScheduleSessionTag/getValues.json').data;//开课节次数据表格
kkJieciTableData.forEach(function (item, index) {
//item.teacherOpenCourseScheduleSessionTagName = ;
item.teacherOpenCourseScheduleSessionClassId = '';
});
+ var kkJieciTableValue = $('#kkJieciTable').data('value');
+ if (!$.isEmpty(kkJieciTableValue)) {
+ if(Object.keys(kkJieciTableValue).length >1){
+ $("#moreRoom").attr('checked','true');
+ }else {
+ $("#oneRoom").attr('checked','true');
+ }
+ var data = Object.values(kkJieciTableValue);
+ kkJieciTableData.forEach(function (item,index){
+ data.forEach(function (t,i) {
+ t.forEach(function (e,key) {
+ if(item.teacherOpenCourseScheduleSessionTagName == e.teacherOpenCourseScheduleSessionTagName){
+ item.teacherOpenCourseScheduleSessionTagStartTime = e.teacherOpenCourseScheduleSessionTagStartTime;
+ item.teacherOpenCourseScheduleSessionTagEndTime = e.teacherOpenCourseScheduleSessionTagEndTime;
+ item.teacherOpenCourseScheduleSessionClassId = Object.keys(kkJieciTableValue)[i]
+ item.LAY_CHECKED = true;
+ }
+ });
+ });
+ });
+ if(Object.keys(kkJieciTableValue).length === 0){
+ merge(kkJieciTableData)
+ }
+ }else{
+ $("#oneRoom").attr('checked','true');
+ }
+ form.render();//刷新表单
/*开课节次数据表格渲染*/
var kkJieciTable = table.render({
@@ -66,8 +84,9 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
cellMinWidth: 100,*/
method: 'get',
data: kkJieciTableData
- , limit: 10000,
+ ,limit: 10000,
page: false
+ ,size:"lg"
, cols: [[
{
type: 'checkbox',
@@ -101,7 +120,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
]], done: function (res, curr, count) {
var value = $("input[name=teacherOpenCourseScheduleSessionClassIsMultiple]:checked").val();
if (value == 'false') {
- merge(res);
+ merge(res.data);
}
}
});
@@ -114,8 +133,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
});
/*合并列*/
- function merge(res) {
- var data = res.data;
+ function merge(data) {
var mergeIndex = 0; //定位需要添加合并属性的行数
var mark = 1; //每次需要合并的行数
var columsName = ['teacherOpenCourseScheduleSessionClassId']; //合并列名称
@@ -123,25 +141,16 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
for (var k = 0; k < columsName.length; k++) { //循环所有要合并的列
var trArr = $(".layui-table-body>.layui-table").find("tr");//所有行
-
- for (var i = 1; i < res.data.length; i++) { //循环表格数据
+ for (var i = 1; i < data.length; i++) { //循环表格数据
var tdCurArr = trArr.eq(i).find("td").eq(columsIndex[k]);//获取当前行的当前列
var tdPreArr = trArr.eq(mergeIndex).find("td").eq(columsIndex[k]);//获取相同列的第一列
- if (data[i][columsName[k]] === data[i - 1][columsName[k]]) { //后一行与前一行做比较，相同合并
- mark += 1;
- tdPreArr.each(function () {//相同列的第一列增加rowspan属性
- $(this).attr("rowspan", mark);
- });
- tdCurArr.each(function () {//当前行隐藏
- $(this).css("display", "none");
- });
- } else {
- mergeIndex = i;
- mark = 1;//一旦前后两行的值不一样了，那么需要合并的格子数mark就需要重新计算
- }
+ tdPreArr.each(function () {//相同列的第一列增加rowspan属性
+ $(this).attr("rowspan", data.length);
+ });
+ tdCurArr.each(function () {//当前行隐藏
+ $(this).css("display", "none");
+ });
}
- mergeIndex = 0;
- mark = 1;
}
};
@@ -398,6 +407,10 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
return;
}
if (Object.keys(sessionTagListMap).length <= 0) {
+ layer.msg('上课教室未选!!', {icon: 5});
+ return;
+ }
+ if (Object.values(sessionTagListMap).length <= 0) {
layer.msg('开课节次未选!!', {icon: 5});
return;
}
diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
index 385ce9fe..b2b7ca83 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
@@ -137,7 +137,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
return ;
}
var url = "/jlw/teacherOpenCourseScheduleSession/add.do?teacherOpenCourseScheduleSessionId="+data.teacherOpenCourseScheduleSessionId;
- Common.openDlg(url,"新增排课管理>"+data.teacherOpenCourseScheduleSessionId+">编辑");
+ Common.openDlg(url,"排课管理>编辑排课");
},
del: function () {
layui.use(['del'], function(){
@@ -165,7 +165,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
var data = obj.data;
if (obj.event === 'edit') {
var url = "/jlw/teacherOpenCourseScheduleSession/add.do?teacherOpenCourseScheduleSessionId="+data.teacherOpenCourseScheduleSessionId;
- Common.openDlg(url,"新增排课管理>"+data.teacherOpenCourseScheduleSessionId+">编辑");
+ Common.openDlg(url,"排课管理>编辑排课");
}else if(obj.event === "del"){
layer.confirm('是否确定删除该信息？', function (index) {
var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/delete.json",{ids:data.teacherOpenCourseScheduleSessionId});
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index cd3c93ee..9e6cd8e9 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -66,12 +66,10 @@
@@ -191,11 +190,11 @@