【修改】异动学号优化；

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

@@ -92,7 +92,7 @@
                                         </div>
                                         <div class="col-xs-12 lr-form-item">
                                             <div class="lr-form-item-title">学号</div>
-                                            <input id="ProvinceCode" type="text" class="form-control" />
+                                            <input id="StuNo" type="text" class="form-control" />
                                         </div>
                                     </div>
                                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js

@@ -231,9 +231,8 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
-                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -388,9 +387,8 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
-                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",

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

@@ -2,6 +2,11 @@
     ViewBag.Title = "学籍异动列表";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
+<style>
+    body {
+        overflow-y: auto;
+    }
+</style>
 <div style="padding-right:30px;padding-top:10px">
     <div style="text-align:right">
         <span id="printBtn" class="btn btn-primary">打印</span>

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

@@ -36,7 +36,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学号</div>
-                                    <input id="ProvinceCode" type="text" class="form-control" />
+                                    <input id="StuNo" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js

@@ -311,9 +311,8 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
-                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+                    { label: "学号", name: "StuNo", width: 100, align: "left"},
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -488,9 +487,8 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
-                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",

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

@@ -93,7 +93,7 @@
                                         </div>
                                         <div class="col-xs-12 lr-form-item">
                                             <div class="lr-form-item-title">学号</div>
-                                            <input id="ProvinceCode" type="text" class="form-control" />
+                                            <input id="StuNo" type="text" class="form-control" />
                                         </div>
                                     </div>
                                 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js

@@ -209,9 +209,8 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
-                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -366,9 +365,8 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
-                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",

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

@@ -36,7 +36,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学号</div>
-                                    <input id="ProvinceCode" type="text" class="form-control" />
+                                    <input id="StuNo" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js

@@ -159,9 +159,8 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
-                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -332,9 +331,8 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
-                    { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
+                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -165,10 +165,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     strSql.Append(" AND stuno not in(select stuno from StuTransferInfo where F_EnabledMark =0) ");
                 }
-                //查询去除 退学,休学,开除,死亡,失踪,注销,自动退学
+                //查询去除 退学,休学,开除,死亡,失踪,注销,自动退学,参军入伍
                 if (!queryParam["RestAgainSql"].IsEmpty())
                 {
-                    strSql.Append("  AND stuno not in(select stuno from StuTransferInfo where anomaloustype = '02,05,06,10,11,12,13,14' and F_EnabledMark =0 )");
+                    strSql.Append("  AND stuno not in(select stuno from StuTransferInfo where anomaloustype = '02,05,06,10,11,12,13,14,17' and F_EnabledMark =0 )");
                 }
                 if (!queryParam["RolloffSql"].IsEmpty())//转出
                 {