From e8c24460c48420a815418b97e55283c626a6ee76 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 25 Apr 2023 16:52:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=AF=B7=E5=81=87=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8E=BB=E5=90=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuLeaveManagement/CheckForm.cshtml | 4 ++++ .../Views/StuLeaveManagement/CheckIndex.js | 1 + .../Views/StuLeaveManagement/Form.cshtml | 4 ++++ .../Views/StuLeaveManagement/Index.js | 3 ++- .../StuLeaveManagement/StuLeaveManagementEntity.cs | 3 +++ 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml index 3e466ce5d..9ecc92635 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckForm.cshtml @@ -19,6 +19,10 @@
请假天数*
+
+
去向
+ +
请假事由
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js index 8820264b7..a54c5bb23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/CheckIndex.js @@ -92,6 +92,7 @@ var bootstrap = function ($, learun) { { label: "开始时间", name: "StartTime", width: 100, align: "left" }, { label: "结束时间", name: "EndTime", width: 100, align: "left" }, { label: "请假天数", name: "LeaveDay", width: 100, align: "left" }, + { label: "去向", name: "LeaveTo", width: 100, align: "left" }, { label: "请假事由", name: "LeaveReason", width: 100, align: "left" }, { label: "学号", name: "CreateUserNo", width: 100, align: "left" }, { label: "姓名", name: "CreateUserName", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml index 2ecde1b38..6208fb867 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Form.cshtml @@ -19,6 +19,10 @@
请假天数*
+
+
去向
+ +
请假事由
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js index d0d41a159..3790288cd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuLeaveManagement/Index.js @@ -77,7 +77,7 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuLeaveManagement/GetPageList', headData: [ { @@ -122,6 +122,7 @@ var bootstrap = function ($, learun) { { label: "开始时间", name: "StartTime", width: 100, align: "left" }, { label: "结束时间", name: "EndTime", width: 100, align: "left" }, { label: "请假天数", name: "LeaveDay", width: 100, align: "left" }, + { label: "去向", name: "LeaveTo", width: 100, align: "left" }, { label: "请假事由", name: "LeaveReason", width: 100, align: "left" }, { label: "学号", name: "CreateUserNo", width: 100, align: "left" }, { label: "姓名", name: "CreateUserName", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementEntity.cs index a55ce6d79..7cebdeddf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuLeaveManagement/StuLeaveManagementEntity.cs @@ -44,6 +44,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("LEAVEREASON")] public string LeaveReason { get; set; } + + [Column("LEAVETO")] + public string LeaveTo { get; set; } /// /// 申请人ID ///