From 4c9cb4ec7054758ede667f98a6b3ec2d7b8c681e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Fri, 14 Apr 2023 16:55:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E4=B8=9A=E6=B7=BB=E5=8A=A0=E9=99=A2?=
 =?UTF-8?q?=E6=A0=A1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../teacherOpenCourseScheduleSession/add.js   |  9 +++++++-
 .../static/js/jlw/universitySystem/index.js   |  4 ++--
 .../teacherOpenCourseScheduleSession/add.html | 23 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 4 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 c4e24f29..65adeaf2 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
@@ -384,6 +384,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
             $("#addButton").click(function(){
                 var teacherOpenCourseScheduleSessionId = $("#addForm input[name='teacherOpenCourseScheduleSessionId']").val();
                 var scheduleSessionTitle = $("#addForm input[name='scheduleSessionTitle']").val();
+                var courseInfoId =$("#addForm select[name='courseInfoId_1']").val();
                 var teacherOpenCourseId = $("#addForm select[name='teacherOpenCourseId']").val();
                 var teacherId = $("#addForm select[name='teacherId']").val();
                 var schoolClassIds = demo1.getValue('value').join(",");
@@ -414,9 +415,14 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
                     return;
                 }
                 if ($.isEmpty(teacherOpenCourseId)) {
-                    layer.msg('开课课程未选!!', {icon: 5});
+                    layer.msg('开课未选!!', {icon: 5});
                     return;
                 }
+                if ($.isEmpty(courseInfoId)) {
+                    layer.msg('课程未选!!', {icon: 5});
+                    return;
+                }
+
                 if ($.isEmpty(teacherId)) {
                     layer.msg('上课教师未选!!', {icon: 5});
                     return;
@@ -458,6 +464,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
                     scheduleSessionTitle: scheduleSessionTitle,
                     teacherOpenCourseScheduleSessionId: teacherOpenCourseScheduleSessionId,
                     teacherOpenCourseId: teacherOpenCourseId,
+                    courseInfoId:courseInfoId,
                     teacherId: teacherId,
                     schoolClassIdPlural: schoolClassIds,
                     teacherOpenCourseScheduleSessionClassIsMultiple: teacherOpenCourseScheduleSessionClassIsMultiple,
diff --git a/web/src/main/resources/static/js/jlw/universitySystem/index.js b/web/src/main/resources/static/js/jlw/universitySystem/index.js
index 63c88f0a..e59e9d94 100644
--- a/web/src/main/resources/static/js/jlw/universitySystem/index.js
+++ b/web/src/main/resources/static/js/jlw/universitySystem/index.js
@@ -43,13 +43,13 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         hide: true,/*$.isEmpty(sx_['universitySystemId']) ? false : sx_['universitySystemId'],*/
                         width: 60,
                     },
-                    /*{
+                    {
                         field : 'universitiesCollegesIdText',
                         title : '院校名称',
                         align:"center",
                         hideField :false,
                         hide:isAdmin == 'true' ? false : true,
-                    },*/
+                    },
                     {
                         field : 'universityFacultyIdText',
                         title : '院系名称',
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index c2daf8b8..5924b15c 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -81,7 +81,28 @@
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">
-                <label class="layui-form-label">开课课程</label>
+                <label class="layui-form-label">课程名称</label>
+                <div class="layui-input-block" style="width: 400px;">
+                    <!--<layui:simpleDictSelect style='layui-input-inline'
+                        type="teacher_open_course.teacher_open_course_title.${user.get().isAdmin ? '1=1' : 'find_in_set(org_id, ' + user.get().orgId + ')'}"
+                        id="teacherOpenCourseId" name="teacherOpenCourseId"
+                        value="${teacherOpenCourseScheduleSession.teacherOpenCourseId}"/>-->
+
+                    <!--#if(user.get().isAdmin){ -->
+                    <!--#// 查询授权的课程列表。自动根据身份判断 isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
+                    <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_1", "id": "courseInfoId", "isShowGroupName": "true", "defaultValue":teacherOpenCourseScheduleSession.courseInfoId}) {} -->
+
+                    <!--#}else{ -->
+                    <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_1", "id": "courseInfoId", "isShowGroupName": "false","filterName": "理论课程类", "defaultValue":teacherOpenCourseScheduleSession.courseInfoId}) {} -->
+                    <!--#} -->
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-row">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">开课名称</label>
                 <div class="layui-input-block" style="width: 400px;">
                     <layui:simpleDictSelect style='layui-input-inline'
                                             type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1,${user.get().isAdmin ? '1=1' : 'find_in_set(org_id, ' + user.get().orgId + ')'}"