From 7f24943441994c33a162bd56ef944863869a0ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Wed, 2 Nov 2022 01:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=AF=BE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../teacherOpenCourseScheduleSession/index.js |  8 +-
 .../teacherOpenCourseScheduleSession/add.html | 92 +++++++++++++------
 .../index.html                                | 15 +--
 3 files changed, 75 insertions(+), 40 deletions(-)

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 aac6e497..260bc3bc 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
@@ -64,16 +64,14 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
                             return "<a class='layui-table-link' lay-event='look'>查看</a>"
                         }
                     },
-                    {
+                    /*{
                         field: 'teacherOpenCourseScheduleSessionWeekNum',
                         title: '周次',
                         align: "center",
                         hideField: false,
                         hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionWeekNum']) ? false : sx_['teacherOpenCourseScheduleSessionWeekNum'],
-                        // templet:function (d) {
-                        //     return d.teacherOpenCourseScheduleSessionWeekNum + "周"
-                        // }
-                    },
+
+                    },*/
                     {
                         field: 'sessionClassListText',
                         title: '上课教室',
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index 1eabf4a9..46939831 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -57,7 +57,7 @@
 				<div class="layui-input-inline">
 					<input style="display:none;" type="text" name="schoolClassIds"
 						   value="${teacherOpenCourseScheduleSession.schoolClassIds}" class="layui-input">
-					<div id="demo1" style="width: 300px"></div>
+					<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"/>-->
@@ -69,7 +69,7 @@
 		<div class="layui-form-item">
 			<label class="layui-form-label">上课教室</label>
 			<div class="layui-inline">
-				<input type="radio" name="shagnke" value="1" title="指定教室" lay-filter="shagnke">
+				<input type="radio" name="shagnke" value="1" title="指定教室" lay-filter="shagnke" checked>
 				<input type="radio" name="shagnke" value="2" title="选择多个教室" lay-filter="shagnke">
 			</div>
 		</div>
@@ -79,12 +79,12 @@
 			<label class="layui-form-label">开课节次</label>
 			<div class="layui-inline" style="width: 50%;">
 				<input name="sessionTagList" style="display: none" value="">
-				<table id="kkJieciTable" class="layui-table"></table>
+				<table id="kkJieciTable" class="layui-table" lay-filter="kkJieciTable"></table>
 			</div>
 			<div class="layui-inline">
-				<button type="button" class="layui-btn layui-btn-normal"><i class="layui-icon">&#xe669;</i>重置</button>
+				<button type="button" class="layui-btn layui-btn-normal" id="resetClick"><i class="layui-icon">&#xe669;</i>重置</button>
 				<div class="layui-row" style="padding-top: 20px">
-					<button type="button" class="layui-btn layui-btn-normal">设置时间</button>
+					<button type="button" class="layui-btn layui-btn-normal" id="setTime">设置时间</button>
 				</div>
 			</div>
 		</div>
@@ -172,12 +172,18 @@
 	<input type="hidden" name="teacherOpenCourseScheduleSessionId" value="${teacherOpenCourseScheduleSession.teacherOpenCourseScheduleSessionId}" />
 
 </form>
-<script type="text/html" id="select_resourcesApplicationIds" >
-	<layui:simpleDictSelect style='layui-input-inline' layFilter="select_"
-	type="teacher_open_course_schedule_session_class.teacher_open_course_schedule_session_class_name.1=1"
-	id="teacherOpenCourseScheduleSessionClassId" name="teacherOpenCourseScheduleSessionClassId"/>
+<script type="text/html" id="select_" >
+	<select lay-filter="select_" name="teacherOpenCourseScheduleSessionClassId">
+		<option value="">请选择</option>
+		{{#  layui.each(window.classist, function(index, item){ }}
+			{{#  layui.each(item.children, function(i, tm){ }}
+			<option value="{{tm.teacherOpenCourseScheduleSessionClassId}}" {{ tm.teacherOpenCourseScheduleSessionClassId == d.teacherOpenCourseScheduleSessionClassId ? 'selected' : '' }}>{{item.teacherOpenCourseScheduleSessionClassName}}/{{tm.teacherOpenCourseScheduleSessionClassName}}</option>
+			{{#  }); }}
+		{{#  }); }}
+	</select>
 </script>
 <!--#} -->
+<script type="text/javascript" src="${ctxPath}/plugins/xm-select.js?v=${jsVer}"></script>
 <script>
 	layui.use(['add', 'table', 'laydate','xmSelect','form'], function () {
 		var teacherOpenCourseScheduleSessionAdd = layui.add,
@@ -185,25 +191,30 @@
 				table = layui.table,
 				form = layui.form,
 				xmSelect = layui.xmSelect;
-		var teacherOpenCourseScheduleSessionId = $("input[name='teacherOpenCourseScheduleSessionId']").val();
-		var kkJieciTableData = [];
-
+		window.classist = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionClass/levelList.json').data;
+		var teacherOpenCourseScheduleSessionId = $("input[name='teacherOpenCourseScheduleSessionId']").val();//排课id
+		var kkJieciTableData = [],
+				classSelectData=[];
+		var classData =Common.getAjax('/jlw/schoolClass/getValues.json').data;
+		classData.forEach(function (item,index) {
+			classSelectData[index] = {name:item.className,value:item.classId,selected:false}
+		});
 		var demo1 = xmSelect.render({
 			el: '#demo1',
-			data: [
-				{name: '水果', value: 1,selected:false},
-				{name: '蔬菜', value: 2,selected:false},
-				{name: '桌子', value: 3,selected:false},
-				{name: '北京', value: 4,selected:false},
-			],
+			/*theme: {
+				color: '#1e9fff',
+			},*/
+			data: classSelectData,
 		});
 		form.render();//刷新表单
+
 		if($.isEmpty(teacherOpenCourseScheduleSessionId)){
-			kkJieciTableData = Common.getAjax('/jlw/teacherOpenCourseScheduleSessionTag/getValues.json').data;
+			kkJieciTableData = Common.getAjax('/jlw/teacherOpenCourseScheduleSessionTag/getValues.json').data;//开课节次数据表格
 			kkJieciTableData.forEach(function (item,index) {
 				item.teacherOpenCourseScheduleSessionClassName = '';
 			});
 		}
+		/*开课节次数据表格渲染*/
 		var kkJieciTabel = table.render({
 			elem: '#kkJieciTable',
 			/*height: Lib.getTableHeight(1),
@@ -226,37 +237,38 @@
 					field: 'teacherOpenCourseScheduleSessionTagStartTime',
 					title: '开始时间',
 					align: "center",
+					edit: 'text'
 				},
 				{
 					field: 'teacherOpenCourseScheduleSessionTagEndTime',
 					title: '结束时间',
 					align: "center",
+					edit: 'text'
 				},
 				{
 					field: 'teacherOpenCourseScheduleSessionClassName',
 					title: '上课教室',
 					width: 200,
 					align: "center",
-					templet: function (d) {
-						// html字符串转对象，深拷贝操作，相当于每行copy一个下拉框进行回显选中操作
-						var copyHtml = $($('#select_resourcesApplicationIds').html());
-						// 兼容之前的一对多关系
-
-						return copyHtml.html();
-					}
+					templet: "#select_"
 				},
 
 			]], done: function (res, curr, count) {
-				merge(res);
+				var value = $("input[name=shagnke]:checked").val();
+				if (value == 1) {
+					merge(res);
+				}
 			}
 		});
 
+		/*班级下拉多选*/
 		laydate.render({
 			elem: '#teacherOpenCourseScheduleSessionDayTime' //指定元素
 			,type: 'datetime'
 			,range: true
 		});
 
+		/*合并列*/
 		function merge(res) {
 			var data = res.data;
 			var mergeIndex = 0; //定位需要添加合并属性的行数
@@ -288,7 +300,31 @@
 			}
 		};
 
+		/*上课教室radio点击事件*/
+		form.on('radio(shagnke)', function(data){
+			table.reload('kkJieciTable');
+		});
+
+		/*重置点击事件*/
+		$("#resetClick").click(function () {
+			layer.load();
+			kkJieciTableData = [];
+			kkJieciTableData = Common.getAjax('/jlw/teacherOpenCourseScheduleSessionTag/getValues.json').data;//开课节次数据表格
+			kkJieciTableData.forEach(function (item,index) {
+				item.teacherOpenCourseScheduleSessionClassName = '';
+			});
+			table.reload('kkJieciTable',{data:kkJieciTableData});
+			layer.closeAll();
+		});
+		table.on('edit(kkJieciTable)', function(obj){ //注：edit是固定事件名，test是table原始容器的属性 lay-filter="对应的值"
+			console.log(obj.value); //得到修改后的值
+			console.log(obj.field); //当前编辑的字段名
+			console.log(obj.data); //所在行的所有相关数据
+		});
+		//设置时间点击事件
+		$("#setTime").click(function () {
 
-    teacherOpenCourseScheduleSessionAdd.init();
+		});
+		teacherOpenCourseScheduleSessionAdd.init();
 });
 </script>
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html
index d73344f9..cfad9ebf 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html
@@ -50,26 +50,27 @@
         <thead style="background: #ebeaea;">
         <tr style="text-align: center">
             <th style="text-align: center">上课日期</th>
-<!--            <th data-key="1-0-1" style="text-align: center">周次</th>-->
-            <th data-key="1-0-2" style="text-align: center">时长</th>
-            <th data-key="1-0-3" style="text-align: center">上课星期 </th>
+            <th data-key="1-0-1" style="text-align: center">周次</th>
+            <!--<th data-key="1-0-2" style="text-align: center">时长</th>-->
+            <th data-key="1-0-3" style="text-align: center">上课星期</th>
             <th data-key="1-0-4" style="text-align: center">课次</th>
             <th data-key="1-0-5" style="text-align: center">上课时间</th>
             <th data-key="1-0-6" style="text-align: center">上课教室 </th>
         </tr>
         </thead>
         <tbody>
+        <tr>
+            <td rowspan="{{d.sessionTagList.length+1}}">{{d.teacherOpenCourseScheduleSessionStartDate}}~{{d.teacherOpenCourseScheduleSessionEndDate}}</td>
+            <td rowspan="{{d.sessionTagList.length+1}}">{{d.teacherOpenCourseScheduleSessionWeekNum}}</td>
+            <td rowspan="{{d.sessionTagList.length+1}}">{{d.teacherOpenCourseScheduleSessionStatusWeekDetailText}}</td>
+        </tr>
         {{# layui.each(d.sessionTagList, function(index, item){ }}
         <!--colspan="2"-->
         <tr>
-            <td>{{item.teacherOpenCourseScheduleSessionDayTime}}</td>
-            <td>{{item.teacherOpenCourseScheduleSessionTagDuration}}</td>
-            <td>{{item.teacherOpenCourseScheduleSessionTagWeek}}</td>
             <td>{{item.teacherOpenCourseScheduleSessionTagName}}</td>
             <td>{{item.teacherOpenCourseScheduleSessionTagStartTime}}</td>
             <td>{{item.teacherOpenCourseScheduleSessionClassName}}</td>
         </tr>
-
         {{# }); }}
         {{# if(d.sessionTagList.length === 0){ }}
         <tr colspan="6">无数据</tr>