From 249825a35955ec08893dbacf8494bdc9bd6fc23c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Thu, 10 Nov 2022 21:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=AF=BE=E5=88=97=E8=A1=A8=5F?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../teacherOpenCourseScheduleSession/add.js   | 23 +++++++++++--------
 .../teacherOpenCourseScheduleSession/add.html |  8 +++----
 2 files changed, 17 insertions(+), 14 deletions(-)

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 d7dcad4f..782ced1c 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
@@ -10,14 +10,14 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
     var kkJieciTableData = [],
         classSelectData = [],
         sessionTagList = [];
-    var classData = Common.getAjax('/jlw/schoolClass/getValues.json').data;
+    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}
     });
     // 是否多个教室
     var isMultipleSessionClass = function() {
         return $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val()
-    }
+    };
 
     var currentTableCache = function() {return table.cache['kkJieciTable']};
     var xmSeValue = $("#demo1").attr('value');
@@ -45,12 +45,13 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
         })
     }
     form.render();//刷新表单
-
-    if ($.isEmpty(teacherOpenCourseScheduleSessionId)) {
-        kkJieciTableData = Common.getAjax('/jlw/teacherOpenCourseScheduleSessionTag/getValues.json').data;//开课节次数据表格
-        kkJieciTableData.forEach(function (item, index) {
-            item.teacherOpenCourseScheduleSessionClassId = '';
-        });
+    kkJieciTableData = Common.getAjax('/jlw/teacherOpenCourseScheduleSessionTag/getValues.json').data;//开课节次数据表格
+    kkJieciTableData.forEach(function (item, index) {
+        item.teacherOpenCourseScheduleSessionClassId = '';
+    });
+    if (!$.isEmpty(teacherOpenCourseScheduleSessionId)) {
+        var dds = $("#kkJieciTable").attr('value')
+        console.log(JSON.parse(dds))
     }
 
     /*开课节次数据表格渲染*/
@@ -404,7 +405,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
                 // 构建后台所需要的开课节次List数据
                 var sessionTagListMap = {};
                 currentTableCache().forEach(item => {
-                    var sessionClassId = item.teacherOpenCourseScheduleSessionClassId
+                    var sessionClassId = item.teacherOpenCourseScheduleSessionClassId;
                     if(!sessionClassId) { return; }
                     if(sessionTagListMap.hasOwnProperty(sessionClassId)) {
                         sessionTagListMap[sessionClassId].push(item)
@@ -417,13 +418,15 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
                     teacherOpenCourseId: teacherOpenCourseId,
                     teacherId: teacherId,
                     schoolClassIdPlural: schoolClassIds,
-                    // teacherOpenCourseScheduleSessionClassIsMultiple: teacherOpenCourseScheduleSessionClassIsMultiple,
+                    teacherOpenCourseScheduleSessionClassIsMultiple: teacherOpenCourseScheduleSessionClassIsMultiple,
                     sessionClassList: sessionTagListMap,
                     startTime: teacherOpenCourseScheduleSessionDayTime,
                     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";
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index 7a4e59e8..a02122a1 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -34,10 +34,9 @@
 				<label class="layui-form-label">开课课程</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline'
-											type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1"
+											type="teacher_open_course_merge_course_info.course_info_name.course_info_status=1,course_info_type =1"
 											id="teacherOpenCourseId" name="teacherOpenCourseId"
-											value="${teacherOpenCourseScheduleSession.teacherOpenCourseId}"
-											layVerify=""/>
+											value="${teacherOpenCourseScheduleSession.teacherOpenCourseId}"/>
 				</div>
 			</div>
 		</div>
@@ -84,7 +83,8 @@
 		<div class="layui-form-item">
 			<label class="layui-form-label">开课节次</label>
 			<div class="layui-inline" style="width: 50%;">
-				<table id="kkJieciTable" class="layui-table" name="sessionTagList" lay-filter="kkJieciTable"></table>
+				<table id="kkJieciTable" class="layui-table" name="sessionTagList" lay-filter="kkJieciTable"
+					   value="${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionClassList}"></table>
 			</div>
 			<div class="layui-inline">
 				<button type="button" class="layui-btn layui-btn-normal" id="resetClick"><i class="layui-icon">&#xe669;</i>重置</button>