From b89a2a8b6d2286f9186214a081fdb051a220db0a Mon Sep 17 00:00:00 2001
From: libo <libo_at@163.com>
Date: Tue, 31 Jan 2023 15:51:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AC=E5=85=A5=E8=BD=AC?=
 =?UTF-8?q?=E5=87=BA=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuTransferInfo/IntoIndex.cshtml    | 224 +++++++++++-------
 .../Views/StuTransferInfo/IntoIndex.js        |  13 +
 2 files changed, 157 insertions(+), 80 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 4f9471890..3ab3ef1ad 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	
@@ -2,97 +2,161 @@
     ViewBag.Title = "学籍异动列表";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout ">
-    <div class="lr-layout-center">
-        <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
-            <div class="lr-layout-tool">
-                <div class="lr-layout-tool-left">
-                    <div class="lr-layout-tool-item">
-                        <div id="multiple_condition_query">
-                            <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">专业</div>
-                                    <div id="MajorNo"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">年级</div>
-                                    <div id="Grade"></div>
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">班级</div>
-                                    <div id="ClassNo"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">姓名</div>
-                                    <input id="StuName" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">身份证号</div>
-                                    <input id="IdentityCardNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学生编号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">学籍号</div>
-                                    <input id="StuCode" type="text" class="form-control" />
+<style>
+    .navtabwrap {
+    }
+
+    .navul {
+        display: flex;
+        align-items: flex-end;
+        border-bottom: 1px solid #ddd;
+        height: 38px;
+    }
+
+        .navul li {
+            width: 80px;
+            height: 28px;
+            margin-left: 15px;
+            line-height: 28px;
+            text-align: center;
+            border-radius: 4px 4px 0 0;
+            cursor: pointer;
+            margin-bottom: -1px;
+        }
+
+            .navul li:hover {
+                background: #eee;
+            }
+
+    .active {
+        color: #555;
+        cursor: default;
+        background-color: #fff;
+        border: 1px solid #ddd;
+        border-bottom-color: transparent;
+    }
+
+    .condiv {
+        display: none;
+        height: 100%;
+    }
+
+    .divactive {
+        display: block;
+    }
+
+    .contabwrap {
+        height: calc(100% - 50px);
+    }
+</style>
+<div class="navtabwrap" id="navultab">
+    <ul class="navul">
+        <li class="active">转入</li>
+        <li>转出</li>
+    </ul>
+
+</div>
+<div class="contabwrap" id="condivtab">
+
+    <div class="condiv divactive" id="tab1">
+
+        <div class="lr-layout-center">
+            <div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
+                <div class="lr-layout-tool">
+                    <div class="lr-layout-tool-left">
+                        <div class="lr-layout-tool-item">
+                            <div id="multiple_condition_query">
+                                <div class="lr-query-formcontent">
+                                    <div class="col-xs-12 lr-form-item">
+                                        <div class="lr-form-item-title">系部</div>
+                                        <div id="DeptNo"></div>
+                                    </div>
+                                    <div class="col-xs-12 lr-form-item">
+                                        <div class="lr-form-item-title">专业</div>
+                                        <div id="MajorNo"></div>
+                                    </div>
+                                    <div class="col-xs-12 lr-form-item">
+                                        <div class="lr-form-item-title">年级</div>
+                                        <div id="Grade"></div>
+                                    </div>
+                                    <div class="col-xs-12 lr-form-item">
+                                        <div class="lr-form-item-title">班级</div>
+                                        <div id="ClassNo"></div>
+                                    </div>
+                                    <div class="col-xs-6 lr-form-item">
+                                        <div class="lr-form-item-title">姓名</div>
+                                        <input id="StuName" type="text" class="form-control" />
+                                    </div>
+                                    <div class="col-xs-6 lr-form-item">
+                                        <div class="lr-form-item-title">身份证号</div>
+                                        <input id="IdentityCardNo" type="text" class="form-control" />
+                                    </div>
+                                    <div class="col-xs-6 lr-form-item">
+                                        <div class="lr-form-item-title">学生编号</div>
+                                        <input id="StuNo" type="text" class="form-control" />
+                                    </div>
+                                    <div class="col-xs-6 lr-form-item">
+                                        <div class="lr-form-item-title">学籍号</div>
+                                        <input id="StuCode" type="text" class="form-control" />
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
 
