工作绩效添加字段 中途取消

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/JobPerformance/Form.cshtml

@@ -21,7 +21,7 @@
         <div class="lr-form-item-title">处室</div>
         <input id="Department" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" >
+    <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
         <div id="EmpNo" checkexpession="NotNull" isvalid="yes"></div>
         <input id="EmpName" type="hidden" />
@@ -195,5 +195,17 @@
         <div class="lr-form-item-title">假期工作绩效</div>
         <input id="HolidayJobPerformance" type="text" class="form-control" />
     </div>
+    @*<div class="col-xs-4 lr-form-item">
+        <div class="lr-form-item-title">带队实习</div>
+        <input id="LeadInternshipTeam" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-4 lr-form-item">
+        <div class="lr-form-item-title">慰问学生</div>
+        <input id="CondoleStudent" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-4 lr-form-item">
+        <div class="lr-form-item-title">总计</div>
+        <input id="Aggregate" type="text" class="form-control" />
+    </div>*@
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/JobPerformance/Form.js")

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,

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,

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',

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
         /// <returns></returns> 
         [Column("HOLIDAYJOBPERFORMANCE")]
         public string HolidayJobPerformance { get; set; }
+        ///// <summary> 
+        ///// 带队实习 
+        ///// </summary> 
+        ///// <returns></returns> 
+        //[Column("LEADINTERNSHIPTEAM")]
+        //public decimal? LeadInternshipTeam { get; set; }
+        ///// <summary> 
+        ///// 慰问学生 
+        ///// </summary> 
+        ///// <returns></returns> 
+        //[Column("CONDOLESTUDENT")]
+        //public decimal? CondoleStudent { get; set; }
+        ///// <summary> 
+        ///// 总计 
+        ///// </summary> 
+        ///// <returns></returns> 
+        //[Column("AGGREGATE")]
+        //public decimal? Aggregate { get; set; }
         /// <summary> 
         /// CreateUser 
         /// </summary> 

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"