增加质量巡检待办

DataBase/版本日志/SGGLDB_WH_2023-08-02.sql

@@ -0,0 +1,67 @@
+
+--获取当前人待办事项
+ALTER  PROCEDURE [dbo].[Sp_Project_GetToDoItems]     
+	@projectId NVARCHAR(50)=NULL,
+	@userId NVARCHAR(200)=NULL
+AS  
+/*获取当前人待办事项*/          
+BEGIN
+SELECT HazardRegisterId AS DataId
+	,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
+	,'安全巡检待整改' AS MenuName
+	,register.RegisterDef AS Content
+	,UserId
+	,users.UserName
+	,register.RegisterDate AS DataTime
+	,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
+	,'../HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
+FROM HSSE_Hazard_HazardRegister AS register 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE register.ProjectId=@projectId AND 
+((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') )) 
+)		
+UNION ALL
+
+SELECT HazardRegisterId AS DataId
+	,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
+	,'安全巡检待确认' AS MenuName
+	,register.RegisterDef AS Content
+	,UserId
+	,users.UserName
+	,register.RegisterDate AS DataTime
+	,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
+	,'../HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
+FROM HSSE_Hazard_HazardRegister AS register 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE register.ProjectId=@projectId AND 
+register.states = '2' AND register.CheckManId =@userId
+
+UNION ALL
+SELECT CheckControlCode AS DataId
+	,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId
+	,'质量巡检待处理' AS MenuName
+	,checkControl.QuestionDef AS Content
+	,UserId
+	,users.UserName
+	,checkControl.CheckDate AS DataTime
+	,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr
+	,'../CQMS/Check/ChecklistEdit.aspx?ToDo=ToDo&CheckControlCode='+checkControl.CheckControlCode AS PCUrl
+FROM Check_CheckControl AS checkControl 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE checkControl.ProjectId=@projectId AND 
+checkControl.State != '7' AND checkControl.CheckControlCode in (select CheckControlCode from Check_CheckControlApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+
+
+
+
+ORDER BY DataTime DESC 
+END
+
+
+
+
+
+
+GO
+
+

SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx.cs

@@ -349,7 +349,15 @@ namespace FineUIPro.Web.CQMS.Check
             if (BLL.CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CheckListMenuId, BLL.Const.BtnSave))
             {
                 SavePauseNotice("save");
+                if (!string.IsNullOrEmpty(Request.Params["ToDo"]))
+                {
+                    string scripts = String.Format("F.getActiveWindow().window.reloadGrid('{0}');", "");
+                    PageContext.RegisterStartupScript(scripts + ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
                     PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
                 //Response.Redirect("/check/CheckList.aspx");
 
             }
@@ -364,8 +372,16 @@ namespace FineUIPro.Web.CQMS.Check
             if (BLL.CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.CheckListMenuId, BLL.Const.BtnSubmit))
             {
                 SavePauseNotice("submit");
+                if (!string.IsNullOrEmpty(Request.Params["ToDo"]))
+                {
+                    string scripts = String.Format("F.getActiveWindow().window.reloadGrid('{0}');", "");
+                    PageContext.RegisterStartupScript(scripts + ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
                     PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
                 }
+            }
             else
             {
                 Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);

SGGL/FineUIPro.Web/SysManage/ProjectToDo.aspx

@@ -44,7 +44,7 @@
                         <f:RenderField Width="240px" ColumnID="Content" DataField="Content" TextAlign="Left"
                             FieldType="String" HeaderText="内容" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="DataTime" DataField="DataTime" 
+                        <f:RenderField Width="150px" ColumnID="DataTime" DataField="DataTime"  Renderer="Date"
                            HeaderText="单据时间" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                     </Columns>