From c192347be512638ec94ddee0ed3ccfa0cbb11bfb Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Mon, 7 Dec 2020 18:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E9=80=89=E8=AF=BE=E6=83=85=E5=86=B5=EF=BC=9A=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86=E5=A2=9E=E5=8A=A0=E2=80=9C=E9=80=89=E4=BF=AE?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E2=80=9D=EF=BC=9B=E5=88=97=E8=A1=A8=E2=80=9C?=
 =?UTF-8?q?=E4=B8=8A=E8=AF=BE=E8=8A=82=E6=AC=A1=E2=80=9D=E5=88=97=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QueryStuSelectResult.cshtml                  |  4 ++++
 .../QueryStuSelectResult.js                      | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml
index 7d68759cc..621bf8e9a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.cshtml	
@@ -34,6 +34,10 @@
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">选修课程</div>
+                                    <div id="LessonNo"></div>
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">选课状态</div>
                                     <div id="ElectiveSelectStatus"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js
index c791970b2..c5f5bb8cb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js	
@@ -24,7 +24,7 @@ var bootstrap = function ($, learun) {
                     return;
                 }
                 page.search(queryJson);
-            }, 250, 400);
+            }, 300, 400);
             $('#AcademicYearNo').lrselect({
                 placeholder: "请选择学年",
                 allowSearch: true,
@@ -46,6 +46,13 @@ var bootstrap = function ($, learun) {
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#LessonNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=LessonInfo',
+                param: { strWhere: "1=1 AND LessonSortNo='2' " },
+                value: "lessonno",
+                text: "lessonname"
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -174,11 +181,12 @@ var bootstrap = function ($, learun) {
                     {
                         label: "上课节次", name: "LessonSection", width: 150, align: "left",
                         formatter: function (cellvalue, row) {
-                            if (cellvalue != "") {
-                                if (cellvalue.indexOf(',') == -1)
+                            if (cellvalue != "" && cellvalue != undefined && cellvalue != null) {
+                                if (cellvalue.indexOf(',') == -1) {
                                     return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1) + "节";
-                                else
+                                } else {
                                     return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1, 2) + "、" + cellvalue.slice(4) + "节";
+                                }
                             }
                         }
                     },