【修改】线上选课情况；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.cshtml

@@ -2,7 +2,7 @@
     ViewBag.Title = "选修课课程";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -16,28 +16,40 @@
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
-                                    <div id="Semester" class="form-control"></div>
+                                    <div id="Semester"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="StuNo" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 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>
+                                    <input id="EmpName" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">校区</div>
                                     <div id="F_SchoolId"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
+                                    <div class="lr-form-item-title">院系</div>
                                     <div id="DeptNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">专业</div>
                                     <div id="MajorNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">选课状态</div>
-                                    <div id="ElectiveSelectStatus"></div>
-                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">报名状态</div>
                                     <div id="ElectiveSignUpStatus"></div>
@@ -45,6 +57,9 @@
                             </div>
                         </div>
                     </div>
+                    <div class="lr-layout-tool-item">
+                        <div style="height:28px;line-height:28px;">提示：请输入学年和学期进行查询</div>
+                    </div>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
@@ -56,4 +71,4 @@
         </div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResultForTeacher.js")
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElectiveOnline/QueryStuSelectResultForTeacher.js

@@ -24,7 +24,7 @@ var bootstrap = function ($, learun) {
                     return;
                 }
                 page.search(queryJson);
-            }, 300, 400);
+            }, 330, 500);
             $('#AcademicYearNo').lrselect({
                 placeholder: "请选择学年",
                 allowSearch: true,
@@ -40,12 +40,58 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#ElectiveSelectStatus').lrDataItemSelect({ code: 'ElectiveSelectStatus' });
-            $('#ElectiveSignUpStatus').lrDataItemSelect({ code: 'ElectiveSignUpStatus' });
+            //数据集不选择线上课程信息，选择选课情况里的课程信息
+            $('#LessonNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElectiveOnline/GetSelectLessonInfo',
+                value: "LessonNo",
+                text: "LessonName"
+            });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
-            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
-            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            $('#DeptNo').lrDataSourceSelect({
+                code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    if (!!item) {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "deptno='" + item.deptno + "' order by majorno " },
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 order by majorno " },
+                        });
+                    }
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                param: { strWhere: "1=1 order by majorno " },
+                value: "majorno",
+                text: "majorname",
+                select: function (item) {
+                    if (!!item) {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "majorno='" + item.majorno + "' order by classno " },
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 order by classno " },
+                        });
+                    }
+                }
+            });
+            $('#ClassNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                param: { strWhere: "1=1 order by classno " },
+                value: "classno",
+                text: "classname"
+            });
+            $('#ElectiveSignUpStatus').lrDataItemSelect({ code: 'ElectiveSignUpStatus' });
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -54,12 +100,22 @@ var bootstrap = function ($, learun) {
         // 初始化列表
         initGird: function () {
             $('#gridtable').jfGrid({
-                url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList',
+                url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElectiveOnline/GetQueryStuSelectResultList',
                 headData: [
-                    { label: "学年", name: "AcademicYearNo", width: 80, align: "left" },
-                    { label: "学期", name: "Semester", width: 60, align: "left" },
+                    { label: "学年", name: "AcademicYearNo", width: 50, align: "left" },
+                    { label: "学期", name: "Semester", width: 50, align: "left" },
+                    { label: "学号", name: "StuNo", width: 120, align: "left" },
+                    { label: "姓名", name: "StuName", width: 180, align: "left" },
+                    { label: "课程编号", name: "LessonNo", width: 100, align: "left" },
+                    {
+                        label: "课程名称", name: "LessonName", width: 150, align: "left"
+                    },
+                    //{ label: "教师编号", name: "EmpNo", width: 100, align: "left" },
+                    {
+                        label: "建课教师", name: "EmpName", width: 100, align: "left"
+                    },
                     {
-                        label: "校区", name: "F_SchoolId", width: 200, align: "left",
+                        label: "建课学校", name: "F_SchoolId", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
@@ -72,7 +128,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "系所", name: "DeptNo", width: 100, align: "left",
+                        label: "院系", name: "DeptNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
@@ -110,24 +166,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
-                    { label: "姓名", name: "StuName", width: 100, align: "left" },
-                    {
-                        label: "性别", name: "GenderNo", width: 80, align: "left",
-                        formatter: function (cellvalue) {
-                            return cellvalue == true ? "男" : "女";
-                        }
-                    },
-                    {
-                        label: "选课状态", name: "Id", width: 100, align: "left",
-                        formatter: function (cellvalue, row) {
-                            if (cellvalue == null || cellvalue == undefined || cellvalue == "") {
-                                return '<span class=\"label label-default\">未报名</span>';
-                            } else {
-                                return '<span class=\"label label-success\">已报名</span>';
-                            }
-                        }
-                    },
                     {
                         label: "报名状态", name: "Status", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
@@ -142,62 +180,7 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
-                    { label: "所选课程号", name: "LessonNo", width: 100, align: "left" },
-                    {
-                        label: "所选课程名称", name: "LessonName", width: 150, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                                key: row.LessonNo,
-                                keyId: 'lessonno',
-                                callback: function (_data) {
-                                    callback(_data['lessonname']);
-                                }
-                            });
-                        }
-                    },
-                    { label: "课程学分", name: "StudyScore", width: 100, align: "left" },
-                    { label: "教师编号", name: "EmpNo", width: 100, align: "left" },
-                    {
-                        label: "教师姓名", name: "EmpName", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
-                                key: row.EmpNo,
-                                keyId: 'empno',
-                                callback: function (_data) {
-                                    callback(_data['empname']);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "上课节次", name: "LessonSection", width: 150, align: "left",
-                        formatter: function (cellvalue, row) {
-                            if (cellvalue != "" && cellvalue != undefined && cellvalue != null) {
-                                if (cellvalue.indexOf(',') == -1) {
-                                    return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1) + "节";
-                                } else {
-                                    return "星期" + weekChina[cellvalue.slice(0, 1) - 1] + "第" + cellvalue.slice(1, 2) + "、" + cellvalue.slice(4) + "节";
-                                }
-                            }
-                        }
-                    },
-                    { label: "上课时间", name: "LessonTime", width: 180, align: "left" },
-                    {
-                        label: "教室名称", name: "ClassRoomName", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassRoomInfo',
-                                key: row.ClassRoomNo,
-                                keyId: 'classroomno',
-                                callback: function (_data) {
-                                    callback(_data['classroomname']);
-                                }
-                            });
-                        }
-                    },
-                    { label: "备注", name: "Remark", width: 100, align: "left" },
+
                 ],
                 mainId: 'StuId',
                 isPage: true,