-                    @*<div class="lr-layout-tool-item">
-                        <div class="lr-query-btn" style="padding:0 10px;" id="listitem">
-                            点击
+                        @*<div class="lr-layout-tool-item">
+                                <div class="lr-query-btn" style="padding:0 10px;" id="listitem">
+                                    点击
+                                </div>
+                            </div>*@
+                    </div>
+                    <div class="lr-layout-tool-right">
+                        <div class=" btn-group btn-group-sm">
+                            <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                         </div>
-                    </div>*@
-                </div>
-                <div class="lr-layout-tool-right">
-                    <div class=" btn-group btn-group-sm">
-                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                 </div>
-            </div>
-            <div class="lr-layout-body" style="height:50%;" id="gridtable"></div>
+                <div class="lr-layout-body" style="height:50%;" id="gridtable"></div>
 
-            <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
-            <div class="lr-form-wrap" id="form">
-                <div class="col-xs-6 lr-form-item">
-                    <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
-                    <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
-                </div>
-                <div class="col-xs-6 lr-form-item">
-                    <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
-                    <div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
-                </div>
-                <div class="col-xs-6 lr-form-item">
-                    <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
-                    <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
-                </div>
-                <div class="col-xs-6 lr-form-item">
-                    <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
-                    <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
-                </div>
-                <div class="col-xs-12 lr-form-item">
-                    <div class="lr-form-item-title">异动原因</div>
-                    <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
-                </div>
-                <div class="col-xs-6 lr-form-item">
-                    <div class="lr-form-item-title">休学年限<font face="宋体">*</font></div>
-                    <input id="SuspensionPeriod" type="text" isvalid="yes" checkexpession="NotNull" />
-                </div>
-                <div class="col-xs-6 lr-form-item">
-                    <div class="lr-form-item-title">休学时段(文本框暂时)<font face="宋体">*</font></div>
-                    <input id="SuspensionBeginTime" type="text" isvalid="yes" checkexpession="NotNull" />
-                    @*<input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />*@
+                <div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
+                <div class="lr-form-wrap" id="form">
+                    <div class="col-xs-6 lr-form-item">
+                        <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
+                        <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                    </div>
+                    <div class="col-xs-6 lr-form-item">
+                        <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
+                        <div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                    </div>
+                    <div class="col-xs-6 lr-form-item">
+                        <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
+                        <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                    </div>
+                    <div class="col-xs-6 lr-form-item">
+                        <div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
+                        <input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+                    </div>
+                    <div class="col-xs-12 lr-form-item">
+                        <div class="lr-form-item-title">异动原因</div>
+                        <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
+                    </div>
+                    <div class="col-xs-6 lr-form-item">
+                        <div class="lr-form-item-title">休学年限<font face="宋体">*</font></div>
+                        <input id="SuspensionPeriod" type="text" isvalid="yes" checkexpession="NotNull" />
+                    </div>
+                    <div class="col-xs-6 lr-form-item">
+                        <div class="lr-form-item-title">休学时段(文本框暂时)<font face="宋体">*</font></div>
+                        <input id="SuspensionBeginTime" type="text" isvalid="yes" checkexpession="NotNull" />
+                        @*<input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />*@
+                    </div>
                 </div>
             </div>
         </div>
+
     </div>
+
+    <div class="condiv" id="tab2">
+        <iframe id="EducationExperienceReturn" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+    </div>
+
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js
index 616770f4d..b2062750b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js	
@@ -10,9 +10,22 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+
+            $('#navultab li').on('click', function () {
+                if (!$(this).hasClass('active')) {
+                    $(this).parent().find('.active').removeClass('active');
+                    $(this).addClass('active');
+                    $('#condivtab .condiv').eq($(this).index()).siblings().hide()
+                    $('#condivtab .condiv').eq($(this).index()).show()
+                }
+            })
+
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 280, 400);
+
+            $("#EducationExperienceReturn").attr("src", "/EducationalAdministration/StuTransferInfo/RolloffIndex");
+
             $('#DeptNo').lrselect({
                 allowSearch: true,
                 value: "deptno",