diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx index 231a741..dc6e677 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx @@ -20,14 +20,12 @@ - + - - - + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs index 725eb59..d2bc213 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs @@ -90,14 +90,7 @@ string projectIds = String.Join(",", drpProject.SelectedValueArray); List listStr = new List(); - if (this.drpIns.SelectedValue != BLL.Const._Null) - { - listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue)); - } - else - { - listStr.Add(new SqlParameter("@installationId", null)); - } + listStr.Add(new SqlParameter("@installationId", null)); if (this.drpUnit.SelectedValue != BLL.Const._Null) { @@ -190,7 +183,7 @@ summary.Add("repairFilm3", repairFilm3.ToString("0.##")); if (JointNum1 > 0) { - JointPassRate= (decimal.Round(JointPassNum1 / JointNum1, 4) * 100).ToString("0.00") + "%"; + JointPassRate = (decimal.Round(JointPassNum1 / JointNum1, 4) * 100).ToString("0.00") + "%"; } if (totalfilm > 0) { @@ -219,14 +212,7 @@ string projectIds = String.Join(",", drpProject.SelectedValueArray); List listStr = new List(); - if (this.drpIns.SelectedValue != BLL.Const._Null) - { - listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue)); - } - else - { - listStr.Add(new SqlParameter("@installationId", null)); - } + listStr.Add(new SqlParameter("@installationId", null)); if (this.drpUnit.SelectedValue != BLL.Const._Null) { @@ -298,14 +284,7 @@ string projectIds = String.Join(",", drpProject.SelectedValueArray); List listStr = new List(); - if (this.drpIns.SelectedValue != BLL.Const._Null) - { - listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue)); - } - else - { - listStr.Add(new SqlParameter("@installationId", null)); - } + listStr.Add(new SqlParameter("@installationId", null)); if (this.drpUnit.SelectedValue != BLL.Const._Null) { @@ -377,14 +356,7 @@ string projectIds = String.Join(",", drpProject.SelectedValueArray); List listStr = new List(); - if (this.drpIns.SelectedValue != BLL.Const._Null) - { - listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue)); - } - else - { - listStr.Add(new SqlParameter("@installationId", null)); - } + listStr.Add(new SqlParameter("@installationId", null)); if (this.drpUnit.SelectedValue != BLL.Const._Null) { @@ -622,7 +594,6 @@ /// protected void drpProject_OnSelectedIndexChanged(object sender, EventArgs e) { - drpIns.Items.Clear(); //this.drpUnit.Items.Clear(); ///单位 this.drpWloName.Items.Clear(); ///焊工 if (drpProject.SelectedValueArray.Length > 1) @@ -633,21 +604,6 @@ { drpProject.Items[0].Selected = true; } - if (drpProject.SelectedValueArray.Length == 1 && this.drpProject.SelectedValueArray[0] != BLL.Const._Null) - { - //var pUnit = BLL.Base_UnitService.GetUnitsByProjectUnitType(drpProject.SelectedValueArray[0], BLL.Const.UnitType_4); - //this.drpUnit.DataSource = pUnit; - //this.drpUnit.DataBind(); - - this.drpIns.Items.Clear(); - this.drpIns.DataTextField = "Text"; - this.drpIns.DataValueField = "Value"; - this.drpIns.DataSource = BLL.Project_InstallationService.GetInstallationList(drpProject.SelectedValueArray[0]); - this.drpIns.DataBind(); - - } - Funs.FineUIPleaseSelect(this.drpIns); - this.drpIns.SelectedValue = BLL.Const._Null; //Funs.FineUIPleaseSelect(this.drpUnit); //this.drpUnit.SelectedValue = BLL.Const._Null; this.drpWloName.DataTextField = "Text"; diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.designer.cs index a9c6421..770cfeb 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.designer.cs @@ -75,15 +75,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// protected global::FineUIPro.DropDownList drpProject; - /// - /// drpIns 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpIns; - /// /// drpUnit 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs index e3502d2..379e7e9 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs @@ -106,6 +106,10 @@ namespace FineUIPro.Web.WeldMat.UsingPlan //strSql += " AND UsingPlan.UsingUnit = @UsingUnit"; //listStr.Add(new SqlParameter("@UsingUnit", CurrUser.UnitId)); } + if (CurrUser.RoleId == BLL.Const.StoreManRole) + { + strSql += " AND UsingPlan.IsSubmit=1"; + } if (!string.IsNullOrEmpty(this.txtWeldName.Text.Trim())) { strSql += " AND Weld.WeldName LIKE @WeldName"; diff --git a/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx b/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx index c24e792..af6fa3b 100644 --- a/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx +++ b/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx @@ -23,6 +23,9 @@ + + diff --git a/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx.cs b/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx.cs index 48c5bb5..eebc07a 100644 --- a/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx.cs @@ -30,6 +30,10 @@ namespace FineUIPro.Web.common { project = project.Where(e => e.ProjectCode.Contains(txtProjectCode.Text.Trim())).ToList(); } + if (!string.IsNullOrEmpty(txtProjectName.Text)) + { + project = project.Where(e => e.ProjectName.Contains(txtProjectName.Text.Trim())).ToList(); + } GridProject.RecordCount = project.Count; var table = GetPagedDataTable(GridProject, project); this.GridProject.DataSource = table; diff --git a/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx.designer.cs index b59a724..2963476 100644 --- a/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx.designer.cs @@ -84,6 +84,15 @@ namespace FineUIPro.Web.common { /// protected global::FineUIPro.TextBox txtProjectCode; + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + /// /// btnSelect 控件。 ///