diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 2e2d4e17..37b9fbc6 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -196,9 +196,9 @@ namespace BLL #region 定义常量 /// - /// 赛鼎单位id + /// 陕化建单位id /// - public const string UnitId_SEDIN = "d72a27c9-4ba9-41c5-ab0b-c010409f20f2"; + public const string UnitId_SEDIN = "37095edf-3815-4e92-8b8d-b8cefe64c8de"; /// /// 赛鼎宁波单位id /// diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index 498e943f..1ee0f22d 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -178,7 +178,7 @@ namespace BLL /// public static string getInitialPassword(string unitId, string idCard) { - string prefixValue = "sedin"; + string prefixValue = "shj"; string suffixValue = "1234"; //var getUnit = UnitService.GetUnitByUnitId(unitId); //if (getUnit != null) diff --git a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx index dc2da718..bc301bee 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx @@ -95,7 +95,7 @@ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index b3d0f6e1..52e87e5f 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -17033,7 +17033,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx index 44c21f28..ec1f55c8 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx @@ -106,7 +106,7 @@ OnClick="btnImport_Click"> - + @@ -139,11 +139,11 @@ FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间" HeaderTextAlign="Center" TextAlign="Center"> - - <%-- diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx index 528b8db0..1c85531e 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx @@ -38,9 +38,9 @@ - - @@ -113,9 +110,6 @@ - - diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs index f26eae13..364f19e1 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs @@ -263,7 +263,6 @@ namespace FineUIPro.Web.ProjectData if (buttonList.Contains(BLL.Const.BtnAdd)) { this.btnNew.Hidden = false; - this.btnUpdata.Hidden = false; } if (buttonList.Contains(BLL.Const.BtnModify) || buttonList.Contains(BLL.Const.BtnSave)) { diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs index d4f8cbbb..1ac094f2 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.designer.cs @@ -111,15 +111,6 @@ namespace FineUIPro.Web.ProjectData { /// protected global::FineUIPro.Button btnOut; - /// - /// btnUpdata 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnUpdata; - /// /// hdStr 控件。 /// diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx index c99d5495..937f9390 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx @@ -125,61 +125,7 @@ - - - - - - - - - - - - - - - - - - - - - + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs index a676d4e1..d0f69af2 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs @@ -39,17 +39,12 @@ namespace FineUIPro.Web.ProjectData this.ProjectId = Request.QueryString["ProjectId"]; UnitService.InitBranchUnitDropDownList(this.drpUnit, true, true); - BindGrid(); this.drpUnit.SelectedValue = Const.UnitId_SEDIN; if (!String.IsNullOrEmpty(this.ProjectId)) { var project = BLL.ProjectService.GetProjectByProjectId(this.ProjectId); if (project != null) { - if (!string.IsNullOrEmpty(project.MasterSysId)) - { - this.drpMasterBox1.Value = project.MasterSysId; - } this.txtProjectCode.Text = project.ProjectCode; this.txtProjectName.Text = project.ProjectName; this.txtProjectAddress.Text = project.ProjectAddress; @@ -105,15 +100,6 @@ namespace FineUIPro.Web.ProjectData } this.txtCity.Text = project.City; this.txtEnglishRemark.Text = project.EnglishRemark; - this.txtProjectRealCode.Text = project.ProjectRealCode; - if (project.IsCNCECShow == true) - { - this.rbIsCNCECShow.SelectedValue = "True"; - } - else - { - this.rbIsCNCECShow.SelectedValue = "False"; - } } } else @@ -155,13 +141,7 @@ namespace FineUIPro.Web.ProjectData Country = this.txtCountry.Text.Trim(), City = this.txtCity.Text.Trim(), EnglishRemark = this.txtEnglishRemark.Text.Trim(), - ProjectRealCode = this.txtProjectRealCode.Text.Trim(), - IsCNCECShow = Convert.ToBoolean(this.rbIsCNCECShow.SelectedValue), }; - if (!string.IsNullOrWhiteSpace(this.drpMasterBox1.Text)) - { - project.MasterSysId = this.drpMasterBox1.Value; - } if (!string.IsNullOrEmpty(txtStartDate.Text.Trim())) { project.StartDate = Funs.GetNewDateTime(this.txtStartDate.Text.Trim()); @@ -304,56 +284,5 @@ namespace FineUIPro.Web.ProjectData ///安全经理 Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpHSSEManager, null, unitId, null, true); } - - private void BindGrid() - { - var list = ProjectService.GetMasterProjectInfos(); - string code = ttbCodeSearch.Text.Trim(); - string name = ttbNameSearch.Text.Trim(); - if (!string.IsNullOrWhiteSpace(code)) - { - list = list.Where(x => x.PrjCode.Contains(code)).ToList(); - } - if (!string.IsNullOrWhiteSpace(name)) - { - list = list.Where(x => x.PrjName.Contains(name)).ToList(); - } - - // 1.设置总项数（特别注意：数据库分页一定要设置总记录数RecordCount） - Grid1.RecordCount = list.Count(); - // 2.获取当前分页数据 - DataTable table = Funs.LINQToDataTable(list); - - // 3.绑定到Grid - Grid1.DataSource = table; - Grid1.DataBind(); - } - - protected void Grid1_Sort(object sender, GridSortEventArgs e) - { - BindGrid(); - } - protected void ttbCodeSearch_Trigger1Click(object sender, EventArgs e) - { - ttbCodeSearch.Text = string.Empty; - ttbCodeSearch.ShowTrigger1 = false; - BindGrid(); - } - protected void ttbCodeSearch_Trigger2Click(object sender, EventArgs e) - { - ttbCodeSearch.ShowTrigger1 = true; - BindGrid(); - } - protected void ttbNameSearch_Trigger1Click(object sender, EventArgs e) - { - ttbNameSearch.Text = string.Empty; - ttbNameSearch.ShowTrigger1 = false; - BindGrid(); - } - protected void ttbNameSearch_Trigger2Click(object sender, EventArgs e) - { - ttbNameSearch.ShowTrigger1 = true; - BindGrid(); - } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs index 512678d6..3a418344 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs @@ -273,78 +273,6 @@ namespace FineUIPro.Web.ProjectData { /// protected global::FineUIPro.TextBox txtEnglishRemark; - /// - /// txtProjectRealCode 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtProjectRealCode; - - /// - /// rbIsCNCECShow 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rbIsCNCECShow; - - /// - /// drpMasterBox1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownBox drpMasterBox1; - - /// - /// Panel7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Panel Panel7; - - /// - /// Form5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form Form5; - - /// - /// ttbCodeSearch 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TwinTriggerBox ttbCodeSearch; - - /// - /// ttbNameSearch 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TwinTriggerBox ttbNameSearch; - - /// - /// Grid1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid Grid1; - /// /// Toolbar1 控件。 /// diff --git a/SGGL/FineUIPro.Web/index.aspx b/SGGL/FineUIPro.Web/index.aspx index b2a7a1df..8402fdd3 100644 --- a/SGGL/FineUIPro.Web/index.aspx +++ b/SGGL/FineUIPro.Web/index.aspx @@ -189,7 +189,7 @@
- 赛鼎施工管理信息平台
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx index 00a2029d..db5707aa 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx +++ b/SGGL/FineUIPro.Web/indexProject.aspx @@ -213,7 +213,7 @@
- 赛鼎工程有限公司 + 陕西化建工程有限责任公司 diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs index 4273e005..797bb6f6 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs @@ -325,20 +325,23 @@ namespace FineUIPro.Web if (!string.IsNullOrEmpty(Request.Params["projectId"])) { - var getp = projectlist.FirstOrDefault(x => x.ProjectId == Request.Params["projectId"]); - if (getp == null) + if (projectlist != null) { - Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(Request.Params["projectId"]); - if (project != null) + var getp = projectlist.FirstOrDefault(x => x.ProjectId == Request.Params["projectId"]); + if (getp == null) { - projectlist.Add(project); - this.drpProject.Items.Clear(); - this.drpProject.DataSource = projectlist; - this.drpProject.DataBind(); + Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(Request.Params["projectId"]); + if (project != null) + { + projectlist.Add(project); + this.drpProject.Items.Clear(); + this.drpProject.DataSource = projectlist; + this.drpProject.DataBind(); + } } - } - this.drpProject.SelectedValue = Request.Params["projectId"]; + this.drpProject.SelectedValue = Request.Params["projectId"]; + } } // 首次进页面设置消息的数量 diff --git a/SGGL/FineUIPro.Web/res/index/images/bg.jpg b/SGGL/FineUIPro.Web/res/index/images/bg.jpg index f8593ebd..0610f802 100644 Binary files a/SGGL/FineUIPro.Web/res/index/images/bg.jpg and b/SGGL/FineUIPro.Web/res/index/images/bg.jpg differ diff --git a/SGGL/FineUIPro.Web/res/index/images/logo.png b/SGGL/FineUIPro.Web/res/index/images/logo.png index f7663d29..eb3da490 100644 Binary files a/SGGL/FineUIPro.Web/res/index/images/logo.png and b/SGGL/FineUIPro.Web/res/index/images/logo.png differ