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

20240331 质量月报

Browse Source
This commit is contained in:
毕文静
2024-03-31 01:12:53 +08:00
parent 1791d28bde
commit 4aa229ef1f
54 changed files with 6959 additions and 1709 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingEdit.aspx.cs
+41 -41
View File
@@ -23,15 +23,15 @@ namespace FineUIPro.Web.TestRun.Meeting
if (data != null)
{
this.hdId.Text = id;
this.txtMeetingCode.Text = data.MeetingCode;
this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
//this.txtMeetingCode.Text = data.MeetingCode;
//this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : "";
this.txtMeetingAddress.Text = data.MeetingAddress;
this.txtMeetingUrl.Text = data.AttachUrl;
if (!string.IsNullOrEmpty(data.CompileMan))
{
this.drpCompileMan.SelectedValue = data.CompileMan;
}
this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
//this.txtMeetingUrl.Text = data.AttachUrl;
//if (!string.IsNullOrEmpty(data.CompileMan))
//{
// this.drpCompileMan.SelectedValue = data.CompileMan;
//}
//this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : "";
}
}
else
@@ -121,22 +121,22 @@ namespace FineUIPro.Web.TestRun.Meeting
{
string id = Request.Params["id"];
Model.Driver_Meeting newData = new Model.Driver_Meeting();
newData.MeetingCode = this.txtMeetingCode.Text.Trim();
newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim());
//newData.MeetingCode = this.txtMeetingCode.Text.Trim();
//newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim());
newData.MeetingAddress = this.txtMeetingAddress.Text.Trim();
newData.AttachUrl = this.txtMeetingUrl.Text.Trim();
if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
{
newData.CompileMan = this.drpCompileMan.SelectedValue;
}
newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
//newData.AttachUrl = this.txtMeetingUrl.Text.Trim();
//if (this.drpCompileMan.SelectedValue != BLL.Const._Null)
//{
// newData.CompileMan = this.drpCompileMan.SelectedValue;
//}
//newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
newData.ProjectId = this.CurrUser.LoginProjectId;
////单据状态
newData.States = BLL.Const.State_0;
if (type == BLL.Const.BtnSubmit)
{
newData.States = this.ctlAuditFlow.NextStep;
}
//newData.States = BLL.Const.State_0;
//if (type == BLL.Const.BtnSubmit)
//{
// newData.States = this.ctlAuditFlow.NextStep;
//}
if (!string.IsNullOrEmpty(id))
{
newData.MeetingId = id;
@@ -179,7 +179,7 @@ namespace FineUIPro.Web.TestRun.Meeting
#endregion
////保存流程审核数据
this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.WeekMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null);
//this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.WeekMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null);
}
#endregion
@@ -235,25 +235,25 @@ namespace FineUIPro.Web.TestRun.Meeting
chidNode.Expanded = true;
chidNode.Selectable = true;
var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
if (meeting != null)
{
if (meeting.States == "2")
{
if (i.IsMeeting == true)
{
chidNode.Text = item.Text + "（可按时参加）";
}
else if (i.IsMeeting == false)
{
chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
}
else
{
chidNode.Text = item.Text + "（暂未反馈）";
}
}
}
//var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim());
//if (meeting != null)
//{
// if (meeting.States == "2")
// {
// if (i.IsMeeting == true)
// {
// chidNode.Text = item.Text + "（可按时参加）";
// }
// else if (i.IsMeeting == false)
// {
// chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）";
// }
// else
// {
// chidNode.Text = item.Text + "（暂未反馈）";
// }
// }
//}
}
}
}