This commit is contained in:
2024-06-11 17:27:06 +08:00
parent 9dd993f28e
commit a3ca2594e3
30 changed files with 695 additions and 118 deletions
@@ -30,7 +30,17 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
var daily = BLL.DailyReportCompleteService.GetDailyReportComplete(completeId);
if (daily != null)
{
drpUnit.SelectedValue=daily.UnitId;
var user = BLL.Sys_UserService.GetUsersByUserId(daily.ReportMan);
drpUnit.SelectedValue = daily.UnitId;
if (user != null)
{
txtReportMan.Text = user.UserName;
}
else
{
txtReportMan.Text = this.CurrUser.UserName;
}
drpTeamGroup.SelectedValue = daily.TeamGroupId;
if (daily.DailyReportDate.HasValue)
{
@@ -46,6 +56,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
}
else
{
txtReportMan.Text = this.CurrUser.UserName;
}
}
}
}
@@ -65,7 +79,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.RoleMenuId, Const.BtnSave))
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.DailyReportCompleteMenuId, Const.BtnSave))
{
string completeId = Request.Params["completeId"];
if (drpTeamGroup.SelectedValue == null || drpTeamGroup.SelectedValue == "")
@@ -85,6 +99,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
Model.Pipeline_DailyReportComplete newR = new Model.Pipeline_DailyReportComplete();
newR.ProjectId = this.CurrUser.LoginProjectId;
newR.UnitId = drpUnit.SelectedValue;
newR.ReportMan=this.CurrUser.UserId;
newR.TeamGroupId = drpTeamGroup.SelectedValue;
newR.DailyReportDate=Convert.ToDateTime(txtDailyReportDate.Text).Date;
newR.IsComplete=chkIsComplete.Checked;