diff --git a/DataBase/版本日志/SGGLDB_WH_2023-10-24.sql b/DataBase/版本日志/SGGLDB_WH_2023-10-24.sql
new file mode 100644
index 00000000..c075b766
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2023-10-24.sql
@@ -0,0 +1,22 @@
+--ɾ
+truncate table PreRun_SubInspectTerm
+truncate table PreRun_SubInspectTermItem
+truncate table PreRun_InspectTailTerm
+truncate table PreRun_InspectTermApproveRecords
+
+--˵͵
+update Sys_Menu set SortIndex=100 where MenuId='A5D6EBB7-E7C8-48EE-8DBD-735117D3C62D'
+delete Sys_Menu where MenuId='F7A324D0-2410-4B37-858C-10F0A3059C90'
+delete Sys_Menu where MenuId='8542644D-BD9B-4188-9FDE-AE5D6D6D9A40'
+delete Sys_Menu where MenuId='2254D22A-94EF-435F-9916-F07BD7082689'
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('F7A324D0-2410-4B37-858C-10F0A3059C90','ȷ',null,'TestRun/BeforeTestRun/TailTermHandleList.aspx',9,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('8542644D-BD9B-4188-9FDE-AE5D6D6D9A40','',null,'TestRun/BeforeTestRun/TailTermApproveList.aspx',10,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1)
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('2254D22A-94EF-435F-9916-F07BD7082689','ת',null,'TestRun/BeforeTestRun/InspectWanderAboutList.aspx',11,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1)
+go
+
+--
+alter table PreRun_InspectTailTerm add HandleUser varchar(50) NULL
+--ʱ
+alter table PreRun_InspectTailTerm add AdjustCompleteTime datetime NULL
+--¼0:¼1:˼¼
+alter table PreRun_InspectTermApproveRecords add ApproveType int NULL
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 175370da..f835c6a8 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1671,6 +1671,8 @@
+
+
@@ -15088,6 +15090,18 @@
TailTermApproveList.aspx
+
+ TailTermHandle.aspx
+
+
+ TailTermHandle.aspx
+
+
+ TailTermHandleList.aspx
+
+
+ TailTermHandleList.aspx
+
GoodsBuy.aspx
ASPXCodeBehind
diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx
index 468964e0..2de40ebc 100644
--- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx
@@ -65,7 +65,7 @@
-
+
@@ -83,19 +83,26 @@
-
-
+
+
+
-
+
+
+
+
+
+
+
@@ -122,8 +129,27 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs
index 2db1d804..bd1b2cce 100644
--- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs
@@ -68,8 +68,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
this.IsView = string.IsNullOrWhiteSpace(Request["IsView"]) ? false : bool.Parse(Request["IsView"]);
//数据绑定
PageInit();
- //审批已经绑定
- gvApproveBrid();
+ //处理和审批意见绑定
+ gvRecordBrid();
//判断是否查看
if (IsView)
{
@@ -84,9 +84,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ddlTermItemId.Enabled = false;
txtQuestionDesc.Enabled = false;
txtRectifyOpinion.Enabled = false;
- txtRectifyTime.Enabled = false;
- ddlInspectUser.Enabled = false;
ddlApproveUser.Enabled = false;
+ ddlHandleUser.Enabled = false;
}
}
}
@@ -101,12 +100,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var selectList = new List();
//施工单位
UnitService.InitUnitByProjectIdUnitTypeDropDownList(ddlConstructionUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
- //获取用户信息
- //var users = from user in Funs.DB.Sys_User
- // join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId
- // where projectrole.ProjectId == this.CurrUser.LoginProjectId
- // select user;
-
//检查人绑定
var userList = from user in Funs.DB.Sys_User
join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId
@@ -122,12 +115,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
//检查人和审核人
if (users.Count() > 0)
{
- //检查人
- ddlInspectUser.DataTextField = "UserName";
- ddlInspectUser.DataValueField = "UserId";
- ddlInspectUser.DataSource = users;
- ddlInspectUser.DataBind();
- ddlInspectUser.SelectedValue = this.CurrUser.UserId;
+ //处理人
+ ddlHandleUser.DataTextField = "UserName";
+ ddlHandleUser.DataValueField = "UserId";
+ ddlHandleUser.DataSource = users;
+ ddlHandleUser.DataBind();
+ ddlHandleUser.SelectedValue = this.CurrUser.UserId;
//审核人
ddlApproveUser.DataTextField = "UserName";
ddlApproveUser.DataValueField = "UserId";
@@ -146,6 +139,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ddlConstructionUnit.SelectedValue = model.ConstructionUnit;
//问题类别
ddlProblemType.SelectedValue = model.ProblemType.ToString();
+ //提出人
+ var inspectModel = users.FirstOrDefault(x => x.UserId == model.InspectUser);
+ if (inspectModel != null)
+ {
+ lblInspectUser.Text = inspectModel.UserName;
+ hidInspectUserId.Text = inspectModel.UserId;
+ }
//绑定管道或者设备
var termitemlist = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.WorkPackType == model.ProblemType).GroupBy(x => new { x.SubInspectId, x.InspectionResults, x.PropertyTechnologyId, x.WorkPackType });
if (termitemlist.Count() > 0)
@@ -220,12 +220,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
txtQuestionDesc.Text = model.QuestionDesc;
//整改意见
txtRectifyOpinion.Text = model.RectifyOpinion;
- //整改时间
- txtRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty;
- //检查人
- ddlInspectUser.SelectedValue = model.InspectUser;
+ //提出时间
+ lblRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd") : string.Empty;
+ //处理人
+ ddlHandleUser.SelectedValue = model.HandleUser;
//审核人
ddlApproveUser.SelectedValue = model.ApproveUser;
+ //整改完成日期
+ txtAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd") : string.Empty;
if (model.ApproveState > 1)
{
QuestionEditImg = -1;
@@ -242,7 +244,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
string code = projectModel.ProjectCode + "-06-CM03-XJ-";
txtTailTermCode.Text = SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.PreRun_InspectTailTerm", "TailTermCode", code);
}
- if (!string.IsNullOrWhiteSpace(TermItemId))
+ if (!string.IsNullOrWhiteSpace(this.TermItemId))
{
var itemTerm = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == this.TermItemId);
if (itemTerm != null)
@@ -266,24 +268,39 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
//检查项
ddlSubInspectId_SelectedIndexChanged(null, null);
ddlTermItemId.SelectedValue = itemTerm.TermItemId;
+ //提出人
+ var inspectModel = users.FirstOrDefault(x => x.UserId == itemTerm.InspectedUser);
+ if (inspectModel != null)
+ {
+ lblInspectUser.Text = inspectModel.UserName;
+ hidInspectUserId.Text = inspectModel.UserId;
+ }
+ //提出时间
+ lblRectifyTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
}
}
}
}
///
- /// 审批意见绑定
+ /// 处理和审批意见绑定
///
- public void gvApproveBrid()
+ public void gvRecordBrid()
{
- string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveState,(case a.ApproveState when 0 then '退回' when 1 then '通过' else '' end) as ApproveStateName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
+ string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveType when 0 then (case a.ApproveState when 0 then '处理退回' when 1 then '处理通过' else '' end) else (case a.ApproveState when 0 then '审批退回' when 1 then '审批通过' else '' end) end) as ApproveStateName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
List listStr = new List();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@TailTermId", this.TailTermId));
strSql += " order by a.AddTime asc";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
- gvApprove.DataSource = tb;
+ //处理意见
+ var handleTb = tb.AsEnumerable().Where(row => row.Field("ApproveType") == 0);
+ gvHandle.DataSource = handleTb;
+ gvHandle.DataBind();
+ //审批意见
+ var approveTb = tb.AsEnumerable().Where(row => row.Field("ApproveType") == 1);
+ gvApprove.DataSource = approveTb;
gvApprove.DataBind();
}
@@ -314,9 +331,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ShowNotify("请选择检查项!", MessageBoxIcon.Warning);
return;
}
- if (string.IsNullOrWhiteSpace(ddlInspectUser.SelectedValue))
+ if (string.IsNullOrWhiteSpace(ddlHandleUser.SelectedValue))
{
- ShowNotify("请选择检查人!", MessageBoxIcon.Warning);
+ ShowNotify("请选择处理人!", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue))
@@ -341,9 +358,11 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
model.TermItemId = ddlTermItemId.SelectedValue;
model.QuestionDesc = txtQuestionDesc.Text.Trim();
model.RectifyOpinion = txtRectifyOpinion.Text.Trim();
- model.RectifyTime = DateTime.Parse(txtRectifyTime.Text);
- model.InspectUser = ddlInspectUser.SelectedValue;
+ model.RectifyTime = DateTime.Parse(lblRectifyTime.Text);
+ model.InspectUser = hidInspectUserId.Text;
+ model.HandleUser = ddlHandleUser.SelectedValue;
model.ApproveUser = ddlApproveUser.SelectedValue;
+ model.AdjustCompleteTime = DateTime.Parse(txtAdjustCompleteTime.Text);
model.ApproveState = 0;
model.AddUser = this.CurrUser.LoginProjectId;
model.AddTime = DateTime.Now;
@@ -386,9 +405,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ShowNotify("请选择检查项!", MessageBoxIcon.Warning);
return;
}
- if (string.IsNullOrWhiteSpace(ddlInspectUser.SelectedValue))
+ if (string.IsNullOrWhiteSpace(ddlHandleUser.SelectedValue))
{
- ShowNotify("请选择检查人!", MessageBoxIcon.Warning);
+ ShowNotify("请选择处理人!", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrWhiteSpace(ddlApproveUser.SelectedValue))
@@ -413,10 +432,12 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
model.TermItemId = ddlTermItemId.SelectedValue;
model.QuestionDesc = txtQuestionDesc.Text.Trim();
model.RectifyOpinion = txtRectifyOpinion.Text.Trim();
- model.RectifyTime = DateTime.Parse(txtRectifyTime.Text);
- model.InspectUser = ddlInspectUser.SelectedValue;
+ model.RectifyTime = DateTime.Parse(lblRectifyTime.Text);
+ model.InspectUser = hidInspectUserId.Text;
+ model.HandleUser = ddlHandleUser.SelectedValue;
model.ApproveUser = ddlApproveUser.SelectedValue;
- model.ApproveState = 2;
+ model.AdjustCompleteTime = DateTime.Parse(txtAdjustCompleteTime.Text);
+ model.ApproveState = 1;
model.AddUser = this.CurrUser.LoginProjectId;
model.AddTime = DateTime.Now;
var workPack = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == model.TermItemId);
@@ -507,6 +528,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ddlSubInspectId.Items.Insert(0, new ListItem("==无数据==", ""));
}
}
+ else
+ {
+ ddlSubInspectId.DataSource = null;
+ ddlSubInspectId.DataBind();
+ ddlSubInspectId.Items.Insert(0, new ListItem("==无数据==", ""));
+ ddlTermItemId.DataSource = null;
+ ddlTermItemId.DataBind();
+ ddlTermItemId.Items.Insert(0, new ListItem("==无数据==", ""));
+ }
}
}
@@ -541,13 +571,32 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
///
- ///
+ /// 检查项
+ ///
+ protected void ddlTermItemId_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ var itemTerm = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == ddlTermItemId.SelectedValue);
+ if (itemTerm != null)
+ {
+ //提出人
+ var inspectModel = Funs.DB.Sys_User.FirstOrDefault(x => x.UserId == itemTerm.InspectedUser);
+ if (inspectModel != null)
+ {
+ lblInspectUser.Text = inspectModel.UserName;
+ hidInspectUserId.Text = inspectModel.UserId;
+ }
+ //提出时间
+ lblRectifyTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
+ }
+ }
+
+ ///
+ /// 关闭
///
protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
{
}
-
}
///
diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs
index fa6da528..9b108838 100644
--- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs
@@ -132,22 +132,40 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected global::FineUIPro.TextArea txtRectifyOpinion;
///
- /// txtRectifyTime 控件。
+ /// lblInspectUser 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.DatePicker txtRectifyTime;
+ protected global::FineUIPro.Label lblInspectUser;
///
- /// ddlInspectUser 控件。
+ /// lblRectifyTime 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.DropDownList ddlInspectUser;
+ protected global::FineUIPro.Label lblRectifyTime;
+
+ ///
+ /// hidInspectUserId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.HiddenField hidInspectUserId;
+
+ ///
+ /// ddlHandleUser 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlHandleUser;
///
/// ddlApproveUser 控件。
@@ -158,6 +176,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
///
protected global::FineUIPro.DropDownList ddlApproveUser;
+ ///
+ /// txtAdjustCompleteTime 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtAdjustCompleteTime;
+
///
/// Panel1 控件。
///
@@ -212,6 +239,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
///
protected global::FineUIPro.FormRow plApprove2;
+ ///
+ /// gvHandle 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid gvHandle;
+
+ ///
+ /// plApprove3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.FormRow plApprove3;
+
///
/// gvApprove 控件。
///
diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx
index 560497cf..45b58ce7 100644
--- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx
@@ -44,6 +44,21 @@
white-space: normal;
word-break: break-all;
}
+
+ .f-grid-cell[data-color=color1] {
+ background-color: #56ff00;
+ color: #fff;
+ }
+
+ .f-grid-cell[data-color=color2] {
+ background-color: #e1db21;
+ color: #fff;
+ }
+
+ .f-grid-cell[data-color=color3] {
+ background-color: #e23129;
+ color: #fff;
+ }
@@ -62,11 +77,11 @@
+ EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true" EnableTextSelection="True" EnableMultiSelect="false" EnableCheckBoxSelect="true" OnRowDataBound="Grid1_RowDataBound">
@@ -77,10 +92,12 @@
-
-
-
-
+
+
+
+
+
+
@@ -88,10 +105,10 @@
-
-
-
-
+
+
+
+
@@ -107,14 +124,22 @@
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs
index 85307203..ec1f35df 100644
--- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.cs
@@ -128,7 +128,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
///
public void BindGrid()
{
- string strSql = @"select * from (select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'管道' as ProblemTypeName,a.SubInspectId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交' when 1 then '退回' when 2 then '待审核' when 3 then '审核通过' else '待提交' end) as ApproveStateName,a.AddTime,a.WorkPackId,c.SubSystemId from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser where a.ProblemType=1 and a.ProjectId=@projectid and c.InspectedUser=@InspectedUser union all select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'设备' as ProblemTypeName,a.SubInspectId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交' when 1 then '退回' when 2 then '待审核' when 3 then '审核通过' else '待提交' end) as ApproveStateName,a.AddTime,a.WorkPackId,c.SubSystemId from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser where a.ProblemType=2 and a.ProjectId=@projectid and c.InspectedUser=@InspectedUser) as t where 1=1 ";
+ string strSql = @"select * from (select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'管道' as ProblemTypeName,a.SubInspectId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.HandleUser,g.UserName as HandleUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交处理' when 1 then '待处理' when 2 then '处理退回' when 3 then '审核退回' when 4 then '待审核' when 5 then '审核通过' else '' end) as ApproveStateName,a.AddTime,a.WorkPackId,c.SubSystemId,a.AdjustCompleteTime,DATEDIFF(DAY, GETDATE(),a.AdjustCompleteTime) as AdjustDiffDay from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser inner join Sys_User as g on g.UserId=a.HandleUser where a.ProblemType=1 and a.ProjectId=@projectid and c.InspectedUser=@InspectedUser union all select a.TailTermId,a.ProjectId,d.ProjectCode,d.ProjectName,a.TailTermCode,a.ConstructionUnit,b.UnitName,a.ProblemType,'设备' as ProblemTypeName,a.SubInspectId,a.TermItemId,c.WorkInspectName,a.QuestionDesc,a.RectifyTime,a.RectifyOpinion,a.InspectUser,e.UserName as InspectUserName,a.ApproveUser,f.UserName as ApproveUserName,a.HandleUser,g.UserName as HandleUserName,a.ApproveState,(case a.ApproveState when 0 then '待提交处理' when 1 then '待处理' when 2 then '处理退回' when 3 then '审核退回' when 4 then '待审核' when 5 then '审核通过' else '' end) as ApproveStateName,a.AddTime,a.WorkPackId,c.SubSystemId,a.AdjustCompleteTime,DATEDIFF(DAY, GETDATE(),a.AdjustCompleteTime) as AdjustDiffDay from PreRun_InspectTailTerm as a inner join Base_Unit as b on a.ConstructionUnit=b.UnitId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Project as d on d.ProjectId=a.ProjectId inner join Sys_User as e on e.UserId=a.InspectUser inner join Sys_User as f on f.UserId=a.ApproveUser inner join Sys_User as g on g.UserId=a.HandleUser where a.ProblemType=2 and a.ProjectId=@projectid and c.InspectedUser=@InspectedUser) as t where 1=1 ";
List listStr = new List();
listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@InspectedUser", this.CurrUser.UserId));
@@ -216,6 +216,34 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
BindGrid();
}
+ ///
+ /// 行数据处理事件
+ ///
+ protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
+ {
+ DataRowView row = e.DataItem as DataRowView;
+
+ // 入学年份
+ int diffDay = Convert.ToInt32(row["AdjustDiffDay"]);
+ TemplateField AdjustDiffDay = Grid1.FindColumn("AdjustDiffDay") as TemplateField;
+ int approveState = int.Parse(Grid1.DataKeys[e.RowIndex][1].ToString());
+ if (approveState != 5)
+ {
+ if (diffDay > 0)
+ {
+ e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color1";
+ }
+ else if (diffDay == 0)
+ {
+ e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color2";
+ }
+ else if (diffDay < 0)
+ {
+ e.CellAttributes[AdjustDiffDay.ColumnIndex]["data-color"] = "color3";
+ }
+ }
+ }
+
#endregion
#region 按钮
@@ -230,12 +258,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
+
+ var passLs = new List() { 0, 2 };
var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID);
if (model != null)
{
- if (model.ApproveState > 1)
+ if (!passLs.Contains(model.ApproveState.Value))
{
- Alert.ShowInTop("只可编辑“待提交”和“退回”的记录！", MessageBoxIcon.Warning);
+ Alert.ShowInTop("只可编辑“待提交处理”和“处理退回”的记录！", MessageBoxIcon.Warning);
return;
}
}
@@ -314,7 +344,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
///
- /// 提交审核
+ /// 提交处理
///
protected void btnSubmitReview_Click(object sender, EventArgs e)
{
@@ -323,15 +353,17 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
+ var passLs = new List() { 0, 2 };
var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID);
if (model != null)
{
- if (model.ApproveState > 1)
+ //0:待提交处理1:待处理2:处理退回3:审核退回54:待审核:审核通过
+ if (!passLs.Contains(model.ApproveState.Value))
{
- Alert.ShowInTop("只可提交“待提交”和“退回”的记录！", MessageBoxIcon.Warning);
+ Alert.ShowInTop("只可提交“待提交处理”和“处理退回”的记录！", MessageBoxIcon.Warning);
return;
}
- model.ApproveState = 2;
+ model.ApproveState = 1;
Funs.DB.SubmitChanges();
BindGrid();
Alert.ShowInTop("提交成功！", MessageBoxIcon.Success);
@@ -351,9 +383,10 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == Grid1.SelectedRowID);
if (model != null)
{
- if (model.ApproveState != 2)
+ //0:待提交处理1:待处理2:处理退回3:审核退回54:待审核:审核通过
+ if (model.ApproveState != 1)
{
- Alert.ShowInTop("只可撤回“待审核”的记录！", MessageBoxIcon.Warning);
+ Alert.ShowInTop("只可撤回“待处理”的记录！", MessageBoxIcon.Warning);
return;
}
model.ApproveState = 0;
@@ -365,6 +398,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
#endregion
+ #region 私有方法
///
/// 已生成检查表的管道/设备
@@ -411,5 +445,41 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
return yczData;
}
+
+ ///
+ /// 是否逾期返回
+ ///
+ ///
+ public string IsOverdue(object diffDayVal, object approveStateVal)
+ {
+ var result = string.Empty;
+ var diffDay = 0;
+ var approveState = 0;
+ if (diffDayVal != null) diffDay = int.Parse(diffDayVal.ToString());
+ if (approveStateVal != null) approveStateVal = int.Parse(approveStateVal.ToString());
+ if (approveState != 5)
+ {
+ if (diffDay > 0)
+ {
+ result = "未逾期";
+ }
+ else if (diffDay == 0)
+ {
+ result = "即将逾期";
+ }
+ else if (diffDay < 0)
+ {
+ result = "已逾期";
+ }
+ }
+ else
+ {
+ result = "整改完毕";
+ }
+ return result;
+ }
+
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs
index fe174a49..a8fbba6a 100644
--- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx.designer.cs
@@ -158,6 +158,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
///
protected global::FineUIPro.Button btnwithdraw;
+ ///
+ /// lblIsOverdue 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lblIsOverdue;
+
///
/// ToolbarSeparator1 控件。
///
diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx
index 8d4f094e..a1d202e7 100644
--- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx
@@ -27,7 +27,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx
index b07e6e93..b530f7d8 100644
--- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplateEdit.aspx
@@ -37,7 +37,6 @@
- <%-- --%>
diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx
index fe7cc557..ebb863a5 100644
--- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx
@@ -14,51 +14,82 @@
.mycheckbox .f-field-checkbox-switch .f-field-checkbox-switch-text {
min-width: 40px;
}
+
+ .f-grid-tpl .ispass input {
+ margin: 3px;
+ }
+
+ .f-grid-tpl .ispass label {
+ margin-left: 3px;
+ margin-right: 10px;
+ }