1

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx

@@ -20,14 +20,12 @@
                 <Items>
                     <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server"  LabelAlign="Right">
                         <Rows>
-                              <f:FormRow ColumnWidths="39% 18% 18% 18%">
+                              <f:FormRow ColumnWidths="57% 18% 18%">
                                 <Items> 
                                      <f:DropDownList ID="drpProject" runat="server" LabelWidth="80px"  Label="项目" EnableEdit="true"
                                           EnableMultiSelect="true" EnableCheckBoxSelect="true"
                                          AutoPostBack="true" OnSelectedIndexChanged="drpProject_OnSelectedIndexChanged">
-                                    </f:DropDownList> 
+                                    </f:DropDownList>   
-                                    <f:DropDownList ID="drpIns" runat="server" LabelWidth="80px" Label="装置" EnableEdit="true">
-                                    </f:DropDownList>     
                                     <f:DropDownList ID="drpUnit" runat="server" LabelWidth="80px" Label="部门" EnableEdit="true"
                                         AutoPostBack="true" OnSelectedIndexChanged="drpUnit_OnSelectedIndexChanged">
                                     </f:DropDownList>                                    

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs

@@ -90,14 +90,7 @@
                 string projectIds = String.Join(",", drpProject.SelectedValueArray);
                 List<SqlParameter> listStr = new List<SqlParameter>();
 
-                if (this.drpIns.SelectedValue != BLL.Const._Null)
+                listStr.Add(new SqlParameter("@installationId", null));
-                {
-                    listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue));
-                }
-                else
-                {
-                    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<SqlParameter> listStr = new List<SqlParameter>();
 
-            if (this.drpIns.SelectedValue != BLL.Const._Null)
+            listStr.Add(new SqlParameter("@installationId", null));
-            {
-                listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue));
-            }
-            else
-            {
-                listStr.Add(new SqlParameter("@installationId", null));
-            }
 
             if (this.drpUnit.SelectedValue != BLL.Const._Null)
             {
@@ -298,14 +284,7 @@
             string projectIds = String.Join(",", drpProject.SelectedValueArray);
             List<SqlParameter> listStr = new List<SqlParameter>();
 
-            if (this.drpIns.SelectedValue != BLL.Const._Null)
+            listStr.Add(new SqlParameter("@installationId", null));
-            {
-                listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue));
-            }
-            else
-            {
-                listStr.Add(new SqlParameter("@installationId", null));
-            }
 
             if (this.drpUnit.SelectedValue != BLL.Const._Null)
             {
@@ -377,14 +356,7 @@
             string projectIds = String.Join(",", drpProject.SelectedValueArray);
             List<SqlParameter> listStr = new List<SqlParameter>();
 
-            if (this.drpIns.SelectedValue != BLL.Const._Null)
+            listStr.Add(new SqlParameter("@installationId", null));
-            {
-                listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue));
-            }
-            else
-            {
-                listStr.Add(new SqlParameter("@installationId", null));
-            }
 
             if (this.drpUnit.SelectedValue != BLL.Const._Null)
             {
@@ -622,7 +594,6 @@
         /// <param name="e"></param>
         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";

HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.designer.cs

@@ -75,15 +75,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProject;
         
-        /// <summary>
-        /// drpIns 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpIns;
-        
         /// <summary>
         /// drpUnit 控件。
         /// </summary>

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";

HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx

@@ -23,6 +23,9 @@
                                  <Items>
                                      <f:TextBox ID="txtProjectCode" runat="server" Label="项目号" EmptyText="输入项目号查询" 
                                          Width="250px" LabelWidth="70px">
+                                     </f:TextBox>
+                                     <f:TextBox ID="txtProjectName" runat="server" Label="项目名称" EmptyText="输入项目名称查询" 
+                                         Width="250px" LabelWidth="70px">
                                      </f:TextBox>
                                       <f:Button runat="server" ID="btnSelect"  Icon="Find" OnClick="btnSelect_Click" ToolTip="根据所选项目查询">
                                      </f:Button>

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;

HJGL_DS/FineUIPro.Web/common/MainGdazServer.aspx.designer.cs

@@ -84,6 +84,15 @@ namespace FineUIPro.Web.common {
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
         
+        /// <summary>
+        /// txtProjectName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectName;
+        
         /// <summary>
         /// btnSelect 控件。
         /// </summary>