lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/CostGoods/CostManageEdit.aspx.cs
+16 -16
View File
@@ -121,7 +121,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
{
JObject summary = new JObject();
summary.Add("InvestCostProject", "本次申请合计金额（元）");
summary.Add("PriceMoney", getItem.Sum(x=>x.PriceMoney ?? 0));
summary.Add("PriceMoney", getItem.Sum(x => x.PriceMoney ?? 0));
Grid1.SummaryData = summary;
}
@@ -133,7 +133,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
protected void Window1_Close(object sender, EventArgs e)
{
BindGrid();
}
}
#endregion
#region 新增费用申请情况
@@ -167,7 +167,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
{
this.Edit();
}
/// <summary>
/// 编辑
/// </summary>
@@ -238,7 +238,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
private void BindGrid2()
{
var FlowOperates = from x in Funs.DB.CostGoods_CostManageFlowOperate
where x.CostManageId == this.CostManageId
where x.CostManageId == this.CostManageId
select new
{
x.FlowOperateId,
@@ -246,16 +246,16 @@ namespace FineUIPro.Web.HSSE.CostGoods
x.AuditFlowName,
x.SortIndex,
x.UnitId,
UnitName=Funs.DB.Base_Unit.First(u=>u.UnitId == x.UnitId).UnitName,
UnitName = Funs.DB.Base_Unit.First(u => u.UnitId == x.UnitId).UnitName,
x.OperaterId,
OperaterName= Funs.DB.Person_Persons.First(u => u.PersonId == x.OperaterId).PersonName,
OperaterName = Funs.DB.Person_Persons.First(u => u.PersonId == x.OperaterId).PersonName,
x.OperaterTime,
x.IsAgree,
x.Opinion,
x.IsClosed
};
this.Grid2.DataSource = FlowOperates.OrderByDescending(x=>x.SortIndex);
this.Grid2.DataSource = FlowOperates.OrderByDescending(x => x.SortIndex);
this.Grid2.DataBind();
}
#endregion
@@ -278,7 +278,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSubmit_Click(object sender, EventArgs e)
{
{
if (this.drpNextMan.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择" + this.drpNextMan.Label + "!", MessageBoxIcon.Warning);
@@ -311,8 +311,8 @@ namespace FineUIPro.Web.HSSE.CostGoods
CompileMan = this.CurrUser.PersonId,
CompileDate = DateTime.Now,
};
var costManageItems = CostManageItemService.GetCostManageItemByCostManageId(this.CostManageId);
if (costManageItems.Count ==0)
var costManageItems = CostManageItemService.GetCostManageItemByCostManageId(this.CostManageId);
if (costManageItems.Count == 0)
{
costManage.SumMoney = decimal.Parse(txtHseCost.Text.Trim());
}
@@ -326,16 +326,16 @@ namespace FineUIPro.Web.HSSE.CostGoods
costManage.NextManId = costManage.CompileMan;
}
var getCost= CostManageService.GetCostManageById(this.CostManageId);
var getCost = CostManageService.GetCostManageById(this.CostManageId);
if (getCost != null)
{
{
costManage.CostManageId = this.CostManageId;
BLL.CostManageService.UpdateCostManage(costManage);
BLL.LogService.AddSys_Log(this.CurrUser, costManage.CostManageCode, costManage.CostManageId, BLL.Const.ProjectCostManageMenuId, BLL.Const.BtnModify);
}
else
{
costManage.CostManageCode = Funs.GetNewFileName();
costManage.CostManageCode = Funs.GetNewFileName();
costManage.CostManageId = this.CostManageId;
BLL.CostManageService.AddCostManage(costManage);
BLL.LogService.AddSys_Log(this.CurrUser, costManage.CostManageCode, costManage.CostManageId, BLL.Const.ProjectCostManageMenuId, BLL.Const.BtnAdd);
@@ -343,10 +343,10 @@ namespace FineUIPro.Web.HSSE.CostGoods
if (type == Const.BtnSubmit)
{
var getNext=CostManageService.getNextCostManageFlowOperateList(this.CostManageId, this.CurrUser.PersonId);
if(getNext != null)
var getNext = CostManageService.getNextCostManageFlowOperateList(this.CostManageId, this.CurrUser.PersonId);
if (getNext != null)
{
getNext.OperaterId = this.drpNextMan.SelectedValue ;
getNext.OperaterId = this.drpNextMan.SelectedValue;
CostManageService.updateCostManageFlowOperate(getNext);
}
}