From 4f60ad73d48bc153751c35946fedb2e04d313fa0 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 27 Aug 2021 11:12:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=8E=E6=96=B0=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E5=9D=97=E5=B9=B4=E7=BA=A7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuEnrollController.cs | 13 +++- .../Views/StuEnroll/CheckIn.cshtml | 2 +- .../Views/StuEnroll/CheckIn.js | 22 +++++-- .../Views/StuEnroll/GetArticles.cshtml | 2 +- .../Views/StuEnroll/GetArticles.js | 21 +++++-- .../Views/StuEnroll/GetCloth.cshtml | 2 +- .../Views/StuEnroll/GetCloth.js | 21 +++++-- .../Views/StuEnroll/GetClothSize.cshtml | 2 +- .../Views/StuEnroll/GetClothSize.js | 15 ++++- .../Views/StuEnroll/Index.js | 16 +++-- .../Views/StuEnroll/IndexHelpChange.cshtml | 2 +- .../Views/StuEnroll/IndexHelpChange.js | 62 ++++++++++++++++++- .../Views/StuEnroll/IsHelp.cshtml | 2 +- .../Views/StuEnroll/IsHelp.js | 13 +++- .../Views/StuEnroll/IsPay.cshtml | 2 +- .../Views/StuEnroll/IsPay.js | 15 ++++- .../Views/StuEnroll/IsPhoto.cshtml | 2 +- .../Views/StuEnroll/IsPhoto.js | 21 +++++-- .../Views/StuEnroll/Military.cshtml | 2 +- .../Views/StuEnroll/Military.js | 15 ++++- .../Views/StuEnroll/PayAfter.cshtml | 2 +- .../Views/StuEnroll/PayAfter.js | 21 +++++-- .../Views/StuEnroll/Report.cshtml | 2 +- .../Views/StuEnroll/Report.js | 13 +++- .../Views/StuEnroll/StuTuition.cshtml | 2 +- .../Views/StuEnroll/StuTuition.js | 17 +++-- .../Views/StuEnroll/StudentStatus.cshtml | 2 +- .../Views/StuEnroll/StudentStatus.js | 21 +++++-- 28 files changed, 259 insertions(+), 73 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs index dead205cf..4ea978478 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs +++ b/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); } - + /// + /// 获取年级（最大） + /// + /// + [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] diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.cshtml index 5a7f484cc..7cb4697f5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.cshtml @@ -24,7 +24,7 @@
学年
-
+
是否住宿
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js index bccc8784b..22f735063 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.cshtml index b7c63504a..a66878e2f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.cshtml @@ -24,7 +24,7 @@
学年
-
+
是否领取
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js index 58770a24c..af18e6e94 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.cshtml index 5677d444e..8b4f8faed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.cshtml @@ -24,7 +24,7 @@
学年
-
+
是否领取军训服
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js index 9c4781565..768eb4f7b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.cshtml index b82cd0eb5..7dac806f0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.cshtml @@ -24,7 +24,7 @@
学年
-
+
是否量校服尺寸
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js index e21eac40d..57ea27d54 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js index 87a783068..986f26210 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml index f8187699f..1e525f361 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.cshtml @@ -24,7 +24,7 @@
学年
-
+
@*
是否资助
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.js index 0335e88e8..88808493a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IndexHelpChange.js +++ b/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 () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.cshtml index 8fd784cdb..1bf016549 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.cshtml @@ -24,7 +24,7 @@
学年
-
+
@*
是否资助
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js index f55c0a5db..3d9f8fb5b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsHelp.js +++ b/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) }); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml index 5235b7d12..9461e4bc1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.cshtml @@ -97,7 +97,7 @@
学年
-
+
是否缴费
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js index d870739d2..79c529751 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.cshtml index cdb1d9400..c568d7e95 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.cshtml @@ -24,7 +24,7 @@
学年
-
+
是否拍照
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js index d3f87b190..9c4e4d606 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.cshtml index d75e406b5..26a636a95 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.cshtml @@ -26,7 +26,7 @@
学年
-
+
是否军训
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js index 0c68d64a5..9605eafdf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js +++ b/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)); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.cshtml index dfe2eb733..b147bab32 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.cshtml @@ -24,7 +24,7 @@
学年
-
+
是否军训
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js index 77163f161..abb9c443b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml index 1cc583b92..0005700bc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.cshtml @@ -24,7 +24,7 @@
学年
-
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js index 2e64ef64a..5048c2b27 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js +++ b/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) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.cshtml index 25db3aa53..1a10a4835 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.cshtml @@ -24,7 +24,7 @@
学年
-
+
免学费
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js index 933e932e2..b2a36d196 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js +++ b/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)); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.cshtml index 66e722f3f..5c76ddb4c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.cshtml @@ -24,7 +24,7 @@
学年
-
+
身份证
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js index cca6f98c2..8445c61db 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StudentStatus.js +++ b/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) }); } };