diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs index cecc15137..f699ac48a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs @@ -47,6 +47,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 表单查看页 + /// + /// + [HttpGet] + public ActionResult Formbefore() + { + return View(); + } + /// + /// 表单查看页 + /// + /// + [HttpGet] + public ActionResult Formafter() + { + return View(); + } #endregion #region 获取数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml index 14626a53b..d2f7a5b15 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml @@ -39,7 +39,13 @@
班级*
- +
转出学校
+
学籍新安排
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js index 1334b21eb..24033455e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js @@ -108,6 +108,38 @@ var bootstrap = function ($, learun) { }); } }); + // 异动前学籍信息 + $('#lr_before').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + learun.layerForm({ + id: 'form', + title: '异动前学籍信息', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/Formbefore?keyValue=' + keyValue, + width: 800, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + }, + btn: null + }); + }); + // 异动后学籍信息 + $('#lr_after').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '异动前学籍信息', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/Formafter?keyValue=' + keyValue, + width: 800, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + }, + btn: null + }); + } + }); }, // 初始化列表 initGird: function () { @@ -222,6 +254,8 @@ var bootstrap = function ($, learun) { { label: "创建用户", name: "CreateUserId", width: 100, align: "left" }, { label: "审核时间", name: "CheckTime", width: 130, align: "left" }, { label: "审核用户", name: "CheckUserId", width: 100, align: "left" }, + { label: "转出学校", name: "OutSchool", width: 200, align: "left" }, + { label: "备注", name: "StuChangeRemark", width: 200, align: "left" }, { label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 75b9fc77e..a3adf6926 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1078,6 +1078,8 @@ + + @@ -7551,6 +7553,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs index 4e04ce9f7..b58c8c2b2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期:2019-10-28 11:48 /// 描 述:学籍异动 ///
- public class StuInfoBasicChangeEntity + public class StuInfoBasicChangeEntity { #region 实体成员 /// @@ -99,6 +99,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("CHECKSTATUS")] public int? CheckStatus { get; set; } + /// + /// 转出学校 + /// + [Column("OUTSCHOOL")] + public string OutSchool { get; set; } #endregion #region 扩展操作