This commit is contained in:
geh
2026-09-14 15:58:12 +08:00
parent a815e09879
commit 77f61d7e06
128 changed files with 25181 additions and 960 deletions
@@ -223,27 +223,28 @@ namespace FineUIPro.Web.CQMS.Check
return "";
}
protected string ConvertRewardAndPunishType(object Type,object RewardAndPunishType)
protected string ConvertRewardAndPunishType(object Type, object RewardAndPunishType)
{
Model.Sys_Const model;
if (Type != null && Type.ToString() == "1")
{
model = Funs.DB.Sys_Const.FirstOrDefault(x => x.GroupId == "RewardType" && x.ConstValue == RewardAndPunishType.ToString());
model = Funs.DB.Sys_Const.FirstOrDefault(x => x.GroupId == BLL.ConstValue.Group_RewardType && x.ConstValue == RewardAndPunishType.ToString());
}
else
{
model = Funs.DB.Sys_Const.FirstOrDefault(x => x.GroupId == "PunishType" && x.ConstValue == RewardAndPunishType.ToString());
model = Funs.DB.Sys_Const.FirstOrDefault(x => x.GroupId == BLL.ConstValue.Group_PunishType && x.ConstValue == RewardAndPunishType.ToString());
}
if (model == null)
{
return "";
}
return model.ConstText;
}
protected string ConvertUnitName(object uintid)
{
if (uintid != null && !string.IsNullOrEmpty(uintid.ToString()))
@@ -337,7 +338,7 @@ namespace FineUIPro.Web.CQMS.Check
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(
String.Format("RewardAndPunishEdit.aspx?RewardAndPunishID={0}", codes, "编辑 - ")));
String.Format("RewardAndPunishEdit.aspx?RewardAndPunishID={0}&sysTemType={1}", codes, this.SysTemType, "编辑 - ")));
return;
}
}
@@ -432,16 +433,17 @@ namespace FineUIPro.Web.CQMS.Check
{
if (this.drpType.SelectedText == "奖励")
{
ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, "RewardType", true);
ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, BLL.ConstValue.Group_RewardType, true);
}
else
{
ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, "PunishType", true);
ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, BLL.ConstValue.Group_PunishType, true);
}
BindGrid();
}
protected string ConvertAttachFile(object rewardAndPunishID)
{
string fileUrl = "";