From a43e2cde432afe796155ddbaea42c14a2feab430 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Sun, 4 Feb 2024 11:12:50 +0800 Subject: [PATCH] =?UTF-8?q?2024-02-04=20=E8=AF=95=E8=BD=A6=E5=88=86?= =?UTF-8?q?=E5=8C=85=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo | Bin 0 -> 107520 bytes .../版本日志/SGGLDB_WH_2024-02-04-lpf.sql | 6 + .../BLL/TestRun/DriverSub/DriverSubService.cs | 89 +++++++- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 10 +- .../TestRun/DriverSub/DriverSub.aspx | 160 ++++++-------- .../TestRun/DriverSub/DriverSub.aspx.cs | 100 +++++---- .../DriverSub/DriverSub.aspx.designer.cs | 72 +++---- .../DriverSub/DriverSubContact.aspx.cs | 9 +- ...ntactIn.aspx => DriverSubContactorIn.aspx} | 2 +- ...n.aspx.cs => DriverSubContactorIn.aspx.cs} | 2 +- ... => DriverSubContactorIn.aspx.designer.cs} | 2 +- .../DriverSub/DriverSubContactorList.aspx.cs | 2 +- .../TestRun/DriverSub/DriverSubEdit.aspx | 123 +++++------ .../TestRun/DriverSub/DriverSubEdit.aspx.cs | 203 +++++++++++------- .../DriverSub/DriverSubEdit.aspx.designer.cs | 162 +++++--------- SGGL/FineUIPro.Web/Web.config | 2 +- SGGL/Model/Model.cs | 88 +++++++- SGGL/Model/Model.csproj | 2 + .../DriverSub/DriverSubEvaluationData.cs | 18 ++ 19 files changed, 602 insertions(+), 450 deletions(-) create mode 100644 .vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-02-04-lpf.sql rename SGGL/FineUIPro.Web/TestRun/DriverSub/{DriverSubContactIn.aspx => DriverSubContactorIn.aspx} (94%) rename SGGL/FineUIPro.Web/TestRun/DriverSub/{DriverSubContactIn.aspx.cs => DriverSubContactorIn.aspx.cs} (99%) rename SGGL/FineUIPro.Web/TestRun/DriverSub/{DriverSubContactIn.aspx.designer.cs => DriverSubContactorIn.aspx.designer.cs} (98%) create mode 100644 SGGL/Model/TestRun/DriverSub/DriverSubEvaluationData.cs diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo new file mode 100644 index 0000000000000000000000000000000000000000..6b7a5a4aa8f0e65a183cdbdeeb8ee7f9883ed9f9 GIT binary patch literal 107520 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 e.DriverSubId == DriverSubId); } - + /// + /// 根据 + /// + /// + /// + /// + public static Model.DriverSub_DriverSub GetDriverSubBySubPlanIdAndTractorsId(string DriverSubPlanId, + string DriverSubContractorsId) + { + return Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId&& e.DriverSubContractorsId==DriverSubContractorsId); + } /// /// 添加开车分包管理信息 /// @@ -36,6 +46,9 @@ namespace BLL newDriverSub.Instruction = DriverSub.Instruction; newDriverSub.AttachUrl = DriverSub.AttachUrl; newDriverSub.Remark = DriverSub.Remark; + newDriverSub.DriverSubPlanId= DriverSub.DriverSubPlanId; + newDriverSub.DriverSubContractorsId = DriverSub.DriverSubContractorsId; + newDriverSub.EvaluationData = DriverSub.EvaluationData; Funs.DB.DriverSub_DriverSub.InsertOnSubmit(newDriverSub); Funs.DB.SubmitChanges(); } @@ -55,6 +68,9 @@ namespace BLL newDriverSub.Instruction = DriverSub.Instruction; newDriverSub.AttachUrl = DriverSub.AttachUrl; newDriverSub.Remark = DriverSub.Remark; + newDriverSub.DriverSubPlanId = DriverSub.DriverSubPlanId; + newDriverSub.DriverSubContractorsId = DriverSub.DriverSubContractorsId; + newDriverSub.EvaluationData = DriverSub.EvaluationData; Funs.DB.SubmitChanges(); } } @@ -76,5 +92,76 @@ namespace BLL Funs.DB.SubmitChanges(); } } + //DriverSubPlanId和DriverSubContractorsId 获取对象的EvaluationData信息，将json数据EvaluationData 转换成List + public static List GetDriverSubEvaluationData(string DriverSubPlanId, + string DriverSubContractorsId) + { + List list = new List(); + Model.DriverSub_DriverSub data = Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId && e.DriverSubContractorsId == DriverSubContractorsId); + if (data != null) + { + list = Newtonsoft.Json.JsonConvert.DeserializeObject>(data.EvaluationData); + } + return list; + } + //将List转换成json数据 + public static string GetDriverSubEvaluationDataJson(List list) + { + return Newtonsoft.Json.JsonConvert.SerializeObject(list); + } + + //DriverSubPlanId和DriverSubContractorsId 删除数据 + public static void DeleteDriverSubEvaluationData(string DriverSubPlanId, string DriverSubContractorsId) + { + Model.DriverSub_DriverSub data = Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId && e.DriverSubContractorsId == DriverSubContractorsId); + if (data != null) + { + data.EvaluationData = ""; + Funs.DB.SubmitChanges(); + } + } + /// + /// 根据DriverSubPlanId删除实体 + /// + /// + public static void DeleteDriverSubByDriverSubPlanId(string DriverSubPlanId) + { + var list = Funs.DB.DriverSub_DriverSub.Where(e => e.DriverSubPlanId == DriverSubPlanId).ToList(); + //先删除对应附件 + foreach (var item in list) + { + if (!string.IsNullOrEmpty(item.DriverSubId)) + { + AttachFileService.DeleteAttachFile(Funs.RootPath, item.DriverSubId, Const.DriverSubMenuId);//删除附件 + } + } + if (list.Count > 0) + { + Funs.DB.DriverSub_DriverSub.DeleteAllOnSubmit(list); + Funs.DB.SubmitChanges(); + } + } + + + /// + /// 获取初始化数据List + /// + /// + public static List GetDriverSubEvaluationData() + { + List list = new List(); + list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "业主人员培训", Grade = "" }); + list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "编制技术方案", Grade = "" }); + list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "预试车", Grade = "" }); + list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "联动试车", Grade = "" }); + list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "投料试车", Grade = "" }); + list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "生产试运行", Grade = "" }); + list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "性能考核", Grade = "" }); + list.Add(new Model.DriverSubEvaluationData() { Number = 8, Matter = "生产安全", Grade = "" }); + list.Add(new Model.DriverSubEvaluationData() { Number = 9, Matter = "试车进度", Grade = "" }); + list.Add(new Model.DriverSubEvaluationData() { Number = 10, Matter = "其他", Grade = "" }); + return list; + } + } } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d34ccb12..1beee8df 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1756,7 +1756,7 @@ - + @@ -15823,12 +15823,12 @@ DriverSubContactEdit.aspx - - DriverSubContactIn.aspx + + DriverSubContactorIn.aspx ASPXCodeBehind - - DriverSubContactIn.aspx + + DriverSubContactorIn.aspx DriverSubContactorEdit.aspx diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx index 0a6852d0..e8cce7e9 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx @@ -8,95 +8,77 @@ 开车分包管理 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.cs index 06a09729..7dc98bb4 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.cs @@ -26,32 +26,51 @@ namespace FineUIPro.Web.TestRun.DriverSub //加载列表 public void BindGrid() { - string strSql = @"SELECT sub.DriverSubId, - sub.ProjectId, - sub.Code, - sub.SubUnitId, - sub.Implement, - sub.Instruction, - sub.AttachUrl, - sub.Remark, - Unit.UnitName AS SubUnitName" - + @" FROM DriverSub_DriverSub AS sub" - + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = sub.SubUnitId WHERE sub.ProjectId=@projectId"; - List listStr = new List(); - listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.drpSubUnitId.SelectedValue) && this.drpSubUnitId.SelectedValue != BLL.Const._Null) - { - strSql += " AND sub.SubUnitId=@subUnitId"; - listStr.Add(new SqlParameter("@subUnitId", this.drpSubUnitId.SelectedValue)); - } - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - Grid1.RecordCount = tb.Rows.Count; - //tb = GetFilteredTable(Grid1.FilteredData, tb); - var table = this.GetPagedDataTable(Grid1, tb); + var q = from x in Funs.DB.DriverSub_DriverSubContact + where x.ProjectId == this.CurrUser.LoginProjectId + select x.DriverSubPlanId; + var table = from x in Funs.DB.DriverSub_DriverSubPlan + where x.ProjectId == this.CurrUser.LoginProjectId && q.Contains(x.DriverSubPlanId) + select new + { + x.DriverSubPlanId, + x.Code, + x.SubUnitId, + x.Introductions, + x.Achievement, + x.Cooperation, + x.InstallationIds, + x.InstallationNames, + x.AttachUrl, + x.Remark, + x.DriverSubNames, + }; + table = table.Skip(Grid1.PageSize * Grid1.PageIndex).Take(Grid1.PageSize); Grid1.DataSource = table; Grid1.DataBind(); } + + public string GetDriverSubName(object str) + { + string strName = ""; + + if (str != null) + { + string[] strArr = str.ToString().Split(','); + + foreach (string s in strArr) + { + foreach (System.Web.UI.WebControls.ListItem item in DropListService.drpDriverSubNameList()) + { + if (item.Value == s) + { + strName += item.Text + ","; + } + } + } + } + return strName.TrimEnd(','); + } #endregion #region 分页 @@ -125,6 +144,7 @@ namespace FineUIPro.Web.TestRun.DriverSub EditData(); } + /// /// 编辑 /// @@ -135,7 +155,7 @@ namespace FineUIPro.Web.TestRun.DriverSub Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); return; } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubEdit.aspx?id={0}", Grid1.SelectedRowID, "编辑 - "))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubEdit.aspx?DriverSubPlanId={0}", Grid1.SelectedRowID, "编辑 - "))); } #endregion @@ -147,10 +167,10 @@ namespace FineUIPro.Web.TestRun.DriverSub foreach (int rowIndex in Grid1.SelectedRowIndexArray) { string rowID = Grid1.DataKeys[rowIndex][0].ToString(); - var info = BLL.DriverSubService.GetDriverSubById(rowID); + var info = BLL.DriverSubPlanService.GetDriverSubPlanById(rowID); if (info != null) { - BLL.DriverSubService.DeleteDriverSub(rowID); + BLL.DriverSubPlanService.DeleteDriverSubPlanById(rowID); } } BindGrid(); @@ -170,7 +190,7 @@ namespace FineUIPro.Web.TestRun.DriverSub string id = Grid1.DataKeys[e.RowIndex][0].ToString(); if (e.CommandName == "AttachUrl") { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSub&menuId={1}", id, BLL.Const.DriverSubMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSubPlan&menuId={1}", id, BLL.Const.DriverSubMenuId))); } } #endregion @@ -184,19 +204,19 @@ namespace FineUIPro.Web.TestRun.DriverSub var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DriverSubMenuId); if (buttonList.Count() > 0) { - if (buttonList.Contains(BLL.Const.BtnAdd)) - { - this.btnNew.Hidden = false; - } - if (buttonList.Contains(BLL.Const.BtnModify)) - { - this.btnMenuModify.Hidden = false; - this.Grid1.EnableRowDoubleClickEvent = true; - } - if (buttonList.Contains(BLL.Const.BtnDelete)) - { - this.btnMenuDel.Hidden = false; - } + //if (buttonList.Contains(BLL.Const.BtnAdd)) + //{ + // this.btnNew.Hidden = false; + //} + //if (buttonList.Contains(BLL.Const.BtnModify)) + //{ + // this.btnMenuModify.Hidden = false; + // this.Grid1.EnableRowDoubleClickEvent = true; + //} + //if (buttonList.Contains(BLL.Const.BtnDelete)) + //{ + // this.btnMenuDel.Hidden = false; + //} } } #endregion diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.designer.cs index 12cf5104..b78503e9 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.TestRun.DriverSub { - - - public partial class DriverSub { - +namespace FineUIPro.Web.TestRun.DriverSub +{ + + + public partial class DriverSub + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolSearch 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar ToolSearch; - + /// /// drpSubUnitId 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSubUnitId; - + /// /// btnSearch 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnNew 控件。 /// @@ -83,7 +85,16 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + /// /// ToolbarSeparator1 控件。 /// @@ -92,7 +103,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -101,7 +112,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// WindowAtt 控件。 /// @@ -128,32 +139,5 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; - - /// - /// Menu1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Menu Menu1; - - /// - /// btnMenuModify 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuModify; - - /// - /// btnMenuDel 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuDel; } } diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContact.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContact.aspx.cs index 32e7e4a7..b820e6dd 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContact.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContact.aspx.cs @@ -33,6 +33,7 @@ namespace FineUIPro.Web.TestRun.DriverSub where x.ProjectId == this.CurrUser.LoginProjectId && q.Contains(x.DriverSubPlanId) select new { + x.DriverSubPlanId, x.Code, x.SubUnitId, @@ -165,11 +166,9 @@ namespace FineUIPro.Web.TestRun.DriverSub foreach (int rowIndex in Grid1.SelectedRowIndexArray) { string rowID = Grid1.DataKeys[rowIndex][0].ToString(); - var info = BLL.DriverSubContactService.GetDriverSubContactById(rowID); - if (info != null) - { - BLL.DriverSubContactService.DeleteDriverSubContactById(rowID); - } + BLL.DriverSubContactService.DeleteDriverSubContactByDriverSubPlanId(rowID); + BLL.DriverSubService.DeleteDriverSubByDriverSubPlanId(rowID); //删除分包管理打分信息 + } BindGrid(); ShowNotify("删除数据成功!", MessageBoxIcon.Success); diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx similarity index 94% rename from SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx rename to SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx index 22540914..018811e6 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DriverSubContactIn.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverSub.DriverSubContactIn" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DriverSubContactorIn.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverSub.DriverSubContactorIn" %> diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx.cs similarity index 99% rename from SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx.cs rename to SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx.cs index 911eb9cc..3b880ec7 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx.cs @@ -11,7 +11,7 @@ using System.Web.UI.WebControls; namespace FineUIPro.Web.TestRun.DriverSub { - public partial class DriverSubContactIn : PageBase + public partial class DriverSubContactorIn : PageBase { public string ContractId { diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx.designer.cs similarity index 98% rename from SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx.designer.cs rename to SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx.designer.cs index dd8890a6..77855516 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactIn.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorIn.aspx.designer.cs @@ -11,7 +11,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { - public partial class DriverSubContactIn + public partial class DriverSubContactorIn { /// diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorList.aspx.cs index eb8f1c21..b7908794 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorList.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubContactorList.aspx.cs @@ -250,7 +250,7 @@ namespace FineUIPro.Web.TestRun.DriverSub protected void btnImport_Click(object sender, EventArgs e) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubContactIn.aspx", "编辑 - "))); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubContactorIn.aspx", "编辑 - "))); } #endregion diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx index d79453eb..48294b65 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx @@ -4,88 +4,75 @@ - 开车分包管理 + +
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.cs index 6db38011..b638f8c8 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.cs @@ -1,10 +1,37 @@ using BLL; +using Newtonsoft.Json.Linq; using System; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; namespace FineUIPro.Web.TestRun.DriverSub { public partial class DriverSubEdit :PageBase { + public string DriverSubPlanId { + get + { + return (string)ViewState["DriverSubPlanId"]; + } + set + { + ViewState["DriverSubPlanId"] = value; + } + } + public string DriverSubId + { + get + { + return (string)ViewState["DriverSubId"]; + } + set + { + ViewState["DriverSubId"] = value; + } + } + + #region 加载 /// /// 页面加载 @@ -15,37 +42,76 @@ namespace FineUIPro.Web.TestRun.DriverSub { if (!IsPostBack) { - BLL.UnitService.InitUnitDownList(this.drpSubUnitId, this.CurrUser.LoginProjectId, true); - this.drpImplement.DataTextField = "Text"; - this.drpImplement.DataValueField = "Value"; - this.drpImplement.DataSource = BLL.DropListService.drpImplementItemList(); - this.drpImplement.DataBind(); - Funs.FineUIPleaseSelect(this.drpImplement); - - string id = Request.Params["id"]; - if (!string.IsNullOrEmpty(id)) + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + DriverSubPlanId = Request.Params["DriverSubPlanId"]; + if (!string.IsNullOrEmpty(DriverSubPlanId)) { - Model.DriverSub_DriverSub data = BLL.DriverSubService.GetDriverSubById(id); - if (data != null) - { - this.hdId.Text = id; - this.txtCode.Text = data.Code; - if (!string.IsNullOrEmpty(data.SubUnitId)) - { - this.drpSubUnitId.SelectedValue = data.SubUnitId; - } - if (!string.IsNullOrEmpty(data.Code)) - { - this.drpImplement.SelectedValue = data.Code; - } - this.txtInstruction.Text = data.Instruction; - this.txtRemark.Text = data.Remark; - } + InitTreeMenu(); } } } #endregion + void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + var subPlanModel= DriverSubPlanService.GetDriverSubPlanById(DriverSubPlanId); + if (subPlanModel != null) + { + foreach (var item in subPlanModel.DriverSubNames.Split(',')) + { + var name = DropListService.drpDriverSubNameList().Where(x => x.Value == item) .First().Text; + FineUIPro.TreeNode node = new FineUIPro.TreeNode(); + node.NodeID = item; + node.Text = name; + node.CommandName = name; + node.Expanded = true; + this.tvControlItem.Nodes.Add(node); + BindNode(node, item); + } + } + } + + void BindNode(TreeNode node,string type ) + { + var SubContractorsList= DriverSubContactService.GetDriverSubContactByDriverSubPlanId(DriverSubPlanId) + .Where(x => x.SubcontractingType == type).Select(x => x.DriverSubContractorsId).ToArray(); + foreach (var item in SubContractorsList) + { + string unitName= BLL.DriversubcontractorsService.GetDriverSub_DriverSubContractorsById(item).SubUnitName; + FineUIPro.TreeNode node1 = new FineUIPro.TreeNode(); + node1.NodeID = item; + node1.Text = unitName; + node1.CommandName = node1.Text; + node1.EnableClickEvent=true; + node.Nodes.Add(node1); + } + } + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + var list= BLL.DriverSubService.GetDriverSubEvaluationData(DriverSubPlanId, tvControlItem.SelectedNodeID); + var model= BLL.DriverSubService.GetDriverSubBySubPlanIdAndTractorsId(DriverSubPlanId,tvControlItem.SelectedNodeID); + if (model!=null) + { + DriverSubId = model.DriverSubId; + } + else + { + DriverSubId = ""; + } + if (list.Count>0 ) + { + Grid1.DataSource = list; + Grid1.DataBind(); + } + else + { + Grid1.DataSource = BLL.DriverSubService.GetDriverSubEvaluationData(); + Grid1.DataBind(); + + } + } + #region 附件上传 /// /// 附件上传 @@ -54,11 +120,8 @@ namespace FineUIPro.Web.TestRun.DriverSub /// protected void btnAttach_Click(object sender, EventArgs e) { - if (string.IsNullOrEmpty(this.hdId.Text)) //新增记录 - { - this.hdId.Text = SQLHelper.GetNewID(typeof(Model.DriverSub_DriverSub)); - } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSub&menuId={1}", this.hdId.Text, BLL.Const.DriverSubMenuId))); + Save(); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverSub/DriverSub&menuId={1}", DriverSubId, BLL.Const.DriverSubMenuId))); } #endregion @@ -70,65 +133,49 @@ namespace FineUIPro.Web.TestRun.DriverSub /// protected void btnSave_Click(object sender, EventArgs e) { - if (this.drpImplement.SelectedValue==BLL.Const._Null) + + Save(); + tvControlItem_NodeCommand(null,null); + ShowNotify("保存成功！", MessageBoxIcon.Success); + // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + void Save() + { + JArray EditorArr = Grid1.GetMergedData(); + //JArray 转换成List + List list = new List(); + foreach (JObject item in EditorArr) { - Alert.ShowInTop("请选择开车分包单位！", MessageBoxIcon.Warning); - return; + Model.DriverSubEvaluationData data = new Model.DriverSubEvaluationData(); + data.Number = Convert.ToInt32(item["values"]["Number"]); + data.Matter = item["values"]["Matter"].ToString(); + data.Grade = item["values"]["Grade"].ToString(); + list.Add(data); } - if (this.drpSubUnitId.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择记录/报告/执行情况！", MessageBoxIcon.Warning); - return; - } - string id = Request.Params["id"]; + //list转换成json数据 + string json = BLL.DriverSubService.GetDriverSubEvaluationDataJson(list); Model.DriverSub_DriverSub newData = new Model.DriverSub_DriverSub(); - newData.Code = this.txtCode.Text.Trim(); - if (this.drpSubUnitId.SelectedValue != BLL.Const._Null) - { - newData.SubUnitId = this.drpSubUnitId.SelectedValue; - } - if (this.drpImplement.SelectedValue!=BLL.Const._Null) - { - newData.Implement = this.drpImplement.SelectedItem.Text; - } - newData.Instruction = this.txtInstruction.Text.Trim(); - newData.Remark = this.txtRemark.Text.Trim(); newData.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(id)) + newData.DriverSubPlanId = DriverSubPlanId; + newData.DriverSubContractorsId = tvControlItem.SelectedNodeID; + newData.EvaluationData = json; + + if (string.IsNullOrEmpty(DriverSubId)) { - newData.DriverSubId = id; - BLL.DriverSubService.UpdateDriverSub(newData); + newData.DriverSubId = SQLHelper.GetNewID(typeof(Model.DriverSub_DriverSub)); + DriverSubId= newData.DriverSubId; + DriverSubService.AddDriverSub(newData); } else { - if (!string.IsNullOrEmpty(this.hdId.Text)) - { - newData.DriverSubId = this.hdId.Text.Trim(); - } - else - { - newData.DriverSubId = SQLHelper.GetNewID(typeof(Model.DriverSub_DriverSub)); - this.hdId.Text = newData.DriverSubId; - } - BLL.DriverSubService.AddDriverSub(newData); + newData.DriverSubId = DriverSubId; + DriverSubService.UpdateDriverSub(newData); } - ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + #endregion - #region DropDownList下拉选择事件 - protected void drpImplement_SelectedIndexChanged(object sender, EventArgs e) - { - if (this.drpImplement.SelectedValue == BLL.Const._Null) - { - this.txtCode.Text = string.Empty; - } - else - { - this.txtCode.Text = this.drpImplement.SelectedValue; - } - } - #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.designer.cs index e2813d6f..ac61e7dc 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.TestRun.DriverSub { - - - public partial class DriverSubEdit { - +namespace FineUIPro.Web.TestRun.DriverSub +{ + + + public partial class DriverSubEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,142 +31,61 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// - /// SimpleForm1 控件。 + /// Panel1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Form SimpleForm1; - + protected global::FineUIPro.Panel Panel1; + /// - /// Toolbar1 控件。 + /// panelLeftRegion 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Toolbar Toolbar1; - + protected global::FineUIPro.Panel panelLeftRegion; + /// - /// ToolbarFill1 控件。 + /// tvControlItem 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.ToolbarFill ToolbarFill1; - + protected global::FineUIPro.Tree tvControlItem; + /// - /// btnSave 控件。 + /// panelCenterRegion 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnSave; - + protected global::FineUIPro.Panel panelCenterRegion; + /// - /// hdAttachUrl 控件。 + /// Grid1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hdAttachUrl; - + protected global::FineUIPro.Grid Grid1; + /// - /// hdId 控件。 + /// txtGrade 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.HiddenField hdId; - - /// - /// ContentPanel2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ContentPanel ContentPanel2; - - /// - /// Form2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form Form2; - - /// - /// drpImplement 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpImplement; - - /// - /// txtCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtCode; - - /// - /// drpSubUnitId 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpSubUnitId; - - /// - /// txtInstruction 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtInstruction; - - /// - /// txtRemark 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtRemark; - - /// - /// Panel3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Panel Panel3; - - /// - /// lblAttach 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label lblAttach; - + protected global::FineUIPro.TextBox txtGrade; + /// /// btnAttach 控件。 /// @@ -173,7 +94,34 @@ namespace FineUIPro.Web.TestRun.DriverSub { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index f2c2e849..37de607d 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -76,7 +76,7 @@ - + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index ead8134f..3f5147c5 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -128285,6 +128285,12 @@ namespace Model private string _Remark; + private string _DriverSubPlanId; + + private string _DriverSubContractorsId; + + private string _EvaluationData; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -128309,6 +128315,12 @@ namespace Model partial void OnAttachUrlChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); + partial void OnDriverSubPlanIdChanging(string value); + partial void OnDriverSubPlanIdChanged(); + partial void OnDriverSubContractorsIdChanging(string value); + partial void OnDriverSubContractorsIdChanged(); + partial void OnEvaluationDataChanging(string value); + partial void OnEvaluationDataChanged(); #endregion public DriverSub_DriverSub() @@ -128486,6 +128498,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverSubPlanId", DbType="NVarChar(50)")] + public string DriverSubPlanId + { + get + { + return this._DriverSubPlanId; + } + set + { + if ((this._DriverSubPlanId != value)) + { + this.OnDriverSubPlanIdChanging(value); + this.SendPropertyChanging(); + this._DriverSubPlanId = value; + this.SendPropertyChanged("DriverSubPlanId"); + this.OnDriverSubPlanIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverSubContractorsId", DbType="NVarChar(50)")] + public string DriverSubContractorsId + { + get + { + return this._DriverSubContractorsId; + } + set + { + if ((this._DriverSubContractorsId != value)) + { + this.OnDriverSubContractorsIdChanging(value); + this.SendPropertyChanging(); + this._DriverSubContractorsId = value; + this.SendPropertyChanged("DriverSubContractorsId"); + this.OnDriverSubContractorsIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationData", DbType="NVarChar(2000)")] + public string EvaluationData + { + get + { + return this._EvaluationData; + } + set + { + if ((this._EvaluationData != value)) + { + this.OnEvaluationDataChanging(value); + this.SendPropertyChanging(); + this._EvaluationData = value; + this.SendPropertyChanged("EvaluationData"); + this.OnEvaluationDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSub_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -129140,7 +129212,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="VarChar(500)")] public string SubUnitName { get @@ -129160,7 +129232,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnterpriseNature", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnterpriseNature", DbType="VarChar(500)")] public string EnterpriseNature { get @@ -129180,7 +129252,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractingType", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractingType", DbType="VarChar(500)")] public string SubcontractingType { get @@ -129200,7 +129272,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="VarChar(500)")] public string CollCropCode { get @@ -129220,7 +129292,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyProductionLicense", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyProductionLicense", DbType="VarChar(500)")] public string SafetyProductionLicense { get @@ -129240,7 +129312,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationCertificateNumber", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationCertificateNumber", DbType="VarChar(500)")] public string QualificationCertificateNumber { get @@ -129260,7 +129332,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationType", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationType", DbType="VarChar(500)")] public string QualificationType { get @@ -129280,7 +129352,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationLevel", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationLevel", DbType="VarChar(500)")] public string QualificationLevel { get diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index eca26ace..91949a57 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -218,12 +218,14 @@ + +