Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

admin-core/src/main/resources/codeTemplate/html/add.html

@@ -22,7 +22,7 @@
 					<input type="text" id="${item.name}" name="${item.name}"  value="\${${entity.code}.${item.name}${item.javaType=='Date'?',"yyyy-MM-dd"'}}"  ${isNotEmpty(item.verifyList)?('lay-verify="'+verifyFormat(item.verifyList)+'"'):''} class="layui-input${item.javaType=='Date'?' input-date'}" >
 					@}else{
 					<layui:simpleDictSelect style='layui-input-inline' type="${item.dictType}"
-											id="${item.name}" name="${item.name}" value="\${${entity.code}.${item.name}}" layVerify="${verifyFormat(item.verifyList)}" />
+											id="${item.name}" name="${item.name}" value="\${${entity.code}.${item.name}}"  ="${verifyFormat(item.verifyList)}" />
 					@}
 				</div>
             </div>

web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js

@@ -159,6 +159,11 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
         }
     };
 
+    form.on('select(select_teacherId)', function (obj) {
+        classData = Common.getAjax('/jlw/schoolClass/getValues.json',{teacherId: obj.value}).data;//上课班级多选框data
+        //Lib.getCourseInfo($("select[name='courseInfoId_1']"), obj.value, 1);
+    });
+
     /*重置点击事件*/
     $("#resetClick").click(function () {
         layer.load();
@@ -202,6 +207,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
             }
         }
     });
+
     //设置时间弹窗
     $("#setTime").click(function () {
         layer.open({

web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html

@@ -58,7 +58,7 @@
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline' type="teacher.teacher_name.teacher_status=1.${user.get().isAdmin ? '1=1' : 'find_in_set(org_id, ' + user.get().orgId + ')'}"
 						id="teacherId" name="teacherId"
-						value="${teacherOpenCourseScheduleSession.teacherId}" layVerify=""/>
+						value="${teacherOpenCourseScheduleSession.teacherId}" layVerify="" layFilter="select_teacherId"/>
 				</div>
 			</div>
 		</div>