提交代码

This commit is contained in:
2024-03-18 09:08:16 +08:00
parent 1210be8ad0
commit b925c6d1e7
49 changed files with 4765 additions and 2387 deletions
@@ -22,6 +22,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
set { ViewState["DecisionId"] = value; }
}
/// <summary>
/// 子系统主键
/// </summary>
public string SubSystemId
{
get { return (string)ViewState["SubSystemId"]; }
set { ViewState["SubSystemId"] = value; }
}
/// <summary>
/// 是否查看
/// </summary>
@@ -45,6 +54,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
if (!IsPostBack)
{
this.DecisionId = Request["DecisionId"];
this.SubSystemId = Request["SubSystemId"];
//是否查看
this.IsView = string.IsNullOrWhiteSpace(Request["IsView"]) ? false : bool.Parse(Request["IsView"]);
//数据绑定
@@ -242,6 +252,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
model = new PreRun_SubThreeChecksFourDecision();
model.DecisionId = this.DecisionId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.SubSystemId = this.SubSystemId;
}
model.ResponsibilityUser = ddlResponsibilityUser.SelectedValue;
model.ProposeUser = ddlProposeUser.SelectedValue;
@@ -257,6 +268,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
model.AddUser = this.CurrUser.LoginProjectId;
model.AddTime = DateTime.Now;
model.ResponsibilityProposeSatate = 0;
model.DecisionIsClose = 0;
if (isAdd)
{
Funs.DB.PreRun_SubThreeChecksFourDecision.InsertOnSubmit(model);
@@ -221,7 +221,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void btnAdd_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SubThreeChecksFourDecisionEdit.aspx?DecisionId=", "新增 - ")));
if (string.IsNullOrWhiteSpace(tvControlItem.SelectedNodeID))
{
Alert.ShowInTop("请选择子系统!", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SubThreeChecksFourDecisionEdit.aspx?DecisionId=&SubSystemId=" + this.SsubSystemId, "新增 - ")));
}
/// <summary>
@@ -244,7 +249,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
return;
}
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SubThreeChecksFourDecisionEdit.aspx?DecisionId={0}", Grid1.SelectedRowID, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SubThreeChecksFourDecisionEdit.aspx?DecisionId={0}&SubSystemId={1}", Grid1.SelectedRowID, this.SsubSystemId, "编辑 - ")));
}
/// <summary>
@@ -800,8 +805,17 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var result = string.Empty;
var diffDay = 0;
var itemState = 0;
if (diffDayVal != null) diffDay = int.Parse(diffDayVal.ToString());
if (stateVal != null) itemState = int.Parse(stateVal.ToString());
if (diffDayVal != null)
{
if (!string.IsNullOrWhiteSpace(diffDayVal.ToString()))
{
diffDay = int.Parse(diffDayVal.ToString());
}
}
if (stateVal != null)
{
if (!string.IsNullOrWhiteSpace(stateVal.ToString())) itemState = int.Parse(stateVal.ToString());
}
if (itemState != 1)
{
if (diffDay > 0)