diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx index e5f09818..53b9a112 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx @@ -5,6 +5,11 @@ +
@@ -12,10 +17,9 @@ + AllowCellEditing="false" ClicksToEdit="1" OnRowCommand="Grid1_RowCommand" ExpandAllTreeNodes="true" EnableMultiSelect="false"> @@ -39,10 +43,17 @@ + + - + + + @@ -54,6 +65,10 @@ Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close" CloseAction="HidePostBack" Width="800px" Height="600px"> + public void DataBrid() { - string strSql = @"select a.ControlId,a.ProjectId,a.ParentId,a.ControlCode,a.ControlLevel,a.PlanId,a.PlanTypeId,a.SubItemsId,a.DetectionItems,a.BasedCriterion,a.QualityRecordName,a.RecordNumber,a.Subcontractors,a.OperateTime,a.Sort from Control_PointCropping as a order by a.ControlLevel,a.Sort asc"; + string strSql = @"select * from(select a.ControlId,a.ProjectId,a.ParentId,a.ControlCode,a.ControlLevel,a.PlanId,a.PlanTypeId,a.SubItemsId,a.DetectionItems,a.BasedCriterion,a.QualityRecordName,a.RecordNumber,a.Subcontractors,a.OperateTime,a.Sort,a.States,a.Partition from Control_PointCropping as a where isnull(a.ProjectId,'')='' "; + string strSql1 = "select a.ControlId,a.ProjectId,a.ParentId,a.ControlCode,a.ControlLevel,a.PlanId,a.PlanTypeId,a.SubItemsId,a.DetectionItems,a.BasedCriterion,a.QualityRecordName,a.RecordNumber,a.Subcontractors,a.OperateTime,a.Sort,a.States,a.Partition from Control_PointCropping as a where a.ProjectId=@ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); if (!string.IsNullOrEmpty(sDetectionItems.Text.Trim())) { strSql += " and a.DetectionItems like '%@DetectionItems%'"; + strSql1 += " and a.DetectionItems like '%@DetectionItems%'"; listStr.Add(new SqlParameter("@DetectionItems", this.sDetectionItems.Text.Trim())); } SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + var zxsql = strSql + " union all " + strSql1 + " ) as t order by t.ControlLevel,t.Sort asc"; + DataTable tb = SQLHelper.GetDataTableRunText(zxsql, parameter); Grid1.DataSource = tb; Grid1.DataBind(); } @@ -48,13 +52,17 @@ namespace FineUIPro.Web.CQMS.WBS.Control /// protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) { + string rowID = e.RowID; if (e.CommandName == "Delete") { - string rowID = e.RowID; DeleteRowByIDInternal(rowID); DataBrid(); ShowNotify("删除成功!"); } + else if (e.CommandName == "fileView") + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", "-1", rowID, Const.InspectTailTerm))); + } } /// @@ -62,11 +70,22 @@ namespace FineUIPro.Web.CQMS.WBS.Control /// protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) { - int controlLevel = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : 2; - if (controlLevel < 2) + if (Grid1.DataKeys[e.RowIndex][0].ToString() == "595fd674-ca2b-4557-a7c7-1be1096c3825") { - e.TreeNodeExpanded = true; + } + var states = int.Parse(Grid1.DataKeys[e.RowIndex][3].ToString()); + GridColumn isDelete = Grid1.FindColumn("Delete"); + if (states == 0) + { + e.CellAttributes[isDelete.ColumnIndex]["data-yc"] = "yc"; + } + + //int controlLevel = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : 2; + //if (controlLevel < 2) + //{ + // e.TreeNodeExpanded = true; + //} } #endregion @@ -94,6 +113,12 @@ namespace FineUIPro.Web.CQMS.WBS.Control foreach (int rowIndex in Grid1.SelectedRowIndexArray) { string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + var states = int.Parse(Grid1.DataKeys[rowIndex][3].ToString()); + if (states == 0) + { + ShowNotify("系统内置数据，无删除权限！"); + return; + } DeleteRowByIDInternal(rowID); } DataBrid(); @@ -141,8 +166,13 @@ namespace FineUIPro.Web.CQMS.WBS.Control ShowNotify("请选择一条数据!", MessageBoxIcon.Warning); return; } - var rowIndex = Grid1.SelectedRowIndex; + var states = int.Parse(Grid1.DataKeys[rowIndex][3].ToString()); + if (states == 0 && !IsEditdata()) + { + ShowNotify("系统内置数据，无编辑权限！"); + return; + } var rowId = Grid1.DataKeys[rowIndex][0].ToString(); var parentId = Grid1.DataKeys[rowIndex][1] != null ? Grid1.DataKeys[rowIndex][1].ToString() : string.Empty; PageContext.RegisterStartupScript(Window1.GetShowReference($"PointCroppingEdit.aspx?ControlId={rowId}&ParentId={parentId}", "编辑")); @@ -156,6 +186,13 @@ namespace FineUIPro.Web.CQMS.WBS.Control DataBrid(); } + /// + /// 附件关闭 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + } + /// /// 右击修改 /// @@ -203,6 +240,21 @@ namespace FineUIPro.Web.CQMS.WBS.Control } } + /// + /// 判断是否存在删除权限 + /// + /// + public bool IsEditdata() + { + var result = false; + var userids = new List() { Const.sysglyId, Const.hfnbdId, Const.sedinId }; + if (userids.Contains(this.CurrUser.UserId)) + { + result = true; + } + return result; + } + #endregion } diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx.designer.cs index ce3e993a..6fa0453c 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCropping.aspx.designer.cs @@ -122,6 +122,15 @@ namespace FineUIPro.Web.CQMS.WBS.Control /// protected global::FineUIPro.Window Window1; + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + /// /// Menu1 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx index 8f0773ff..97f11147 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx @@ -91,6 +91,19 @@ + + + + + + + + + + + + @@ -98,6 +111,10 @@ + diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.cs index c66699c7..0870848b 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.cs @@ -29,12 +29,32 @@ namespace FineUIPro.Web.CQMS.WBS.Control set { ViewState["ControlId"] = value; } } + /// + /// 主键 + /// + public string FId + { + get { return (string)ViewState["FId"]; } + set { ViewState["FId"] = value; } + } + + /// + /// 问题图片是否可编辑 + /// + public int FileImg + { + get { return (int)ViewState["FileImg"]; } + set { ViewState["FileImg"] = value; } + } + protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) { this.ControlId = Request.Params["ControlId"]; + this.FId = !string.IsNullOrWhiteSpace(this.ControlId) ? this.ControlId : Guid.NewGuid().ToString(); this.ParentId = Request.Params["ParentId"]; + this.FileImg = 0; //绑定数据 PageIn(); } @@ -125,19 +145,23 @@ namespace FineUIPro.Web.CQMS.WBS.Control protected void btnSave_Click(object sender, EventArgs e) { var model = new Control_PointCropping(); - model.ControlId = Guid.NewGuid().ToString(); + model.ControlId = this.FId; var oneControlId = string.Empty; var twoControlId = string.Empty; if (!string.IsNullOrWhiteSpace(this.ControlId)) { model = Funs.DB.Control_PointCropping.FirstOrDefault(p => p.ControlId == this.ControlId); } + else + { + model.States = 1; + model.ProjectId = CurrUser.LoginProjectId; + } if (model == null) { ShowNotify("传递参数错误!", MessageBoxIcon.Error); return; } - //model.ProjectId = CurrUser.LoginProjectId; if (!string.IsNullOrWhiteSpace(this.ParentId)) { var parenLs = GetAllCropping(this.ParentId); @@ -183,6 +207,14 @@ namespace FineUIPro.Web.CQMS.WBS.Control } + /// + /// 附件 + /// + protected void BtnFile_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", FileImg, this.FId, Const.InspectTailTerm))); + } + #region 私有方法 /// @@ -211,6 +243,15 @@ namespace FineUIPro.Web.CQMS.WBS.Control return result; } + + /// + /// 关闭 + /// + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + #endregion } diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.designer.cs index 1fb146e3..25282cf8 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx.designer.cs @@ -193,5 +193,32 @@ namespace FineUIPro.Web.CQMS.WBS.Control /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtSort; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// BtnFile 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button BtnFile; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; } }