lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1兼容数智五环大屏，跳转方法调整

Browse Source
This commit is contained in:
夏菊
2026-06-09 19:35:12 +08:00
parent 6ccdec9b10
commit 855eec9965
24 changed files with 114 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ProjectData/ProjectInformation.aspx.cs
+2 -1
View File
@@ -81,7 +81,8 @@ namespace FineUIPro.Web.ProjectData
{
string url = "~/indexProject.aspx?projectId=" + this.tvControlItem.SelectedNode.NodeID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, this.tvControlItem.SelectedNode.NodeID);
PageContext.Redirect(url, "_top");
//PageContext.Redirect(url, "_top");
PageContext.Redirect(url);
}
else
{
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
+4 -2
View File
@@ -258,7 +258,8 @@ namespace FineUIPro.Web.ProjectData
{
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
PageContext.Redirect(url, "_top");
//PageContext.Redirect(url, "_top");
PageContext.Redirect(url);
}
else
{
@@ -277,7 +278,8 @@ namespace FineUIPro.Web.ProjectData
CurrUser.CompanyProjectId = string.Join(",", this.Grid1.SelectedRowIDArray);
}
PageContext.Redirect("~/index.aspx", "_top");
//PageContext.Redirect("~/index.aspx", "_top");
PageContext.Redirect("~/index.aspx");
}
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
+2 -1
View File
@@ -501,7 +501,8 @@ namespace FineUIPro.Web.ProjectData
{
string url = "~/indexProject.aspx?projectId=" + Grid1.SelectedRowID;
UserService.UpdateLastUserInfo(this.CurrUser.UserId, null, false, Grid1.SelectedRowID);
PageContext.Redirect(url, "_top");
//PageContext.Redirect(url, "_top");
PageContext.Redirect(url);
}
else
{
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
+1 -1
View File
@@ -75,7 +75,7 @@
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpMasterBox1" Label="集团主数据" EmptyText="请从下拉表格中选择集团主数据项目" DataControlID="Grid1"
EnableMultiSelect="false" MatchFieldWidth="false" ShowRedStar="true" Required="true" AutoPostBack="true" OnTextChanged="MasterData_Changed">
EnableMultiSelect="false" MatchFieldWidth="false" ShowRedStar="true" AutoPostBack="true" OnTextChanged="MasterData_Changed">
<PopPanel>
<f:Panel ID="Panel7" runat="server" BodyPadding="10px" Width="1280px" Height="520px" Hidden="true"
ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
+6 -6
View File
@@ -263,11 +263,11 @@ namespace FineUIPro.Web.ProjectData
ShowNotify($"已存在关联此主数据的项目：（{relatePro.ProjectCode}）{relatePro.ProjectName}！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify($"请选择关联集团主数据项目！", MessageBoxIcon.Warning);
return;
}
//else
//{
// ShowNotify($"请选择关联集团主数据项目！", MessageBoxIcon.Warning);
// return;
//}
this.SaveData();
}
@@ -319,7 +319,7 @@ namespace FineUIPro.Web.ProjectData
{
project.JTProjectCode = project.ProjectCode;
}
if (!string.IsNullOrWhiteSpace(this.drpMasterBox1.Text))
if (!string.IsNullOrWhiteSpace(this.drpMasterBox1.Value))
{
project.MasterSysId = this.drpMasterBox1.Value;
}