diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index 7a2712595..71d10b629 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -577,11 +577,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// [HttpGet] [AjaxOnly] - public ActionResult GetLessonNoDataWithNo() + public ActionResult GetLessonNoDataWithNo(string queryJson) { - var loginInfo = LoginUserInfo.Get(); var semesterAndYear = Common.GetSemesterAndYear(); - var data = stuScoreIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description,semesterAndYear.AcademicYearShort,semesterAndYear.Semester); + var queryParam = queryJson.ToJObject(); + string year = queryParam["AcademicYearNo"].IsEmpty()? semesterAndYear.AcademicYearShort: queryParam["AcademicYearNo"].ToString(); + string semester = queryParam["Semester"].IsEmpty() ? semesterAndYear.AcademicYearShort : queryParam["Semester"].ToString(); + var loginInfo = LoginUserInfo.Get(); + var data = stuScoreIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description,year, semester); foreach (var item in data) { item.text = string.Format("{0}({1})", item.text, item.value); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js index 851764860..e75645e7f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js @@ -480,7 +480,18 @@ var bootstrap = function ($, learun) { allowSearch: false, url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetAcademicYearNoData', value: 'value', - text: 'text' + text: 'text', + select: function (item) { + var $content = $('body').find('.lr-layout-tool-left'); + var query = $content.lrGetFormData(); + if (!!item) { + $('#LessonNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataWithNo?queryJson=' + JSON.stringify(query), + value: 'value', + text: 'text', + }); + } + } }); //学期 $('#Semester').lrselect({ @@ -488,13 +499,23 @@ var bootstrap = function ($, learun) { allowSearch: false, url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', value: 'value', - text: 'text' + text: 'text', + select: function (item) { + var $content = $('body').find('.lr-layout-tool-left'); + var query = $content.lrGetFormData(); + if (!!item) { + $('#LessonNo').lrselectRefresh({ + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataWithNo?queryJson=' + JSON.stringify(query), + value: 'value', + text: 'text', + }); + } + } }); //课程 $('#LessonNo').lrselect({ placeholder: "请选择课程", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetLessonNoDataWithNo', value: 'value', text: 'text', select: function (item) { @@ -521,8 +542,8 @@ var bootstrap = function ($, learun) { if (ref.code == "200") { $('#AcademicYearNo').lrselectSet(ref.data.Item1); $('#Semester').lrselectSet(ref.data.Item3); - $('#AcademicYearNo').attr('disabled', "disabled"); - $('#Semester').attr('disabled', "disabled"); + //$('#AcademicYearNo').attr('disabled', "disabled"); + //$('#Semester').attr('disabled', "disabled"); } }.bind(this), "json"); },