From 30fb3f120f0fd4381edf67645a3b9efe400025c9 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 14 May 2024 09:59:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=A9=E6=95=88=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=20=E4=B8=AD=E9=80=94=E5=8F=96?= =?UTF-8?q?=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/JobPerformance/Form.cshtml | 14 +++++++++++++- .../Views/JobPerformance/Index.js | 7 +++++-- .../Views/JobPerformance/IndexMy.js | 9 ++++++--- .../Views/JobPerformance/IndexPrint.js | 10 ++++++---- .../JobPerformance/JobPerformanceEntity.cs | 18 ++++++++++++++++++ .../JobPerformance/JobPerformanceService.cs | 3 +++ 6 files changed, 51 insertions(+), 10 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/Form.cshtml index b2eaeb2dc..a1a042d01 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/Form.cshtml @@ -21,7 +21,7 @@
处室
-
+
姓名*
@@ -195,5 +195,17 @@
假期工作绩效
+ @*
+
带队实习
+ +
+
+
慰问学生
+ +
+
+
总计
+ +
*@
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/JobPerformance/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/Index.js index 82aba2612..706db492a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/Index.js @@ -221,8 +221,11 @@ var bootstrap = function ($, learun) { ] }, { label: '月绩效考核分合计', name: 'PerformanceTotalScore', width: 110, align: "left", statistics: true }, - { label: '假期工作绩效', name: 'HolidayJobPerformance', width: 90, align: "center", statistics: true }, - + { label: '假期工作绩效', name: 'HolidayJobPerformance', width: 90, align: "center", statistics: true }, + //{ label: '带队实习', name: 'LeadInternshipTeam', width: 110, align: "left", statistics: true }, + //{ label: '慰问学生', name: 'CondoleStudent', width: 110, align: "left", statistics: true }, + //{ label: '总计', name: 'Aggregate', width: 110, align: "left", statistics: true }, + ], mainId: 'Id', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/IndexMy.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/IndexMy.js index 926150cef..2ccf9fc18 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/IndexMy.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/IndexMy.js @@ -111,7 +111,7 @@ var bootstrap = function ($, learun) { { label: '大型活动考核扣减分', name: 'BigActivityMinusScore', width: 120, align: "left", statistics: true }, { label: '旷工天数', name: 'AbsenteeismDay', width: 90, align: "left", statistics: true }, { label: '旷工扣减分', name: 'AbsenteeismMinusScore', width: 90, align: "left", statistics: true }, - { label: '出勤(病事公产活动等)考核情况说明', name: 'WorkRemark', width: 200, align: "left"}, + { label: '出勤(病事公产活动等)考核情况说明', name: 'WorkRemark', width: 200, align: "left" }, ] }, { @@ -119,11 +119,14 @@ var bootstrap = function ($, learun) { children: [ { label: '常规工作考核基础分', name: 'RoutineBasicScore', width: 120, align: "left", statistics: true }, { label: '常规工作考核扣减分', name: 'RoutineMinusScore', width: 120, align: "left", statistics: true }, - { label: '常规工作考核情况详细说明', name: 'RoutineRemark', width: 160, align: "left"}, + { label: '常规工作考核情况详细说明', name: 'RoutineRemark', width: 160, align: "left" }, ] }, { label: '月绩效考核分合计', name: 'PerformanceTotalScore', width: 110, align: "left", statistics: true }, - { label: '假期工作绩效', name: 'HolidayJobPerformance', width: 90, align: "center", statistics: true }, + { label: '假期工作绩效', name: 'HolidayJobPerformance', width: 90, align: "center", statistics: true}, + //{ label: '带队实习', name: 'LeadInternshipTeam', width: 110, align: "left", statistics: true }, + //{ label: '慰问学生', name: 'CondoleStudent', width: 110, align: "left", statistics: true }, + //{ label: '总计', name: 'Aggregate', width: 110, align: "left", statistics: true }, ], mainId: 'Id', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/IndexPrint.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/IndexPrint.js index 32d7546f7..5c9df81b7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/IndexPrint.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/IndexPrint.js @@ -223,13 +223,15 @@ var bootstrap = function ($, learun) { { label: '大型活动考核扣减分', name: 'BigActivityMinusScore', width: 120, align: "left", statistics: true }, { label: '旷工天数', name: 'AbsenteeismDay', width: 90, align: "left", statistics: true }, { label: '旷工扣减分', name: 'AbsenteeismMinusScore', width: 90, align: "left", statistics: true }, - { label: '出勤(病事公产活动等)考核情况说明', name: 'WorkRemark', width: 200, align: "left", statistics: true }, + { label: '出勤(病事公产活动等)考核情况说明', name: 'WorkRemark', width: 200, align: "left" }, { label: '常规工作考核基础分', name: 'RoutineBasicScore', width: 120, align: "left", statistics: true }, { label: '常规工作考核扣减分', name: 'RoutineMinusScore', width: 120, align: "left", statistics: true }, - { label: '常规工作考核情况详细说明', name: 'RoutineRemark', width: 160, align: "left", statistics: true }, + { label: '常规工作考核情况详细说明', name: 'RoutineRemark', width: 160, align: "left"}, { label: '月绩效考核分合计', name: 'PerformanceTotalScore', width: 110, align: "left", statistics: true }, - { label: '假期工作绩效', name: 'HolidayJobPerformance', width: 90, align: "center", statistics: true }, - + { label: '假期工作绩效', name: 'HolidayJobPerformance', width: 90, align: "center", statistics: true}, + //{ label: '带队实习', name: 'LeadInternshipTeam', width: 110, align: "left", statistics: true }, + //{ label: '慰问学生', name: 'CondoleStudent', width: 110, align: "left", statistics: true }, + //{ label: '总计', name: 'Aggregate', width: 110, align: "left", statistics: true }, ], mainId: 'Id', diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/JobPerformance/JobPerformanceEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/JobPerformance/JobPerformanceEntity.cs index 84e708be3..48c832732 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/JobPerformance/JobPerformanceEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/JobPerformance/JobPerformanceEntity.cs @@ -278,6 +278,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("HOLIDAYJOBPERFORMANCE")] public string HolidayJobPerformance { get; set; } + ///// + ///// 带队实习 + ///// + ///// + //[Column("LEADINTERNSHIPTEAM")] + //public decimal? LeadInternshipTeam { get; set; } + ///// + ///// 慰问学生 + ///// + ///// + //[Column("CONDOLESTUDENT")] + //public decimal? CondoleStudent { get; set; } + ///// + ///// 总计 + ///// + ///// + //[Column("AGGREGATE")] + //public decimal? Aggregate { get; set; } /// /// CreateUser /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/JobPerformance/JobPerformanceService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/JobPerformance/JobPerformanceService.cs index 9671c5f01..a7066bc44 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/JobPerformance/JobPerformanceService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/JobPerformance/JobPerformanceService.cs @@ -376,6 +376,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration RoutineRemark = dr[40].ToString(), PerformanceTotalScore = dr[41].ToDecimalOrNull(), HolidayJobPerformance = dr[42].ToString(), + //LeadInternshipTeam = dr[43].ToDecimalOrNull(), + //CondoleStudent = dr[44].ToDecimalOrNull(), + //Aggregate = dr[45].ToDecimalOrNull(), CreateUser = LoginUserInfo.Get().userId, CreateTime = DateTime.Now, F_EnabledMark = "0"