代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -1,10 +1,7 @@
|
||||
using BLL;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace FineUIPro.Web.HSSE.CostGoods
|
||||
{
|
||||
@@ -107,7 +104,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
|
||||
Grid1.Columns.Add(bf);
|
||||
|
||||
Grid1.DataKeyNames = new string[] { "Id", "CostTypeName" };
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -154,7 +151,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
|
||||
DataTable table = new DataTable();
|
||||
table.Columns.Add(new DataColumn("Id", typeof(string)));
|
||||
table.Columns.Add(new DataColumn("SupCostTypeName", typeof(string)));
|
||||
table.Columns.Add(new DataColumn("CostTypeName", typeof(string)));
|
||||
table.Columns.Add(new DataColumn("CostTypeName", typeof(string)));
|
||||
for (int i = 0; sDate + i <= eDate; i++)
|
||||
{
|
||||
table.Columns.Add(new DataColumn((sDate + i).ToString(), typeof(string)));
|
||||
@@ -174,11 +171,11 @@ namespace FineUIPro.Web.HSSE.CostGoods
|
||||
return table;
|
||||
}
|
||||
|
||||
private void SetTable(DataTable table,string unitId)
|
||||
private void SetTable(DataTable table, string unitId)
|
||||
{
|
||||
var getDetail = from x in Funs.DB.CostGoods_ExpenseDetail
|
||||
join y in Funs.DB.CostGoods_Expense on x.ExpenseId equals y.ExpenseId
|
||||
where y.ProjectId == this.ProjectId && (unitId == null || y.UnitId == this.drpUnit.SelectedValue)
|
||||
where y.ProjectId == this.ProjectId && (unitId == null || y.UnitId == this.drpUnit.SelectedValue)
|
||||
orderby y.Year, x.SupSortIndex, x.SortIndex
|
||||
select new { x.ExpenseDetailId, x.ExpenseId, y.Year, x.SupCostTypeId, x.SupCostTypeName, x.SupSortIndex, x.CostType, x.CostTypeName, x.SortIndex, x.CostMoney };
|
||||
var getType = (from x in getDetail select new { x.SupSortIndex, x.SortIndex, x.CostType }).Distinct();
|
||||
@@ -220,7 +217,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
|
||||
int rSum = 3;
|
||||
for (int i = 0; sDate + i <= eDate; i++)
|
||||
{
|
||||
var getV = getDetail.Where(x => x.Year == sDate + i );
|
||||
var getV = getDetail.Where(x => x.Year == sDate + i);
|
||||
if (getV.Count() > 0)
|
||||
{
|
||||
rowSum[rSum] = getV.Sum(x => x.CostMoney ?? 0);
|
||||
@@ -249,10 +246,10 @@ namespace FineUIPro.Web.HSSE.CostGoods
|
||||
Response.ContentType = "application/excel";
|
||||
Response.ContentEncoding = System.Text.Encoding.UTF8;
|
||||
this.Grid1.PageSize = this.Grid1.RecordCount;
|
||||
|
||||
|
||||
Response.Write(GetGridTableHtml(this.Grid1));
|
||||
Response.End();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 分页 排序
|
||||
@@ -364,7 +361,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
|
||||
var getEx = ExpenseService.GetExpenseById(rowID);
|
||||
if (getEx != null && !string.IsNullOrEmpty(getEx.UnitId))
|
||||
{
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, getEx.ExpenseCode, getEx.ExpenseId, BLL.Const.ProjectExpenseMenuId, BLL.Const.BtnDelete);
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, getEx.ExpenseCode, getEx.ExpenseId, BLL.Const.ProjectExpenseMenuId, BLL.Const.BtnDelete);
|
||||
BLL.ExpenseService.DeleteExpenseById(rowID);
|
||||
}
|
||||
}
|
||||
@@ -382,7 +379,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
|
||||
/// <param name="e"></param>
|
||||
protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
this.LoadData();
|
||||
this.LoadData();
|
||||
}
|
||||
|
||||
#region 获取按钮权限
|
||||
|
||||
Reference in New Issue
Block a user