调整迎新系统模块年级查询条件

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs

@@ -524,7 +524,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
             return Success(list);
         }
-
+        /// <summary>
+        /// 获取年级（最大）
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetYearListByMaxClass()
+        {
+            var classList = classInfoIBLL.GetAllClass().ToList();
+            var grade = classList.OrderByDescending(x => x.Grade).Select(x => x.Grade).FirstOrDefault();
+            return Success(grade);
+        }
 
         [HttpPost]
         [AjaxOnly]

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">是否住宿</div>

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

@@ -5,10 +5,15 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
             page.refreshMoney();
@@ -19,11 +24,13 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 380, 400);
             $("#IsCheckIn").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
-                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
-                value:"year",
-                text:"year",
-            })
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
+            });
+
+            $('#Grade').lrselectSet(NowGrade);
 
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -336,7 +343,10 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsReport=1';
-            param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">是否领取</div>

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

@@ -5,10 +5,15 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
         },
@@ -17,11 +22,12 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 380, 400);
             $("#IsGetBeddingArticle").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
-                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
-                value:"year",
-                text:"year",
-            })
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
+            });
+            $('#Grade').lrselectSet(NowGrade);
 
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -300,7 +306,10 @@ var bootstrap = function ($, learun) {
             param = param || {};
             //param.SqlParameter = " AND IsPay ='true'";
             param.SqlParameter = ' AND IsReport=1';
-            param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">是否领取军训服</div>

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

@@ -5,10 +5,15 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
         },
@@ -17,11 +22,12 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 380, 400);
             $("#IsTakeCloths").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
-                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
-                value:"year",
-                text:"year",
-            })
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
+            });
+            $('#Grade').lrselectSet(NowGrade);
 
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -300,7 +306,10 @@ var bootstrap = function ($, learun) {
             param = param || {};
             //param.SqlParameter = " AND IsPay ='true'";
             param.SqlParameter = ' AND IsReport=1';
-            param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">是否量校服尺寸</div>

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

@@ -5,10 +5,15 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
         },
@@ -17,11 +22,12 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 380, 400);
             $("#IsQuantity").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
+            $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
                 value: "year",
                 text: "year",
-            })
+            });
+            $('#Grade').lrselectSet(NowGrade);
 
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -296,7 +302,10 @@ var bootstrap = function ($, learun) {
             param = param || {};
             //param.SqlParameter = " AND IsPay ='true'";
             param.SqlParameter = ' AND IsReport=1';
-            param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -5,10 +5,16 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+            //console.log('NowGrade：', NowGrade);
+
             page.initGird();
             page.bind();
         },
@@ -26,7 +32,6 @@ var bootstrap = function ($, learun) {
                         learun.alert.error('读取错误！未检测到身份证或设备连接错误,请调整身份证位置并重新读取，多次未读取到身份证信息则可能是身份证芯片已损坏！');
                     }
                 });
-
             $('#DeptNo').lrselect({
                 allowSearch: true,
                 value: "deptno",
@@ -75,7 +80,9 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
                 value: "year",
                 text: "year",
-            })
+            });
+            $('#Grade').lrselectSet(NowGrade);
+
             $('#ClassNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
@@ -475,11 +482,10 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            
             if (!param.Grade && param.Grade == undefined) {
-                param.Grade = "20";
+                param.Grade = NowGrade;
             }
-
-            //param.Grade = "20";
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">是否资助</div>

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

@@ -5,11 +5,16 @@
  * 描  述：新生资助变更管理
  */
 var refreshGirdData;
+var NowGrade;
 var processId = '';
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
             //page.refreshMoney();
@@ -20,6 +25,58 @@ var bootstrap = function ($, learun) {
                 //page.refreshMoney();
             }, 380, 400);
 
+            $("#IsSubsidize1").lrDataItemSelect({ code: "jyYewOrNot" });
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
+            });
+            $('#Grade').lrselectSet(NowGrade);
+
+            $('#DeptNo').lrselect({
+                allowSearch: true,
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#MajorNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+
+                }
+            });
+            $('#MajorNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
+                value: "majorno",
+                text: "majorname",
+                param: { strWhere: "1=1 AND CheckMark=1" },
+                select: function (item) {
+                    if (item) {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                            param: { strWhere: "1=1 AND CheckMark=1" }
+                        });
+                    }
+                }
+            });
             $('#ClassNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
@@ -159,7 +216,10 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsReport=1 AND IsSupportChange=1';
-            param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
         eye: function () {

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">是否资助</div>

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

@@ -5,10 +5,15 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
             //page.refreshMoney();
@@ -19,11 +24,12 @@ var bootstrap = function ($, learun) {
                 //page.refreshMoney();
             }, 380, 400);
             $("#IsSubsidize1").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
+            $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
                 value: "year",
                 text: "year",
             });
+            $('#Grade').lrselectSet(NowGrade);
 
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -239,7 +245,10 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsReport=1 AND IsSupport=1';
-            param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
 

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

