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 782ced1c..da263a67 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
@@ -5,11 +5,11 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
laydate = layui.laydate,
table = layui.table,
index = layui.index;
- window.classist = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionClass/levelList.json').data;
- var teacherOpenCourseScheduleSessionId = $("input[name='teacherOpenCourseScheduleSessionId']").val();//排课id
var kkJieciTableData = [],
classSelectData = [],
sessionTagList = [];
+ window.classist = 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) {
classSelectData[index] = {name: item.className, value: item.classId, selected: false}
@@ -18,14 +18,13 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
var isMultipleSessionClass = function() {
return $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val()
};
-
var currentTableCache = function() {return table.cache['kkJieciTable']};
- var xmSeValue = $("#demo1").attr('value');
+ var xmSeValue = $("#demo1").data('value');
var xmSeInitValue = [];
if(!$.isEmpty(xmSeValue)){
xmSeValue.split(',').forEach(function (value) {
xmSeInitValue.push(parseInt(value))
- })
+ });
}
/*班级下拉多选*/
var demo1 = xmSelect.render({
@@ -37,22 +36,23 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
color: '#1e9fff',
},*/
});
- /*反显多选框*/
- var weekDetailValue = $("#weekDetail").val();
- if(!$.isEmpty(weekDetailValue)){
- weekDetailValue.split(',').forEach(function (value) {
+ /*反显开课星期*/
+ var weekDetail = $('#weekDetail').data('value');
+ if(!$.isEmpty(weekDetail)){
+ weekDetail.split(',').forEach(function (value) {
$("input:checkbox[value='"+value+"']").attr('checked','true');
})
}
+ if(!$.isEmpty(teacherOpenCourseScheduleSessionId)){
+ $('#kkJieciTable').data('value')
+ }
form.render();//刷新表单
+
kkJieciTableData = Common.getAjax('/jlw/teacherOpenCourseScheduleSessionTag/getValues.json').data;//开课节次数据表格
kkJieciTableData.forEach(function (item, index) {
+ //item.teacherOpenCourseScheduleSessionTagName = ;
item.teacherOpenCourseScheduleSessionClassId = '';
});
- if (!$.isEmpty(teacherOpenCourseScheduleSessionId)) {
- var dds = $("#kkJieciTable").attr('value')
- console.log(JSON.parse(dds))
- }
/*开课节次数据表格渲染*/
var kkJieciTable = table.render({
@@ -90,7 +90,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
title: '上课教室',
width: 200,
align: "center",
- templet: "#select_"
+ templet: "#select_classRoom"
},
]], done: function (res, curr, count) {
@@ -100,16 +100,12 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
}
}
});
- table.on('checkbox(kkJieciTable)', function (obj) {
- var checkStatus = table.checkStatus('kkJieciTable');
- sessionTagList = checkStatus.data;
- });
laydate.render({
- elem: '#teacherOpenCourseScheduleSessionDayTime' //指定元素
+ elem: '#teacherOpenCourseScheduleSessionStartDate' //指定元素
, type: 'date'
, calendar: true//显示节假日
, trigger: 'click'
- ,value: $('#teacherOpenCourseScheduleSessionDayTime').val() //必须遵循format参数设定的格式
+ ,value: $('#teacherOpenCourseScheduleSessionStartDate').val() //必须遵循format参数设定的格式
});
/*合并列*/
@@ -156,7 +152,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
layer.closeAll();
});
- /*上课教室radio点击事件*/
+ /*上课教室类型radio点击事件*/
form.on('radio(shagnke)', function (data) {
kkJieciTableData.forEach(function (item, index) {
item.teacherOpenCourseScheduleSessionClassId = '';
@@ -164,7 +160,8 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
table.reload('kkJieciTable');
});
- form.on('select(select_)', function (obj) {
+ /*上课教室下拉框*/
+ form.on('select(select_classRoom)', function (obj) {
// table.cache['kkJieciTable'][$(this).parents("tr").data("index")].teacherOpenCourseScheduleSessionClassId = obj.value;
// var teacherOpenCourseScheduleSessionClassIsMultiple = $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val();
// if (teacherOpenCourseScheduleSessionClassIsMultiple == 'false') {
@@ -172,14 +169,18 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
// item.teacherOpenCourseScheduleSessionClassId = obj.value;
// });
// }
- if(isMultipleSessionClass() === 'false') {
+ if(isMultipleSessionClass() === 'false') {//指定教室
currentTableCache().forEach(function (item, index) {
- if (item.LAY_CHECKED === true) {
- item.teacherOpenCourseScheduleSessionClassId = obj.value;
+ item.teacherOpenCourseScheduleSessionClassId = obj.value;
+ if($.isEmpty(obj.value)){
+ item.teacherOpenCourseScheduleSessionClassId =''
}
});
}else {
currentTableCache()[$(this).parents("tr").data("index")].teacherOpenCourseScheduleSessionClassId = obj.value;
+ if($.isEmpty(obj.value)){
+ currentTableCache()[$(this).parents("tr").data("index")].teacherOpenCourseScheduleSessionClassId =''
+ }
}
});
//设置时间弹窗
@@ -280,11 +281,11 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
/*表格编辑*/
/*table.on('edit(kkJieciTable)', function (obj) { //注：edit是固定事件名，test是table原始容器的属性 lay-filter="对应的值"
- console.log(obj.value); //得到修改后的值
- console.log(obj.field); //当前编辑的字段名
- console.log(obj.data); //所在行的所有相关数据
- console.log(table.cache["kkJieciTable"])
- console.log(kkJieciTableData)
+ (obj.value); //得到修改后的值
+ (obj.field); //当前编辑的字段名
+ (obj.data); //所在行的所有相关数据
+ (table.cache["kkJieciTable"])
+ (kkJieciTableData)
kkJieciTableData.forEach(function (item, index) {
});
});*/
@@ -359,60 +360,60 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
var teacherId = $("#addForm select[name='teacherId']").val();
var schoolClassIds = demo1.getValue('value').join(",");
var teacherOpenCourseScheduleSessionClassIsMultiple = $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val();
- if(sessionTagList.length<=0){
- sessionTagList = kkJieciTableData;
- }
- var teacherOpenCourseScheduleSessionDayTime = $("#addForm input[name='teacherOpenCourseScheduleSessionDayTime']").val();
+ // 构建后台所需要的开课节次List数据
+ var sessionTagListMap = {};
+
+ currentTableCache().forEach(item => {
+ var sessionClassId = item.teacherOpenCourseScheduleSessionClassId;
+ var data = table.checkStatus('kkJieciTable').data;
+ if((item.LAY_CHECKED != true&&data.length > 0)||!sessionClassId) { return;}
+ if(sessionTagListMap.hasOwnProperty(sessionClassId)) {
+ sessionTagListMap[sessionClassId].push(item)
+ }else {
+ (sessionTagListMap[sessionClassId] = []).push(item)
+ }
+ })
+ var teacherOpenCourseScheduleSessionStartDate = $("#addForm input[name='teacherOpenCourseScheduleSessionStartDate']").val();
var teacherOpenCourseScheduleSessionWeekNum = $("#addForm input[name='teacherOpenCourseScheduleSessionWeekNum']").val();
var teacherOpenCourseScheduleSessionOpenOnHolidays = $("#addForm input:radio[name='teacherOpenCourseScheduleSessionOpenOnHolidays']:checked").val();
var teacherOpenCourseScheduleSessionTagWeek = [];
$("#addForm input[name='teacherOpenCourseScheduleSessionTagWeek']:checked").each(function (i, v) {
- teacherOpenCourseScheduleSessionTagWeek.push($(this).val());//teacherOpenCourseScheduleSessionTagWeek
+ teacherOpenCourseScheduleSessionTagWeek.push($(this).val());//teacherOpenCourseScheduleSessionTagWeek
});
if ($.isEmpty(teacherOpenCourseId)) {
- layer.msg('开课课程必选', {icon: 5});
+ layer.msg('开课课程未选!!', {icon: 5});
return;
}
if ($.isEmpty(teacherId)) {
- layer.msg('上课教师必选', {icon: 5});
+ layer.msg('上课教师未选!!', {icon: 5});
return;
}
if ($.isEmpty(schoolClassIds)) {
- layer.msg('上课班级必选', {icon: 5});
+ layer.msg('上课班级未选!!', {icon: 5});
return;
}
- if ($.isEmpty(sessionTagList)) {
- layer.msg('开课节次必选', {icon: 5});
+ if (Object.keys(sessionTagListMap).length <= 0) {
+ layer.msg('开课节次未选!!', {icon: 5});
return;
}
- if ($.isEmpty(teacherOpenCourseScheduleSessionDayTime)) {
- layer.msg('开课开始时间必填', {icon: 5});
+ if ($.isEmpty(teacherOpenCourseScheduleSessionStartDate)) {
+ layer.msg('开课开始时间未填!!', {icon: 5});
return;
}
if ($.isEmpty(teacherOpenCourseScheduleSessionWeekNum)) {
- layer.msg('开课周次必填', {icon: 5});
+ layer.msg('开课周次未填!!', {icon: 5});
return;
}
- if ($.isEmpty(sessionTagList)) {
- layer.msg('节假日是否排课必选', {icon: 5});
+ if ($.isEmpty(teacherOpenCourseScheduleSessionOpenOnHolidays)) {
+ layer.msg('节假日是否排课未选!!', {icon: 5});
return;
}
if ($.isEmpty(teacherOpenCourseScheduleSessionTagWeek)) {
- layer.msg('开课星期必选', {icon: 5});
+ layer.msg('开课星期未选!!', {icon: 5});
return;
}
- // 构建后台所需要的开课节次List数据
- var sessionTagListMap = {};
- currentTableCache().forEach(item => {
- var sessionClassId = item.teacherOpenCourseScheduleSessionClassId;
- if(!sessionClassId) { return; }
- if(sessionTagListMap.hasOwnProperty(sessionClassId)) {
- sessionTagListMap[sessionClassId].push(item)
- }else {
- (sessionTagListMap[sessionClassId] = []).push(item)
- }
- })
+
var param = {
teacherOpenCourseScheduleSessionId: teacherOpenCourseScheduleSessionId,
teacherOpenCourseId: teacherOpenCourseId,
@@ -420,13 +421,11 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
schoolClassIdPlural: schoolClassIds,
teacherOpenCourseScheduleSessionClassIsMultiple: teacherOpenCourseScheduleSessionClassIsMultiple,
sessionClassList: sessionTagListMap,
- startTime: teacherOpenCourseScheduleSessionDayTime,
+ startTime: teacherOpenCourseScheduleSessionStartDate,
weekNum: teacherOpenCourseScheduleSessionWeekNum,
openOnHolidays: teacherOpenCourseScheduleSessionOpenOnHolidays,
weekDetail: teacherOpenCourseScheduleSessionTagWeek,
};
- console.log(param.sessionClassList)
- return;
var url = "/jlw/teacherOpenCourseScheduleSession/addSession.json";
if(!$.isEmpty(teacherOpenCourseScheduleSessionId)){
url = "/jlw/teacherOpenCourseScheduleSession/editSession.json";
@@ -450,7 +449,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
Lib.closeFrame();
});
}
-
- }
+
+ };
exports('add',view);
});
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index 1660447b..67e023f8 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -58,12 +58,7 @@
<div class="layui-inline">
<label class="layui-form-label">上课班级</label>
<div class="layui-input-inline">
- <input style="display:none;" type="text"
- value="${teacherOpenCourseScheduleSession.schoolClassIds}" class="layui-input">
- <div id="demo1" style="width: 800px"></div>
- <!--<layui:simpleDictSelect style='layui-input-inline'
- type="school_class.class_name.class_status=1,"
- id="schoolClassIds" name="schoolClassIds"/>-->
+ <div id="demo1" style="width: 800px" data-value="${teacherOpenCourseScheduleSession.schoolClassIds}"></div>
</div>
</div>
</div>
@@ -71,9 +66,13 @@
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label">上课教室</label>
- <div class="layui-inline">
- <input type="radio" name="teacherOpenCourseScheduleSessionClassIsMultiple" value="false" title="指定教室" lay-filter="shagnke" checked>
- <input type="radio" name="teacherOpenCourseScheduleSessionClassIsMultiple" value="true" title="选择多个教室" lay-filter="shagnke">
+ <div class="layui-inline" ${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionClassIsMultiple}>
+ <input type="radio" name="teacherOpenCourseScheduleSessionClassIsMultiple" value="false"
+ ${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionClassIsMultiple?'':'checked'}
+ title="指定教室" lay-filter="shagnke">
+ <input type="radio" name="teacherOpenCourseScheduleSessionClassIsMultiple" value="true"
+ ${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionClassIsMultiple?'checked':''}
+ title="选择多个教室" lay-filter="shagnke">
</div>
</div>
</div>
@@ -97,7 +96,8 @@
<div class="layui-inline">
<label class="layui-form-label">开课开始时间</label>
<div class="layui-input-inline">
- <input type="text" id="teacherOpenCourseScheduleSessionDayTime" name="teacherOpenCourseScheduleSessionDayTime" value="${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionDayTime}" class="layui-input" >
+ <input type="text" id="teacherOpenCourseScheduleSessionStartDate" name="teacherOpenCourseScheduleSessionStartDate"
+ value="${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionStartDate}" class="layui-input" >
</div>
</div>
</div>
@@ -119,15 +119,17 @@
<div class="layui-form-item">
<label class="layui-form-label">节假日是否排课</label>
<div class="layui-inline">
- <input type="radio" name="teacherOpenCourseScheduleSessionOpenOnHolidays" value="false" title="不排课">
- <input type="radio" name="teacherOpenCourseScheduleSessionOpenOnHolidays" value="true" title="排课">
+ <input type="radio" name="teacherOpenCourseScheduleSessionOpenOnHolidays" title="不排课" value="false"
+ ${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionOpenOnHolidays?'':'checked'}>
+ <input type="radio" name="teacherOpenCourseScheduleSessionOpenOnHolidays" title="排课" value="true"
+ ${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionOpenOnHolidays?'checked':''}>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label">开课星期</label>
- <div class="layui-inline" name="teacherOpenCourseScheduleSessionTagWeek">
+ <div class="layui-inline" id="weekDetail" data-value="${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionStatusWeekDetail}">
<input type="checkbox" name="teacherOpenCourseScheduleSessionTagWeek" value="T1" title="星期一">
<input type="checkbox" name="teacherOpenCourseScheduleSessionTagWeek" value="T2" title="星期二">
<input type="checkbox" name="teacherOpenCourseScheduleSessionTagWeek" value="T3" title="星期三">
@@ -188,8 +190,8 @@
</div>
</form>
<!--上课班级下拉框多选-->
-<script type="text/html" id="select_" >
- <select lay-filter="select_" name="schoolClassIds">
+<script type="text/html" id="select_classRoom" >
+ <select lay-filter="select_classRoom" name="schoolClassIds">
<option value="">请选择</option>
{{# layui.each(window.classist, function(index, item){ }}
{{# layui.each(item.children, function(i, tm){ }}