From e13498e674fa7ccc4ece1cacc5f51d7132fdee0c Mon Sep 17 00:00:00 2001
From: libo <libo_at@163.com>
Date: Thu, 2 Feb 2023 15:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=91=E5=AD=A6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BD=AC?=
 =?UTF-8?q?=E4=B8=93=E4=B8=9A=E9=A1=B5=E9=9D=A2=E5=A4=9A=E9=80=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuTransferInfo/IntoIndex.cshtml    | 52 +++++++++----------
 .../Views/StuTransferInfo/MajorIndex.js       | 29 ++++-------
 2 files changed, 37 insertions(+), 44 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 6e82e5f56..1c9727663 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	
@@ -61,101 +61,101 @@
     <div class="condiv divactive" id="tab1">
 
         <div class="lr-layout-center">
-            <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll; padding-top:15px; -webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+            <div class="lr-layout-wrap lr-layout-wrap-notitle " style="padding:15px; -webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
                 <div class="lr-form-wrap" style="height:90%;" id="form">
                     @*转入班级*@
-                    <div style="font-size:16px;border-bottom:1px solid #eee;margin:20px 0;">转入班级</div>
-                    <div class="col-xs-12 lr-form-item">
+                    <div style="font-size:18px;border-bottom:1px solid #eee;margin:20px;padding-bottom:10px;">转入班级</div>
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
                         <div id="NewDeptNo" isvalid="yes" checkexpession="NotNull"></div>
                     </div>
-                    <div class="col-xs-12 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
                         <div id="NewMajorNo" isvalid="yes" checkexpession="NotNull"></div>
                     </div>
-                    <div class="col-xs-12 lr-form-item">
+                    <div class="col-xs-2 lr-form-item">
                         <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
                         <div id="NewGrade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                     </div>
-                    <div class="col-xs-12 lr-form-item">
+                    <div class="col-xs-2 lr-form-item">
                         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
                         <div id="NewClassNo" isvalid="yes" checkexpession="NotNull"></div>
                     </div>
-                    <div class="col-xs-12 lr-form-item">
+                    <div class="col-xs-2 lr-form-item">
                         <div class="lr-form-item-title">入班日期<font face="宋体">*</font></div>
                         <input id="LeaveDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#LeaveDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
                     </div>
                     @*转入学生信息*@
-                    <div style="font-size:16px;border-bottom:1px solid #eee;margin:20px 0;">转入学生信息</div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div style="font-size:18px;border-bottom:1px solid #eee;margin:20px;margin-top:120px;padding-bottom:10px;">转入学生信息</div>
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">转学前学校</div>
                         <input id="TransferPreSchool" type="text" class="form-control" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">转学前年级</div>
                         <input id="TransferPreGrade" type="text" class="form-control" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">转学前班级</div>
                         <input id="TransferPreClass" type="text" class="form-control" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">转学前专业</div>
                         <input id="TransferPreMajor" type="text" class="form-control" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">转学前学号</div>
                         <input id="TransferPreStuNo" type="text" class="form-control" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <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-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
                         <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
                         <input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">证件类型<font face="宋体">*</font></div>
                         <div id="IdCardType" isvalid="yes" checkexpession="NotNull"></div>
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">证件号码<font face="宋体">*</font></div>
                         <input id="IdentityCardNo" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">出生日期</div>
                         <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">性别<font face="宋体">*</font></div>
                         <div id="Gender" isvalid="yes" checkexpession="NotNull"></div>
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">民族</div>
                         <div id="NationalityNo"></div>
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">户口所在地</div>
                         <input id="ResidencePlace" type="text" class="form-control" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">籍贯</div>
                         <input id="RegionNo" type="text" class="form-control" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">是否住宿</div>
                         <div id="IsInAccommodation"></div>
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">联系电话</div>
                         <input id="Mobile" type="text" class="form-control" />
                     </div>
-                    <div class="col-xs-6 lr-form-item">
+                    <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">家庭地址</div>
                         <input id="MailAddress" type="text" class="form-control" />
                     </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js
index 9d43d124e..43eff40b3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js	
@@ -827,25 +827,18 @@ var bootstrap = function ($, learun) {
                 rows: 100,
                 isMultiselect: true,
                 onSelectRow: function (rowdata, type) {
-                    //console.log(rowdata)
-                    //console.log(type)
-
                     if (type) {
-                        var selectedRow = $('#gridtable').jfGridGet('rowdata');
-                        if (list.length < 1) {
-                            list = selectedRow
-                        } else {
-                            list = list.concat(selectedRow)
-                            let temp = {}
-                            list = list.reduce((prev, curv) => {
-                                if (temp[curv.StuNo]) { }
-                                else {
-                                    temp[curv.StuNo] = true
-                                    prev.push(curv)
-                                }
-                                return prev
-                            }, [])
-                        }
+                        list.push(rowdata)
+                        let temp = {}
+                        list = list.reduce((prev, curv) => {
+                            if (temp[curv.StuNo]) { }
+                            else {
+                                temp[curv.StuNo] = true
+                                prev.push(curv)
+                            }
+                            return prev
+                        }, [])
+                        //var selectedRow = $('#gridtable').jfGridGet('rowdata');
                         tempdatra = list
                         $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                     }