From 2e42681c30bbaa924e376518f64123036956d658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Sat, 22 Apr 2023 01:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=AF=BE=E7=AE=A1=E7=90=86-=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../teacherOpenCourseScheduleSession/index.js | 18 ++++++-
 .../templates/common/courseInfoSelect.html    | 29 ++++++++--
 .../teacherOpenCourseScheduleSession/add.html | 54 +++----------------
 .../index.html                                |  4 +-
 4 files changed, 49 insertions(+), 56 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 a9bf6bb1..387f2362 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
@@ -130,7 +130,23 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
         },
 
         initSearchForm:function(){
-            Lib.initSearchForm( $("#searchForm"),teacherOpenCourseScheduleSessionTable,form);
+            //Lib.initSearchForm( $("#searchForm"),teacherOpenCourseScheduleSessionTable,form);
+            var btn = $("#searchFormSearch");
+            btn.on('click', function () {
+                var data = $("#searchForm").serializeJson();
+                if(!$.isEmpty(data.teacherOpenCourseId)){
+                    data.courseType = data.teacherOpenCourseId.split('_')[1];
+                    data.teacherOpenCourseId = data.teacherOpenCourseId.split('_')[0];
+                }else {
+                    data.courseType = "";
+                }
+                teacherOpenCourseScheduleSessionTable.reload({
+                    where: data,
+                    page: {
+                        curr: 1
+                    }
+                });
+            });
         },
 
         initToolBar:function(){
diff --git a/web/src/main/resources/templates/common/courseInfoSelect.html b/web/src/main/resources/templates/common/courseInfoSelect.html
index 912a909d..d5d83a13 100644
--- a/web/src/main/resources/templates/common/courseInfoSelect.html
+++ b/web/src/main/resources/templates/common/courseInfoSelect.html
@@ -8,6 +8,7 @@
    isShowGroupName  显示分组名称（默认：true）;
    defaultValue     默认值;
    filterName       过滤的分类名称，多个逗号隔开；只支持【应用课程类】、【理论课程类】、【考证课程类】，showGroupName为false也会过滤数据。
+   isShowOpentCourse 显示开课课程
 */
 
 // 传入的标签ID，如果为空，则生成规则 select_id_{标签name}_生成长度为10的字符串
@@ -20,6 +21,7 @@ var newId = !isEmpty(id) ? id : ('select_id_' + (name!'0')  + '_' + @cn.hutool.c
 <script type="text/javascript">
     // 根据当前登录用户，获取授权的课程信息
     // 该接口暂定有1小时的缓存
+
     var currentAuthCourseInfoDetails =
         Common.getAjax('/jlw/universitiesCollegesJurisdictionCurriculumResources/getAuthDetailsByCacheUser.json').data;
 
@@ -29,6 +31,8 @@ var newId = !isEmpty(id) ? id : ('select_id_' + (name!'0')  + '_' + @cn.hutool.c
     var theoryCourseList = currentAuthCourseInfoDetails.theoryCourseList || [];
     // 考证课程类
     var textualResearchCourseList = currentAuthCourseInfoDetails.textualResearchCourseList || [];
+    // 理论课程类+开课课程
+    var theoryAddOpenCourseList = currentAuthCourseInfoDetails.theoryAddOpenCourseList||[];
 
     /**
      * 分组模板：
@@ -49,9 +53,11 @@ var newId = !isEmpty(id) ? id : ('select_id_' + (name!'0')  + '_' + @cn.hutool.c
     // 过滤label
     var filterNames     = '${filterName!""}';
     // 显示分组名称
-    var isShowGroupName   = '${isShowGroupName!true}';
+    var isShowGroupName   = '${isShowGroupName!""}';
     // 给定默认值
     var defaultValue      = '${defaultValue!""}';
+    //显示开课课程
+    var isShowOpentCourse = '${isShowOpentCourse!false}';
     // 下拉框选中的事件
     var selectedHandler   = function(val) {
         return defaultValue.trim() == val.trim() ? 'selected = "selected"' : '';
@@ -59,6 +65,9 @@ var newId = !isEmpty(id) ? id : ('select_id_' + (name!'0')  + '_' + @cn.hutool.c
     // 是否显示分组名称的事件
     var isShowGroupNameHandler   = function() {
         return isShowGroupName == 'true';
+    } // 是否显示分组名称的事件
+    var isShowOpentCourseHandler   = function() {
+        return isShowOpentCourse == 'true';
     }
 
 
@@ -73,12 +82,22 @@ var newId = !isEmpty(id) ? id : ('select_id_' + (name!'0')  + '_' + @cn.hutool.c
     }
 
     if (filterNames.indexOf('理论课程类') >= 0 || filterNames === "") {
+
         if (isShowGroupNameHandler()) ele.append('<optgroup label="理论课程类">');
-        for (let currentAuthCourseInfoDetail of theoryCourseList) {
-            var cid = currentAuthCourseInfoDetail.courseInfoId || '-1';
-            var ciName = currentAuthCourseInfoDetail.courseInfoName || '未查询到数据';
-            ele.append('<option value="'+ cid +'"' + selectedHandler(cid) +' >'+ ciName +'</option>')
+        if(isShowOpentCourseHandler()){
+            for (let currentAuthCourseInfoDetail of theoryAddOpenCourseList) {
+                var cid = currentAuthCourseInfoDetail.courseId+'_'+currentAuthCourseInfoDetail.courseType || '-1';
+                var ciName = currentAuthCourseInfoDetail.courseName  || '未查询到数据';
+                ele.append('<option value="'+ cid +'"' + selectedHandler(cid) +' >'+ ciName +'</option>')
+            }
+        }else {
+            for (let currentAuthCourseInfoDetail of theoryCourseList) {
+                var cid = currentAuthCourseInfoDetail.courseInfoId || '-1';
+                var ciName = currentAuthCourseInfoDetail.courseInfoName || '未查询到数据';
+                ele.append('<option value="'+ cid +'"' + selectedHandler(cid) +' >'+ ciName +'</option>')
+            }
         }
+
         if (isShowGroupNameHandler()) ele.append('</optgroup>');
     }
 
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index 5924b15c..bf455af3 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -37,51 +37,10 @@
             </div>
         </div>
     </div>
-    <!--#if(!isEmpty(teacherOpenCourseId)){-->
     <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 + ')'}"
-                                            id="teacherOpenCourseId" name="teacherOpenCourseId"
-                                            value="${teacherOpenCourseId}" layVerify=""
-                                            layFilter="select_teacherOpenCourseId"/><!--select_teacherId-->
-                </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.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=""
-                                            layFilter="select_teacherId"/>
-                </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-inline">
-                    <div id="demo1" style="width: 800px"
-                         data-value="${teacherOpenCourseScheduleSession.schoolClassIds}"></div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!--#}else{-->
-    <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.${user.get().isAdmin ? '1=1' : 'find_in_set(org_id, ' + user.get().orgId + ')'}"
@@ -90,29 +49,29 @@
 
                     <!--#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}) {} -->
+                    <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_1", "id": "courseInfoId", "isShowGroupName": "true", "defaultValue":teacherOpenCourseScheduleSession.courseInfoId, isShowOpentCourse:"true"}) {} -->
 
                     <!--#}else{ -->
-                    <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_1", "id": "courseInfoId", "isShowGroupName": "false","filterName": "理论课程类", "defaultValue":teacherOpenCourseScheduleSession.courseInfoId}) {} -->
+                    <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_1", "id": "courseInfoId", "isShowGroupName": "false","filterName": "理论课程类", "defaultValue":teacherOpenCourseScheduleSession.courseInfoId, isShowOpentCourse:"true"}) {} -->
                     <!--#} -->
                 </div>
             </div>
         </div>
     </div>
-    <div class="layui-row">
+    <!--<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.teacher_open_course_status=1,${user.get().isAdmin ? '1=1' : 'find_in_set(org_id, ' + user.get().orgId + ')'}"
                                             id="teacherOpenCourseId" name="teacherOpenCourseId"
                                             value="${teacherOpenCourseScheduleSession.teacherOpenCourseId}" layVerify=""
-                                            layFilter="select_teacherOpenCourseId"/><!--select_teacherId-->
+                                            layFilter="select_teacherOpenCourseId"/>
                 </div>
             </div>
         </div>
-    </div>
+    </div>-->
     <div class="layui-row">
         <div class="layui-form-item">
             <div class="layui-inline">
@@ -138,7 +97,6 @@
             </div>
         </div>
     </div>
-    <!--#}-->
     <div class="layui-row">
         <div class="layui-form-item">
             <label class="layui-form-label">上课教室</label>
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html
index b833767e..1a682304 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html
@@ -25,10 +25,10 @@
             <!--#// 查询授权的课程列表。自动根据身份判断 -->
             <!--#if(user.get().isAdmin){ -->
             <!--#// 查询授权的课程列表。自动根据身份判断 isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
-            <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "", "isShowGroupName": "true"}) {} -->
+            <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "", "isShowGroupName": "true", isShowOpentCourse:"true"}) {} -->
 
             <!--#}else{ -->
-            <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "", "isShowGroupName": "false","filterName": "理论课程类"}) {} -->
+            <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "", "isShowGroupName": "false","filterName": "理论课程类", isShowOpentCourse:"true"}) {} -->
             <!--#} -->
         </div>
     </div>