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

修改质量标准规范

This commit is contained in:
高飞 2023-05-08 15:36:58 +08:00
parent 63973e8c95
commit ba4f23e921
4 changed files with 74 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/SGGLPackFile
/SGGL/FineUIPro.Web/File/Excel/Temp
/SGGL/FineUIPro.Web/FileUpload/QRCodeFile
/SGGL/FineUIPro.Web/FileUpload/DataBase/ConstructionStandardProject/2023-05

16
SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProject.aspx
View File

@ -6,6 +6,22 @@
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>标准规范</title>
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-colheader-text {
white-space: normal;
word-break: break-all;
}
.green
{
background-color: greenyellow;
}
</style>
</head>
<body>
<form id="form1" runat="server">

46
SGGL/FineUIPro.Web/CQMS/DataBase/ConstructionStandardListProject.aspx.cs
View File

@ -131,24 +131,31 @@ namespace FineUIPro.Web.CQMS.DataBase
standardList.StandardType,
standardList.Memo"
+ @" FROM CQMS_Law_ConstructionStandardListProject AS standardList "
+ @" WHERE standardList.ProjectId=@projectId AND standardList.StandardType=@StandardType";
+ @" WHERE standardList.ProjectId=@projectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@StandardType", this.tvControlItem.SelectedNodeID));
if (!string.IsNullOrEmpty(this.txtStandardName.Text.Trim()))
if (string.IsNullOrEmpty(this.txtStandardName.Text.Trim()) && string.IsNullOrEmpty(this.txtStandardGrade.Text.Trim()) && string.IsNullOrEmpty(this.txtStandardNo.Text.Trim()))
{
strSql += " AND standardList.StandardName LIKE @StandardName";
listStr.Add(new SqlParameter("@StandardName", "%" + this.txtStandardName.Text.Trim() + "%"));
strSql += " AND standardList.StandardType=@StandardType";
listStr.Add(new SqlParameter("@StandardType", this.tvControlItem.SelectedNodeID));
}
if (!string.IsNullOrEmpty(this.txtStandardGrade.Text.Trim()))
else
{
strSql += " AND standardList.StandardGrade LIKE @StandardGrade";
listStr.Add(new SqlParameter("@StandardGrade", "%" + this.txtStandardGrade.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtStandardNo.Text.Trim()))
{
strSql += " AND standardList.StandardNo LIKE @StandardNo";
listStr.Add(new SqlParameter("@StandardNo", "%" + this.txtStandardNo.Text.Trim() + "%"));
if (!string.IsNullOrEmpty(this.txtStandardName.Text.Trim()))
{
strSql += " AND standardList.StandardName LIKE @StandardName";
listStr.Add(new SqlParameter("@StandardName", "%" + this.txtStandardName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtStandardGrade.Text.Trim()))
{
strSql += " AND standardList.StandardGrade LIKE @StandardGrade";
listStr.Add(new SqlParameter("@StandardGrade", "%" + this.txtStandardGrade.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtStandardNo.Text.Trim()))
{
strSql += " AND standardList.StandardNo LIKE @StandardNo";
listStr.Add(new SqlParameter("@StandardNo", "%" + this.txtStandardNo.Text.Trim() + "%"));
}
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@ -172,11 +179,14 @@ namespace FineUIPro.Web.CQMS.DataBase
this.Grid1.SelectedRowIDArray = ids.ToArray();
}
}
//var selectIds = (from x in Funs.DB.WBS_BreakdownProject where x.DivisionProjectId == this.trWBS.SelectedNodeID && x.IsSelected == true select x.BreakdownProjectId).ToList();
//if (selectIds.Count() > 0)
//{
// this.Grid1.SelectedRowIDArray = selectIds.ToArray();
//}
for (int i = 0; i < Grid1.Rows.Count; i++)
{
var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == Grid1.Rows[i].RowID + this.CurrUser.LoginProjectId);
if (attachFile != null && !string.IsNullOrEmpty(attachFile.AttachUrl))
{
Grid1.Rows[i].CellCssClasses[18] = "green";
}
}
}
#endregion

33
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -89,10 +89,6 @@
<HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
@ -16204,6 +16200,35 @@
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Excel">
<Guid>{00020813-0000-0000-C000-000000000046}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>6</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor>
<VersionMinor>3</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>