shecs/ZHJA_HJGL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2024-10-17 14:50:41 +08:00
parent f0bb5eacc2
commit 1771fc51d5
6 changed files with 86 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs
+29 -19
View File
@@ -118,7 +118,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
string strSql = "select v.*,newid() as New_ID from (SELECT distinct * FROM HJGL_View_InspectionBatch WHERE 1=1";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue!="null")
if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null")
{
strSql += " AND ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue));
@@ -155,7 +155,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
this.GetShowColumn(c.Columns);
}
}
#endregion
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
// BindGrid();
//}
//#endregion
#region 分页
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
@@ -227,7 +227,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
#endregion
#region 导出
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
@@ -244,20 +244,20 @@ namespace FineUIPro.Web.HJGL.WeldingReport
// n++;
//}
Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "3");
List<string> columns = new List<string>();
if (c != null)
{
string[] items = c.Columns.Split(',');
columns = new List<string>(items);
}
else
{
for (int i=1; i <= Grid1.Columns.Count; i++)
{
columns.Add(i.ToString());
}
}
Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "3");
List<string> columns = new List<string>();
if (c != null)
{
string[] items = ("0," + c.Columns).Split(',');
columns = new List<string>(items);
}
else
{
for (int i = 1; i <= Grid1.Columns.Count; i++)
{
columns.Add(i.ToString());
}
}
Response.ClearContent();
string filename = Funs.GetNewFileName();
//string style = @"<style> .text { mso-number-format:\@; } </script> ";
@@ -289,7 +289,11 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
if (columns.Contains(column.ColumnIndex.ToString()))
{
if (column.ColumnIndex == 1)
if (column.ColumnIndex == 0)
{
sb.AppendFormat("<td align='center' style='width:118px;'>{0}</td>", column.HeaderText);
}
else if (column.ColumnIndex == 1)
{
sb.AppendFormat("<td align='center' style='width:118px;'>{0}</td>", column.HeaderText);
}
@@ -381,6 +385,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
}
}
sb.Append("</tr>");
int a = 1;
foreach (GridRow row in grid.Rows)
{
sb.Append("<tr>");
@@ -390,6 +395,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport
if (columnIndexs.Contains(columnIndex))
{
string html = value.ToString();
if (columnIndex == 0)
{
html = a.ToString();
}
if (html.StartsWith(Grid.TEMPLATE_PLACEHOLDER_PREFIX))
{
// 模板列
@@ -421,6 +430,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
sb.AppendFormat("<td align='center'>{0}</td>", html);
}
columnIndex++;
a++;
}
sb.Append("</tr>");
}