diff --git a/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceTemplate.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceTemplate.Dto.Base.cs
index 6e2f3650..0a8c421c 100644
--- a/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceTemplate.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghrp/Ghrp_PerformanceTemplate.Dto.Base.cs
@@ -41,7 +41,7 @@ namespace Tiobon.Core.Model.Models
///
/// 考核周期类别ID
///
- public int? PerformancePeriodTypeID { get; set; }
+ public long? PerformancePeriodTypeID { get; set; }
///
/// 考核周期类别编号
@@ -58,7 +58,7 @@ namespace Tiobon.Core.Model.Models
///
/// 考核对象
///
- public int? StaffGroupID { get; set; }
+ public long? StaffGroupID { get; set; }
///
/// 总分
diff --git a/Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceTemplate.cs b/Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceTemplate.cs
index 8e6bf882..20b9636f 100644
--- a/Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceTemplate.cs
+++ b/Tiobon.Core.Model/Models/Ghrp/Ghrp_PerformanceTemplate.cs
@@ -43,7 +43,7 @@ namespace Tiobon.Core.Model.Models
///
/// 考核周期类别ID
///
- public int? PerformancePeriodTypeID { get; set; }
+ public long? PerformancePeriodTypeID { get; set; }
///
/// 考核周期类别编号
@@ -60,7 +60,7 @@ namespace Tiobon.Core.Model.Models
///
/// 考核对象
///
- public int? StaffGroupID { get; set; }
+ public long? StaffGroupID { get; set; }
///
/// 总分
diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs
index 0f6cd241..09916c96 100644
--- a/Tiobon.Core.Services/CommonServices.cs
+++ b/Tiobon.Core.Services/CommonServices.cs
@@ -2470,7 +2470,7 @@ public partial class CommonServices : BaseServices>, ICommon
result.DT_Procedure.ExportExcel = result.DT_Procedure.EditProcedure.Replace("QueryGroupForm", "ExportGroupExcel");
break;
- case "F_PerformancePeriodType":
+ case "F_PerformancePeriodType":
case "F_GhraStaffGroup":
toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault();
if (toolbar != null) toolbar.fnKey = "TBD1YN";
@@ -2491,7 +2491,7 @@ public partial class CommonServices : BaseServices>, ICommon
icon = "ghr-preview",
position = "left"
});
-
+
break;
case "F_PerformancePeriod":
result.JM_PageControlT1.Toolbar.Insert(0, new Toolbar()
@@ -2504,6 +2504,26 @@ public partial class CommonServices : BaseServices>, ICommon
position = "left"
});
break;
+ case "F_PerformanceTemplate":
+ result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+ {
+ display = true,
+ fnKey = "TBD1YN",
+ fnTitle = "模板设计",
+ fnType = "row",
+ icon = "ghr-icon-form-config",
+ position = "left"
+ });
+ result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+ {
+ display = true,
+ fnKey = "TBD2YN",
+ fnTitle = "流程设计",
+ fnType = "row",
+ icon = "ghr-icon-flow-design",
+ position = "left"
+ });
+ break;
}
#endregion
diff --git a/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs b/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs
index 7b72144a..d6f6d891 100644
--- a/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs
+++ b/Tiobon.Core.Services/Ghrp/Ghrp_PerformanceTemplateServices.cs
@@ -28,12 +28,14 @@ namespace Tiobon.Core.Services
result.result.DT_TableDataT1.ForEach(async x =>
{
- x.StageItem = await GetParaLabel("PerformanceStageItem", x.StageItem);
- x.MGShowType = await GetParaLabelListString("Performance", "PerformanceMGShowType", x.MGShowType);
- x.TemplateType = await GetParaLabelListString("Performance", "PerformanceTemplateType", x.TemplateType);
- x.StaffGroupName = Db.Ado.GetString("select StaffGroupName from Ghra_StaffGroup where StaffGroupID=@StaffGroupID"
+ x.StageItem = await GetParaLabel("PerformanceStageItem", x.StageItem);
+ x.MGShowType = await GetParaLabel("PerformanceMGShowType", x.MGShowType);
+ x.TemplateType = await GetParaLabel("PerformanceTemplateType", x.TemplateType);
+ //x.MGShowType = await GetParaLabelListString("Performance", "PerformanceMGShowType", x.MGShowType);
+ //x.TemplateType = await GetParaLabelListString("Performance", "PerformanceTemplateType", x.TemplateType);
+ x.StaffGroupName = Db.Ado.GetString("select StaffGroupName from Ghra_StaffGroup where ID=@StaffGroupID"
, new { StaffGroupID = x.StaffGroupID });
- x.PeriodTypeName = Db.Ado.GetString("select PeriodTypeName from Ghrp_PerformancePeriodType where PerformancePeriodTypeID=@PerformancePeriodTypeID"
+ x.PeriodTypeName = Db.Ado.GetString("select PeriodTypeName from Ghrp_PerformancePeriodType where ID=@PerformancePeriodTypeID"
, new { PerformancePeriodTypeID = x.PerformancePeriodTypeID });
});
return result;
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 05dbbf3d..5e162309 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -16630,6 +16630,151 @@
考核阶段名称
+
+
+ 考核模板 (Dto.Base)
+
+
+
+
+ 考核模板编号
+
+
+
+
+ 考核模板名称
+
+
+
+
+ 考核周期类别ID
+
+
+
+
+ 考核周期类别编号
+
+
+
+
+ 考核阶段
+
+
+
+
+ 考核对象
+
+
+
+
+ 总分
+
+
+
+
+ 表单是否允许超过总分
+
+
+
+
+ 考核模板权重
+
+
+
+
+ 考核阶数（含本人）
+
+
+
+
+ 考核主管显示方式
+
+
+
+
+ 模板类型
+
+
+
+
+ 备注
+
+
+
+
+ 排序
+
+
+
+
+ 默认标志
+
+
+
+
+ 预留字段1
+
+
+
+
+ 预留字段2
+
+
+
+
+ 预留字段3
+
+
+
+
+ 预留字段4
+
+
+
+
+ 预留字段5
+
+
+
+
+ 预留字段6
+
+
+
+
+ 预留字段7
+
+
+
+
+ 预留字段8
+
+
+
+
+ 预留字段9
+
+
+
+
+ 预留字段10
+
+
+
+
+ 预留字段11
+
+
+
+
+ 预留字段12
+
+
+
+
+ 内置
+
+
Ghrs_Attachment (Dto.Base)
@@ -18882,6 +19027,11 @@
考核周期类别 (Dto.EditInput)
+
+
+ 考核模板 (Dto.EditInput)
+
+
Ghrs_Attachment (Dto.EditInput)
@@ -19553,6 +19703,11 @@
考核周期类别 (Dto.InsertInput)
+
+
+ 考核模板 (Dto.InsertInput)
+
+
Ghrs_Attachment (Dto.InsertInput)
@@ -36412,6 +36567,151 @@
内置
+
+
+ 考核模板 (Model)
+
+
+
+
+ 考核模板编号
+
+
+
+
+ 考核模板名称
+
+
+
+
+ 考核周期类别ID
+
+
+
+
+ 考核周期类别编号
+
+
+
+
+ 考核阶段
+
+
+
+
+ 考核对象
+
+
+
+
+ 总分
+
+
+
+
+ 表单是否允许超过总分
+
+
+
+
+ 考核模板权重
+
+
+
+
+ 考核阶数（含本人）
+
+
+
+
+ 考核主管显示方式
+
+
+
+
+ 模板类型
+
+
+
+
+ 备注
+
+
+
+
+ 排序
+
+
+
+
+ 默认标志
+
+
+
+
+ 预留字段1
+
+
+
+
+ 预留字段2
+
+
+
+
+ 预留字段3
+
+
+
+
+ 预留字段4
+
+
+
+
+ 预留字段5
+
+
+
+
+ 预留字段6
+
+
+
+
+ 预留字段7
+
+
+
+
+ 预留字段8
+
+
+
+
+ 预留字段9
+
+
+
+
+ 预留字段10
+
+
+
+
+ 预留字段11
+
+
+
+
+ 预留字段12
+
+
+
+
+ 内置
+
+
Ghrs_Attachment (Model)
@@ -41538,6 +41838,21 @@
考核阶段名称
+
+
+ 考核模板(Dto.View1)
+
+
+
+
+ 创建信息
+
+
+
+
+ 修改信息
+
+
Ghrs_Attachment(Dto.View)
diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml
index 585a5ae0..5ee6772c 100644
--- a/Tiobon.Core/Tiobon.Core.xml
+++ b/Tiobon.Core/Tiobon.Core.xml
@@ -2393,6 +2393,11 @@
阶段
+
+
+ 考核模板(Controller)
+
+
Ghrs_Attachment(Controller)