diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs index a5cc5e82..e4d7df79 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Linq; namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { - public partial class Project_CQMSData_CQMS : PageBase + public partial class Project_CQMSData_CQMS : PageBase { protected void Page_Load(object sender, EventArgs e) @@ -33,6 +33,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { 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(); list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); @@ -101,7 +106,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("Project_CQMSData_CQMSEdit.aspx?Id={0}", string.Empty, "增加 - "))); - + } @@ -148,12 +153,12 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { string rowID = Grid1.DataKeys[rowIndex][0].ToString(); var model = BLL.Project_CQMSDataService.GetProject_CQMSData_CQMSById(rowID); - if (model!=null) + if (model != null) { BLL.Project_CQMSDataService.DeleteProject_CQMSData_CQMSById(rowID); } - + } BindGrid(); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx index 149b75ff..06787f0e 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx @@ -153,9 +153,9 @@ - - + --%> <%-- --%> diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs index a6170fb2..b5c556b6 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs @@ -44,7 +44,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); ////权限按钮方法 - this.GetButtonPower(); + //this.GetButtonPower(); this.Id = Request.Params["Id"]; if (!string.IsNullOrEmpty(this.Id)) { @@ -265,7 +265,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnSave)) { - this.btnSave.Hidden = false; + //this.btnSave.Hidden = false; } } } diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.designer.cs index 21722d3a..c8ece09b 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.designer.cs @@ -338,15 +338,6 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// protected global::FineUIPro.Toolbar Toolbar1; - /// - /// btnSave 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSave; - /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs index cdba51a3..ac050eb1 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs @@ -36,6 +36,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { 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(); list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx index 681ba7b6..a982f9bd 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx @@ -83,9 +83,9 @@ - - + --%> <%-- --%> diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs index 259c4012..e109c0f7 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); ////权限按钮方法 - this.GetButtonPower(); + //this.GetButtonPower(); this.Id = Request.Params["Id"]; BLL.Base_DefectService.InitDefectDropDownList(DropDefect, false, null); if (!string.IsNullOrEmpty(this.Id)) @@ -225,7 +225,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnSave)) { - this.btnSave.Hidden = false; + //this.btnSave.Hidden = false; } } } diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.designer.cs index a91df4b1..33094cab 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.designer.cs @@ -176,15 +176,6 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// protected global::FineUIPro.Toolbar Toolbar1; - /// - /// btnSave 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSave; - /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs index 46efcf63..333bfd64 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs @@ -36,6 +36,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { 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(); list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx index 897a6c27..d02e2146 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx @@ -309,9 +309,9 @@ - - + --%> <%-- --%> diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs index a1368364..4a4f9690 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); ////权限按钮方法 - this.GetButtonPower(); + //this.GetButtonPower(); this.Id = Request.Params["Id"]; BLL.RectifyService.InitRectifyDropDownList(DropTypeName, false, null); if (!string.IsNullOrEmpty(this.Id)) @@ -549,7 +549,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnSave)) { - this.btnSave.Hidden = false; + //this.btnSave.Hidden = false; } } } diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.designer.cs index 9eb768d6..a8007b76 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.designer.cs @@ -770,15 +770,6 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// protected global::FineUIPro.Toolbar Toolbar1; - /// - /// btnSave 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSave; - /// /// btnClose 控件。 ///