@@ -97,7 +97,7 @@
 								</div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
 								<div class="col-xs-12 lr-form-item">
 									<div class="lr-form-item-title">是否缴费</div>

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

@@ -5,10 +5,15 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
             page.refreshMoney();
@@ -18,11 +23,12 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 380, 400);
             $("#IsPay").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
+            $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
                 value: "year",
                 text: "year",
-            })
+            });
+            $('#Grade').lrselectSet(NowGrade);
 
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -346,7 +352,10 @@ var bootstrap = function ($, learun) {
             param = param || {};
             //param.SqlParameter = ' AND IsCheckIn IS NOT NULL AND IsSubsidize1 IS NOT NULL';
             param.SqlParameter = ' AND IsReport=1';
-            param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">是否拍照</div>

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

@@ -5,11 +5,16 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var StuId;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
         },
@@ -18,11 +23,12 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 380, 400);
             $("#IsMug").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
-                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
-                value:"year",
-                text:"year",
-            })
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
+            });
+            $('#Grade').lrselectSet(NowGrade);
 
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -291,7 +297,10 @@ var bootstrap = function ($, learun) {
             param = param || {};
             //param.SqlParameter = " AND IsPay ='true'";
             param.SqlParameter = ' AND IsReport=1';
-            //param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -26,7 +26,7 @@
                                 
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">是否军训</div>

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

@@ -5,10 +5,15 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
             //page.refreshMoney();
@@ -19,11 +24,12 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 380, 400);
             $("#IsMilitary").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
+            $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
                 value: "year",
                 text: "year",
-            })
+            });
+            $('#Grade').lrselectSet(NowGrade);
 
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -351,7 +357,10 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsReport=1';
-            //param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
             page.refreshMoney(JSON.stringify(param));
         }

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">是否军训</div>

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

@@ -5,10 +5,15 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
             //page.refreshMoney();
@@ -19,11 +24,12 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 380, 400);
             $("#IsMilitary").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
-                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
-                value:"year",
-                text:"year",
-            })
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
+            });
+            $('#Grade').lrselectSet(NowGrade);
 
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -421,7 +427,10 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsReport=1';
-            param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
 
                                 <div class="col-xs-12 lr-form-item">

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

@@ -5,10 +5,14 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
             page.initGird();
             page.bind();
         },
@@ -17,11 +21,13 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 400, 400);
             $("#IsReport").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
+            $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
                 value: "year",
                 text: "year",
             });
+            $('#Grade').lrselectSet(NowGrade);
+
             $('#Admissions').lrDataItemSelect({ code: 'enrollType' });
 
 
@@ -394,7 +400,10 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">免学费</div>

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

@@ -5,10 +5,15 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
             //page.refreshMoney();
@@ -19,11 +24,12 @@ var bootstrap = function ($, learun) {
                 //page.refreshMoney();
             }, 380, 400);
             $("#IsSubsidize1").lrDataItemSelect({ code: "jyYewOrNot" });
-            $('#Year').lrselect({
+            $('#Grade').lrselect({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
                 value: "year",
                 text: "year",
-            })
+            });
+            $('#Grade').lrselectSet(NowGrade);
 
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -402,7 +408,7 @@ var bootstrap = function ($, learun) {
         },
         refreshMoney: function (queryJson) {
             learun.httpAsyncGetWithParam(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetMilitaryStatistics', { queryJson: queryJson,type:2 }, function (res) {
-                console.log(res);
+                //console.log(res);
                 $("#allAmount").html(res.data.aa);
                 $("#isAmount").html(res.data.bb);
             });
@@ -421,7 +427,10 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             param.SqlParameter = ' AND IsReport=1';
-            //param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
             page.refreshMoney(JSON.stringify(param));
         }

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

@@ -24,7 +24,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
-                                    <div id="Year"></div>
+                                    <div id="Grade"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">身份证</div>

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

@@ -5,10 +5,15 @@
  * 描  述：新生录取管理
  */
 var refreshGirdData;
+var NowGrade;
 var bootstrap = function ($, learun) {
     "use strict";
     var page = {
         init: function () {
+            var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass',
+                {});
+            NowGrade = data_grade.info;
+
             page.initGird();
             page.bind();
         },
@@ -78,11 +83,12 @@ var bootstrap = function ($, learun) {
                 value: "classno",
                 text: "classname"
             });
-            $('#Year').lrselect({
-                url:top.$.rootUrl+'/EducationalAdministration/StuEnroll/GetYearListByClass',
-                value:"year",
-                text:"year",
-            })
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass',
+                value: "year",
+                text: "year",
+            });
+            $('#Grade').lrselectSet(NowGrade);
 
             //刷新
             $('#lr_refresh').on('click', function () {
@@ -355,7 +361,10 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.Grade = "20";
+
+            if (!param.Grade && param.Grade == undefined) {
+                param.Grade = NowGrade;
+            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };