diff --git a/.gitignore b/.gitignore index d97eb9a0c..6ca799005 100644 --- a/.gitignore +++ b/.gitignore @@ -75,4 +75,4 @@ typings/ unpackage Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js -/Learun.Framework.Ultimate V7/Learun.Application.Web/Resource/System/20200831 +/Learun.Framework.Ultimate V7/Learun.Application.Web/Resource/ 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 531c6b0f3..bc383c9b5 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 @@ -339,7 +339,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.SqlParameter = ' AND IsReport=1'; + //param.SqlParameter = ' AND IsReport=1'; param.Grade = "20"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } 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 a56f27751..585ceb6ae 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 @@ -369,7 +369,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.SqlParameter = ' AND IsReport=1'; + //param.SqlParameter = ' AND IsReport=1'; param.Grade = "20"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } 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 af0456399..66730095d 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 @@ -347,7 +347,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.SqlParameter = ' AND IsCheckIn IS NOT NULL AND IsSubsidize1 IS NOT NULL'; + //param.SqlParameter = ' AND IsCheckIn IS NOT NULL AND IsSubsidize1 IS NOT NULL'; param.Grade = "20"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } 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 bdf41d5e4..d9e42d802 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 @@ -292,7 +292,7 @@ var bootstrap = function ($, learun) { search: function (param) { param = param || {}; //param.SqlParameter = " AND IsPay ='true'"; - param.Grade = "20"; + //param.Grade = "20"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; 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 ece145fe3..69980a6ab 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 @@ -347,7 +347,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.SqlParameter = ' AND IsReport=1'; + //param.SqlParameter = ' AND IsReport=1'; param.Grade = "20"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } 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 eb1db6ecd..be58969c5 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 @@ -423,7 +423,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.SqlParameter = ' AND IsReport=1'; + //param.SqlParameter = ' AND IsReport=1'; param.Grade = "20"; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }