diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs index b5530e75b..59c0b8b36 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs @@ -34,6 +34,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers private SchoolCalendarIBLL schoolCalendarIbll = new SchoolCalendarBLL(); private StuInfoBasicIBLL stuInfoBasicIbll = new StuInfoBasicBLL(); private EmpInfoIBLL empInfoIbll = new EmpInfoBLL(); + private StuAttendanceLeaveIBLL stuAttendanceLeaveIBLL = new StuAttendanceLeaveBLL(); + #region 视图功能 @@ -362,6 +364,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return JsonResult(noDataResult); } + //学生课表请假记录 + var leaveList = stuAttendanceLeaveIBLL.GetList(); var formatData = from d in timeTables.AsEnumerable() let tt = d.LessonTime.Split('-')[1] group d by tt into g @@ -389,7 +393,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers classRoomNo = string.IsNullOrEmpty(e.ClassRoomNo) ? "" : e.ClassRoomNo.Trim(), lessonSortNo = e.LessonSortNo, e?.OLPEId, - className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName + className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName, + leaveType = leaveList.Any(c => c.LessonNo == e?.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime) ? 1 : 0, + checkType = leaveList.FirstOrDefault(c => c.LessonNo == e?.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime)?.IsCheck, + } } ; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js index 7631078c0..7addc36e7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js @@ -34,6 +34,32 @@ var bootstrap = function ($, learun) { $('.personT').text(data.schoolName); $('.perSemester').text(data.semester); $('.perFestivalsBox table').html(html); + $(".leave").on('click', function () { + var $this = $(this); + var lessonNo = $this.attr("lessonno"); + var lessonTime = $this.attr("lessonTime"); + var lessonDate = $this.attr("lessonDate"); + //var lessonName = $this.attr("lessonName"); + var academicyear = $this.attr("academicyear"); + var semester = $this.attr("semester"); + var empNo = $this.attr("empNo"); + var classRoomNo = $this.attr("classRoomNo"); + var lessonSortNo = $this.attr("lessonSortNo"); + var teachClassNo = $this.attr("teachClassNo"); + + + learun.layerForm({ + id: 'form', + title: '请假申请', + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/Leave?lessonNo=' + lessonNo + '&lessonTime=' + lessonTime + '&lessonDate=' + lessonDate + '&empNo=' + empNo + '&academicyear=' + academicyear + '&semester=' + semester + '&classRoomNo=' + classRoomNo + '&lessonSortNo=' + lessonSortNo + '&teachClassNo=' + teachClassNo, + width: 600, + height: 600, + callBack: function (id) { + return top[id].acceptClick(change($this)); + }.bind(this) + }); + + }); function flogs(num, data, obj) { var flog = false; @@ -86,8 +112,28 @@ var bootstrap = function ($, learun) { item.teacher + '' + '