Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.js

@@ -75,26 +75,17 @@ var bootstrap = function ($, learun) {
                 var ClassRoomNo = $('#gridtable').jfGridValue('ClassroomNo');
                 var AcademicYearNo = $('#gridtable').jfGridValue('AcademicYearNo');
                 var Semester = $('#gridtable').jfGridValue('Semester');
+                var LessonNo = $('#gridtable').jfGridValue('LessonNo');
                 if (learun.checkrow(ClassRoomNo)) {
-                    $.ajax({
-                        url: '/EducationalAdministration/Exam_ArrangeExamTermNew/GetSeatData',
-                        data: { ClassRoomNo, AcademicYearNo, Semester },
-                        type: "Post",
-                        dataType: "json",
-                        async: true,
-                        cache: false,
-                        success: function (data) {
-                            console.log(data)
-                        },
-                        error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        },
-                        beforeSend: function () {
-                        },
-                        complete: function () {
-                        }
+                    learun.layerForm({
+                        id: 'SeatForm',
+                        title: '排考座位表',
+                        url: top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/SeatForm?' + $.param({ ClassRoomNo, AcademicYearNo, Semester, LessonNo }),
+                        width: 1200,
+                        height: 800,
+                        btn: null
                     });
                 }
-                //座位数据
             });
         },
         // 初始化列表

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml

@@ -104,11 +104,11 @@
                             <input id="TransferPreMajor" type="text" class="form-control" />
                         </div>
                         <div class="col-xs-3 lr-form-item">
-                            <div class="lr-form-item-title">转学前学号</div>
+                            <div class="lr-form-item-title">转入前学号</div>
                             <input id="TransferPreStuNo" type="text" class="form-control" />
                         </div>
                         <div class="col-xs-3 lr-form-item">
-                            <div class="lr-form-item-title">转学日期</div>
+                            <div class="lr-form-item-title">转入日期</div>
                             <input id="TransferPreDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#TransferPreDate').trigger('change'); } })" />
                         </div>
                         <div class="col-xs-3 lr-form-item">

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1381,7 +1381,6 @@
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\CheckIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryAPStuHealthIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryMSRMilitaryIndex.js" />
-    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScoreIndex.css" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScoreIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryStuEncourgementIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\QueryScholarshipIndex.js" />