diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml
index b501ef12c..cb10a9776 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.cshtml	
@@ -58,7 +58,8 @@
             <div id="F_SchoolId" readonly isvalid="yes" checkexpession="NotNull"></div>
         </div>*@
     <div id="sourcedata">
-        <div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
+        <div id="gridtable2"></div>
+        @*<div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
             <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
             <div id="AcademicYearNo" class="olddata" readonly isvalid="yes" checkexpession="NotNull"></div>
         </div>
@@ -89,7 +90,7 @@
         <div class="col-xs-4 lr-form-item" data-table="ArrangeLessonTermAttemper">
             <div class="lr-form-item-title">教室<font face="宋体">*</font></div>
             <div id="ClassroomNo" class="olddata" readonly isvalid="yes" checkexpession="NotNull"></div>
-        </div>
+        </div>*@
     </div>
     <!--表格-->
     <div class="col-xs-12 lr-form-item lr-form-item-grid" id="oldgridtable" style="display:none">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js
index 9e86788d4..2ac262302 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTermAttemper/Form.js	
@@ -321,6 +321,22 @@ var bootstrap = function ($, learun) {
             }
         },
         initGird: function () {
+            $('#gridtable2').jfGrid({
+                headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
+                    { label: "学期", name: "Semester", width: 100, align: "left" },
+                    { label: "系部", name: "DeptNo", width: 100, align: "left" },
+                    { label: "专业", name: "MajorNo", width: 100, align: "left" },
+                    { label: "课程", name: "LessonNo", width: 100, align: "left" },
+                    { label: "班级", name: "TeachClassNo", width: 100, align: "left" },
+                    { label: "教师", name: "EmpNo", width: 100, align: "left" },
+                    { label: "教室", name: "ClassroomNo", width: 100, align: "left" },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                //sord: 'desc',
+                //sidx: 'CreateTime'
+            });
             //$('#gridtable').jfGrid({
             //    headData: [
             //        { label: "日期", name: "time", width: 100, align: "left" },
@@ -367,15 +383,18 @@ var bootstrap = function ($, learun) {
                 //$('#gridtable1').jfGridSet('refreshdata', temprow.predata);
                 //$('#gridtable').
             } else {
-                //$('#F_SchoolId').lrselectSet(temprow.schooldId);
-                $('#AcademicYearNo').lrselectSet(temprow.academicyear);
-                $('#Semester').lrselectSet(temprow.semester);
-                $('#DeptNo').lrselectSet(temprow.deptNo);
-                $('#MajorNo').lrselectSet(temprow.majorNo);
-                $('#LessonNo').lrselectSet(temprow.lessonNo);
-                $('#TeachClassNo').lrselectSet(temprow.teachClassNo);
-                $('#EmpNo').lrselectSet(temprow.empno);
-                $('#ClassroomNo').lrselectSet(temprow.classRoomNo);
+                for (var i = 0; i < temprow.length; i++) {
+
+                    //$('#F_SchoolId').lrselectSet(temprow.schooldId);
+                    $('#AcademicYearNo').lrselectSet(temprow[i].academicyear);
+                    $('#Semester').lrselectSet(temprow[i].semester);
+                    $('#DeptNo').lrselectSet(temprow[i].deptNo);
+                    $('#MajorNo').lrselectSet(temprow[i].majorNo);
+                    $('#LessonNo').lrselectSet(temprow[i].lessonNo);
+                    $('#TeachClassNo').lrselectSet(temprow[i].teachClassNo);
+                    $('#EmpNo').lrselectSet(temprow[i].empno);
+                    $('#ClassroomNo').lrselectSet(temprow[i].classRoomNo);
+                }
             }
             page.query();
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducationSelect.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducationSelect.js
index c0a3f57e2..c5660ce4b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducationSelect.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducationSelect.js	
@@ -160,8 +160,12 @@ var bootstrap = function ($, learun) {
             //点击课程表内容
             $('.perFestivalsBox').on('click', 'td.active div.box', function () {
                 var box = $(this);
-                $('.perFestivalsBox').find('div.box.active').removeClass('active');
-                box.addClass('active');
+                //$('.perFestivalsBox').find('div.box.active').removeClass('active');
+                if (box[0].className.indexOf('active') >= 0) {
+                    box.removeClass('active');
+                } else {
+                    box.addClass('active');
+                }
             });
         },
         bindSelect: function () {
@@ -260,7 +264,10 @@ var bootstrap = function ($, learun) {
             learun.alert.warning("请选择课程！");
             return false;
         }
-        var postData = JSON.parse(box.attr('data-val'));
+        var postData = new Array();
+        for (var i = 0; i < box.length; i++) {
+            postData.push(JSON.parse(box[i].getAttribute('data-val')))
+        }
         if (!!callBack) {
             callBack(postData);
             return true;