From e39dcfac96624574399675f26aeaa3519689c77d Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Fri, 14 Apr 2023 11:14:51 +0800
Subject: [PATCH 1/2]

---
 .../Views/StuTransferInfo/IntoIndex.cshtml                    | 4 ++--
 .../Learun.Application.Web/Learun.Application.Web.csproj      | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml
index 0179ee58d..70f9193d7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml	
+++ b/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">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index ecd0b6a29..992e4603a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -1378,7 +1378,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" />

From 44e61015b3698bbf8a848d532bd692df859169aa Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Mon, 17 Apr 2023 09:22:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=83=E5=8A=A1=E7=AE=A1=E7=90=86,?=
 =?UTF-8?q?=E5=9C=BA=E6=AC=A1=E5=AE=89=E6=8E=92=E6=B7=BB=E5=8A=A0=E5=BA=A7?=
 =?UTF-8?q?=E4=BD=8D=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Exam_ArrangeExamTermNew/IndexClassRoom.js | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.js
index bb9d03a2b..c9fa9d2c1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.js	
+++ b/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
                     });
                 }
-                //座位数据
             });
         },
         // 初始化列表