金隅招生 导入排序调整，只显示2020年的学生，录取和报道增加招生类别筛选，教师注册 自动生成编号 在system.config中配置

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js

@@ -340,6 +340,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsReport=1';
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js

@@ -301,6 +301,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = " AND IsPay ='true'";
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js

@@ -301,6 +301,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = " AND IsPay ='true'";
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js

@@ -18,9 +18,9 @@ var bootstrap = function ($, learun) {
             }, 380, 400);
             $("#IsQuantity").lrDataItemSelect({ code: "jyYewOrNot" });
             $('#Year').lrselect({
-                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
-                value:"year",
-                text:"year",
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
             })
 
             $('#DeptNo').lrselect({
@@ -154,7 +154,7 @@ var bootstrap = function ($, learun) {
 
 
 
-    },
+        },
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
@@ -292,16 +292,17 @@ var bootstrap = function ($, learun) {
                 isMultiselect: true,
                 isPage: true
             });
-    page.search();
-},
-    search: function (param) {
-        param = param || {};
-param.SqlParameter = " AND IsPay ='true'";
-$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.SqlParameter = " AND IsPay ='true'";
+            param.Grade = "2020";
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
-refreshGirdData = function () {
-    page.search();
-};
-page.init();
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.cshtml

@@ -34,6 +34,10 @@
                                     <div class="lr-form-item-title">姓名</div>
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">招生类别</div>
+                                    <div id="EnrollType" class="form-control"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <object id="CertCtl" type="application/cert-reader" width="0" height="0">
                                         <p style="color:#FF0000;">控件不可用，可能未正确安装控件及驱动，或者控件未启用。</p>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js

@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 380, 400, true,
+            }, 400, 440, true,
                 function () {
                     var cardobj = idcardreader.readcard("lr_btn_readcard");
                     if (cardobj.resultFlag == 0) {
@@ -86,6 +86,7 @@ var bootstrap = function ($, learun) {
                 value: "classno",
                 text: "classname"
             });
+            $('#EnrollType').lrDataItemSelect({ code: 'EnrollStudentType' });
             //刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -478,6 +479,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js

@@ -370,6 +370,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsReport=1';
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js

@@ -348,6 +348,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsCheckIn IS NOT NULL AND IsSubsidize1 IS NOT NULL';
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js

@@ -292,6 +292,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = " AND IsPay ='true'";
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js

@@ -348,6 +348,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsReport=1';
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js

@@ -424,6 +424,7 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsReport=1';
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml

@@ -44,6 +44,10 @@
                                     <div class="lr-form-item-title">报名号</div>
                                     <input id="RegistrationNo" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">招生类别</div>
+                                    <div id="EnrollType" class="form-control"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js

@@ -15,13 +15,14 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 380, 400);
+            }, 400, 400);
             $("#IsReport").lrDataItemSelect({ code: "jyYewOrNot" });
             $('#Year').lrselect({
-                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
-                value:"year",
-                text:"year",
-            })
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
+            });
+            $('#EnrollType').lrDataItemSelect({ code: 'EnrollStudentType' });
 
 
             $('#DeptNo').lrselect({
@@ -403,6 +404,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js

@@ -358,6 +358,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.Grade = "2020";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };