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

质量数据界面逻辑优化

Browse Source
This commit is contained in:
夏菊
2026-05-12 09:52:48 +08:00
parent fdb5ec508d
commit 225f83a88d
12 changed files with 31 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs
+6 -1
View File
@@ -33,6 +33,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
{ {
list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim())); list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim()));
} }
string projectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrWhiteSpace(projectId))
{
list = list.Where(x => x.ProjectId == projectId);
}
int count = list.Count(); int count = list.Count();
list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
@@ -148,7 +153,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
{ {
string rowID = Grid1.DataKeys[rowIndex][0].ToString(); string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var model = BLL.Project_CQMSDataService.GetProject_CQMSData_CQMSById(rowID); var model = BLL.Project_CQMSDataService.GetProject_CQMSData_CQMSById(rowID);
if (model!=null) if (model != null)
{ {
BLL.Project_CQMSDataService.DeleteProject_CQMSData_CQMSById(rowID); BLL.Project_CQMSDataService.DeleteProject_CQMSData_CQMSById(rowID);
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx
+2 -2
View File
@@ -153,9 +153,9 @@
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server"> <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items> <Items>
<f:ToolbarFill runat="server"></f:ToolbarFill> <f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" Text="保存" runat="server" ValidateForms="SimpleForm1" <%--<f:Button ID="btnSave" Icon="SystemSave" Text="保存" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSave_Click"> OnClick="btnSave_Click">
</f:Button> </f:Button>--%>
<%--<f:Button ID="btnSyn" Icon="TableMultiple" Text="上报" runat="server" ValidateForms="SimpleForm1" <%--<f:Button ID="btnSyn" Icon="TableMultiple" Text="上报" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSyn_Click"> OnClick="btnSyn_Click">
</f:Button>--%> </f:Button>--%>
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs
+2 -2
View File
@@ -44,7 +44,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
{ {
this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
////权限按钮方法 ////权限按钮方法
this.GetButtonPower(); //this.GetButtonPower();
this.Id = Request.Params["Id"]; this.Id = Request.Params["Id"];
if (!string.IsNullOrEmpty(this.Id)) if (!string.IsNullOrEmpty(this.Id))
{ {
@@ -265,7 +265,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
{ {
if (buttonList.Contains(BLL.Const.BtnSave)) if (buttonList.Contains(BLL.Const.BtnSave))
{ {
this.btnSave.Hidden = false; //this.btnSave.Hidden = false;
} }
} }
} }
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.designer.cs
Generated
-9
View File
@@ -338,15 +338,6 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar1; protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary> /// <summary>
/// btnClose 控件。 /// btnClose 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs
+5
View File
@@ -36,6 +36,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
{ {
list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim())); list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim()));
} }
string projectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrWhiteSpace(projectId))
{
list = list.Where(x => x.ProjectId == projectId);
}
int count = list.Count(); int count = list.Count();
list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx
+2 -2
View File
@@ -83,9 +83,9 @@
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server"> <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items> <Items>
<f:ToolbarFill runat="server"></f:ToolbarFill> <f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" Text="保存" runat="server" ValidateForms="SimpleForm1" <%--<f:Button ID="btnSave" Icon="SystemSave" Text="保存" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSave_Click"> OnClick="btnSave_Click">
</f:Button> </f:Button>--%>
<%--<f:Button ID="btnSyn" Icon="TableMultiple" Text="上报" runat="server" ValidateForms="SimpleForm1" <%--<f:Button ID="btnSyn" Icon="TableMultiple" Text="上报" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSyn_Click"> OnClick="btnSyn_Click">
</f:Button>--%> </f:Button>--%>
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs
+2 -2
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
{ {
this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
////权限按钮方法 ////权限按钮方法
this.GetButtonPower(); //this.GetButtonPower();
this.Id = Request.Params["Id"]; this.Id = Request.Params["Id"];
BLL.Base_DefectService.InitDefectDropDownList(DropDefect, false, null); BLL.Base_DefectService.InitDefectDropDownList(DropDefect, false, null);
if (!string.IsNullOrEmpty(this.Id)) if (!string.IsNullOrEmpty(this.Id))
@@ -225,7 +225,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
{ {
if (buttonList.Contains(BLL.Const.BtnSave)) if (buttonList.Contains(BLL.Const.BtnSave))
{ {
this.btnSave.Hidden = false; //this.btnSave.Hidden = false;
} }
} }
} }
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.designer.cs
Generated
-9
View File
@@ -176,15 +176,6 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar1; protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary> /// <summary>
/// btnClose 控件。 /// btnClose 控件。
/// </summary> /// </summary>
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs
+5
View File
@@ -36,6 +36,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
{ {
list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim())); list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim()));
} }
string projectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrWhiteSpace(projectId))
{
list = list.Where(x => x.ProjectId == projectId);
}
int count = list.Count(); int count = list.Count();
list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx
+2 -2
View File
@@ -309,9 +309,9 @@
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server"> <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items> <Items>
<f:ToolbarFill runat="server"></f:ToolbarFill> <f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" Text="保存" runat="server" ValidateForms="SimpleForm1" <%--<f:Button ID="btnSave" Icon="SystemSave" Text="保存" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSave_Click"> OnClick="btnSave_Click">
</f:Button> </f:Button>--%>
<%--<f:Button ID="btnSyn" Icon="TableMultiple" Text="上报" runat="server" ValidateForms="SimpleForm1" <%--<f:Button ID="btnSyn" Icon="TableMultiple" Text="上报" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSyn_Click"> OnClick="btnSyn_Click">
</f:Button>--%> </f:Button>--%>
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs
+2 -2
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
{ {
this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
////权限按钮方法 ////权限按钮方法
this.GetButtonPower(); //this.GetButtonPower();
this.Id = Request.Params["Id"]; this.Id = Request.Params["Id"];
BLL.RectifyService.InitRectifyDropDownList(DropTypeName, false, null); BLL.RectifyService.InitRectifyDropDownList(DropTypeName, false, null);
if (!string.IsNullOrEmpty(this.Id)) if (!string.IsNullOrEmpty(this.Id))
@@ -549,7 +549,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
{ {
if (buttonList.Contains(BLL.Const.BtnSave)) if (buttonList.Contains(BLL.Const.BtnSave))
{ {
this.btnSave.Hidden = false; //this.btnSave.Hidden = false;
} }
} }
} }
SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.designer.cs
Generated
-9
View File
@@ -770,15 +770,6 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync
/// </remarks> /// </remarks>
protected global::FineUIPro.Toolbar Toolbar1; protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary> /// <summary>
/// btnClose 控件。 /// btnClose 控件。
/// </summary> /// </summary>