diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Index.js index ab80190b7..36b609952 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Index.js @@ -101,11 +101,12 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/GetPageList', headData: [ { label: "学生", name: "StuName", width: 200, align: "left"}, { label: "学生学号", name: "StuNo", width: 200, align: "left"}, + { label: "身份证号", name: "IdentityCardNo", width: 200, align: "left"}, { label: "班级", name: "ClassNo", width: 200, align: "left" , formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Indexzxj.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Indexzxj.js index 0e96d3370..d198c7997 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Indexzxj.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Scholarshipxj/Indexzxj.js @@ -116,11 +116,12 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/Scholarshipxj/GetPageList', headData: [ { label: "学生", name: "StuName", width: 200, align: "left"}, - { label: "学生学号", name: "StuNo", width: 200, align: "left"}, + { label: "学生学号", name: "StuNo", width: 200, align: "left" }, + { label: "身份证号", name: "IdentityCardNo", width: 200, align: "left" }, { label: "班级", name: "ClassNo", width: 200, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjEntity.cs index 688f474c1..d4f8c2eb2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjEntity.cs @@ -109,6 +109,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion #region 扩展字段 + [NotMapped] + public string IdentityCardNo { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjService.cs index 563ffadfb..2c5d99c23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Scholarshipzxj/ScholarshipxjService.cs @@ -31,7 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" t.* "); + strSql.Append(@" t.*,s.IdentityCardNo "); strSql.Append(" FROM ScholarshipAudit t "); strSql.Append(" left join StuInfoBasic s on t.StuNo=s.StuNo "); strSql.Append(" WHERE 1=1 ");