lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏展示的两个问题，

Browse Source 
一个是质量管理点击报错，
二是点击项目清单后，加载的项目清单页面默认显示所有行
This commit is contained in:
夏菊
2025-07-25 17:43:33 +08:00
parent 45ed356149
commit c4f43bee08
12 changed files with 371 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx
+13 -5
View File
@@ -14,14 +14,22 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtTotalWeldQuantity" runat="server" Label="总达因数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
<f:TextBox ID="txtTotalCompleted" runat="server" Label="完成达因数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
<f:NumberBox ID="txtTotalWeldQuantity" NoDecimal="false" NoNegative="true" MinValue="0" runat="server" Label="总达因数">
</f:NumberBox>
<f:NumberBox ID="txtTotalCompleted" NoDecimal="false" NoNegative="true" MinValue="0" runat="server" Label="完成达因数">
</f:NumberBox>
<%-- <f:TextBox ID="txtTotalWeldQuantity" runat="server" Label="总达因数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
<f:TextBox ID="txtTotalCompleted" runat="server" Label="完成达因数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>--%>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtOneTimeFilmAmount" runat="server" Label="总片数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
<f:TextBox ID="txtOneTimeFilmQualifiedAmount" runat="server" Label="合格片数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
<f:NumberBox ID="txtOneTimeFilmAmount" NoDecimal="true" NoNegative="true" MinValue="0" runat="server" Label="总片数">
</f:NumberBox>
<f:NumberBox ID="txtOneTimeFilmQualifiedAmount" NoDecimal="true" NoNegative="true" MinValue="0" runat="server" Label="合格片数">
</f:NumberBox>
<%-- <f:TextBox ID="txtOneTimeFilmAmount" runat="server" Label="总片数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>
<f:TextBox ID="txtOneTimeFilmQualifiedAmount" runat="server" Label="合格片数" MaxLength="50" Required="true" ShowRedStar="true"></f:TextBox>--%>
</Items>
</f:FormRow>
</Rows>
@@ -30,7 +38,7 @@
<Items>
<f:HiddenField ID="hdAttachUrl" runat="server">
</f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click">
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
SGGL/FineUIPro.Web/HJGL/FL/HJGLDataEdit.aspx.designer.cs
Generated
+20 -18
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.FL {
public partial class HJGLDataEdit {
namespace FineUIPro.Web.HJGL.FL
{
public partial class HJGLDataEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.FL {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.FL {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.FL {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtTotalWeldQuantity 控件。
/// </summary>
@@ -46,8 +48,8 @@ namespace FineUIPro.Web.HJGL.FL {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTotalWeldQuantity;
protected global::FineUIPro.NumberBox txtTotalWeldQuantity;
/// <summary>
/// txtTotalCompleted 控件。
/// </summary>
@@ -55,8 +57,8 @@ namespace FineUIPro.Web.HJGL.FL {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTotalCompleted;
protected global::FineUIPro.NumberBox txtTotalCompleted;
/// <summary>
/// txtOneTimeFilmAmount 控件。
/// </summary>
@@ -64,8 +66,8 @@ namespace FineUIPro.Web.HJGL.FL {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOneTimeFilmAmount;
protected global::FineUIPro.NumberBox txtOneTimeFilmAmount;
/// <summary>
/// txtOneTimeFilmQualifiedAmount 控件。
/// </summary>
@@ -73,8 +75,8 @@ namespace FineUIPro.Web.HJGL.FL {
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOneTimeFilmQualifiedAmount;
protected global::FineUIPro.NumberBox txtOneTimeFilmQualifiedAmount;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.FL {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.FL {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary>
/// btnSave 控件。
/// </summary>
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
+1 -1
View File
@@ -22,7 +22,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目信息"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" SortField="ProjectCode" SortDirection="DESC"
OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="false" PageSize="1000" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" EnableCheckBoxSelect="true" EnableMultiSelect="true" OnRowCommand="Grid1_RowCommand">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectInstrument.aspx.cs
+7 -6
View File
@@ -56,15 +56,16 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
private void BindGrid()
{
string strSql = @"select * from PreRun_InstrumentSysPiping where ProjectId=@ProjectId and SystemId=@SystemId ";
//string strSql = @"select * from PreRun_InstrumentSysPiping where ProjectId=@ProjectId and SystemId=@SystemId ";
string strSql = @"select * from PreRun_InstrumentSysPiping where ProjectId=@ProjectId and SystemId=@SystemId and InstrumentId not in (select InstrumentId from PreRun_SubInstrumentSelect) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@SystemId", this.SystemId));
if (!string.IsNullOrWhiteSpace(SelectInstrumentIds))
{
var ids = SelectInstrumentIds.Split(',').ToList();
strSql += $" and InstrumentId not in ('{string.Join("','", ids)}')";
}
//if (!string.IsNullOrWhiteSpace(SelectInstrumentIds))
//{
// var ids = SelectInstrumentIds.Split(',').ToList();
// strSql += $" and InstrumentId not in ('{string.Join("','", ids)}')";
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectProperty.aspx.cs
+7 -6
View File
@@ -56,15 +56,16 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
private void BindGrid()
{
string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and PropertyId not in (select PropertyId from PreRun_SubPropertySelect where SystemId=@SystemId) ";
//string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and PropertyId not in (select PropertyId from PreRun_SubPropertySelect where SystemId=@SystemId) ";
string strSql = @"select * from PreRun_PropertySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and PropertyId not in (select PropertyId from PreRun_SubPropertySelect) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@SystemId", this.SystemId));
if (!string.IsNullOrWhiteSpace(SelectPropertyIds))
{
var ids = SelectPropertyIds.Split(',').ToList();
strSql += $" and PropertyId not in ('{string.Join("','", ids)}')";
}
//if (!string.IsNullOrWhiteSpace(SelectPropertyIds))
//{
// var ids = SelectPropertyIds.Split(',').ToList();
// strSql += $" and PropertyId not in ('{string.Join("','", ids)}')";
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectTechnology.aspx.cs
+7 -6
View File
@@ -57,15 +57,16 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
private void BindGrid()
{
string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and TechnologyId not in (select TechnologyId from PreRun_SubTechnologySelect where SystemId=@SystemId) ";
//string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and TechnologyId not in (select TechnologyId from PreRun_SubTechnologySelect where SystemId=@SystemId) ";
string strSql = @"select * from PreRun_TechnologySysPiping where ProjectId=@ProjectId and SystemId=@SystemId and TechnologyId not in (select TechnologyId from PreRun_SubTechnologySelect ) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@SystemId", this.SystemId));
if (!string.IsNullOrWhiteSpace(SelectTechnologyIds))
{
var ids = SelectTechnologyIds.Split(',').ToList();
strSql += $" and TechnologyId not in ('{string.Join("','", ids)}')";
}
//if (!string.IsNullOrWhiteSpace(SelectTechnologyIds))
//{
// var ids = SelectTechnologyIds.Split(',').ToList();
// strSql += $" and TechnologyId not in ('{string.Join("','", ids)}')";
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SysPipingDeviceImport.aspx.cs
+2 -1
View File
@@ -1253,7 +1253,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void btngySelect_Click(object sender, EventArgs e)
{
string window = $"SelectTechnology.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}&SelectTechnologyIds={hidSelectTechnology.Text}";
//string window = $"SelectTechnology.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}&SelectTechnologyIds={hidSelectTechnology.Text}";
string window = $"SelectTechnology.aspx?SubSystemId={this.tvControlItem.SelectedNodeID}&SystemId={hidSystemId.Text}";
PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hidSelectTechnology.ClientID) + Window2.GetShowReference(window));
}