Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

DataBase/版本日志/SGGLDB_V2023-07-04.sql

@@ -0,0 +1,46 @@
+
+--获取当前人项目级待办事项
+ALTER PROCEDURE [dbo].[Sp_Project_GetToDoItems]   
+	@projectId NVARCHAR(50)=NULL,
+	@personId NVARCHAR(200)=NULL
+AS  
+/*获取当前人本部待办事项*/          
+BEGIN
+SELECT CostManageId AS DataId
+	,'HSE费用申请' AS MenuName
+	,('HSE费用申请'+ CONVERT(varchar(100),CostManage.CostManageDate, 23)+'待处理。') AS Content
+	,PersonId
+	,persons.PersonName
+	,CostManage.CostManageDate AS DataTime
+	,CONVERT(varchar(100),CostManage.CostManageDate, 23) AS DataTimeStr
+	,(CASE WHEN CostManage.States = '0' THEN  '../HSSE/CostGoods/CostManageEdit.aspx?CostManageId='+CostManageId 
+			ELSE '../HSSE/CostGoods/CostManageAudit.aspx?CostManageId='+CostManageId END)AS PCUrl
+FROM CostGoods_CostManage AS CostManage 
+LEFT JOIN Person_Persons AS persons ON CostManage.NextManId= persons.PersonId
+WHERE  CostManage.ProjectId=@projectId AND (CostManage.States = '0' or CostManage.States='1' )
+	AND CostManage.NextManId =@personId 
+
+UNION ALL
+SELECT ActionPlan.ActionPlanListId AS DataId
+    ,'安全实施计划' AS MenuName
+	,('安全实施计划'+ CONVERT(varchar(100),ActionPlan.CompileDate, 23)+'待处理。')+'待处理' AS Content
+	,approve.ApproveMan AS PersonId
+	,persons.PersonName
+	,CompileDate AS DataTime
+	,CONVERT(varchar(100),CompileDate, 23) AS DataTimeStr
+	,'../HSSE/ActionPlan/ActionPlanListEdit.aspx?ActionPlanListId='+ActionPlan.ActionPlanListId AS PCUrl	
+FROM ActionPlan_ActionPlanList AS ActionPlan
+LEFT JOIN ActionPlan_ActionPlanListApprove as approve on ActionPlan.ActionPlanListId=approve.ActionPlanListId and ApproveType!='S' and approve.ApproveMan=@personId and ApproveDate is null
+LEFT JOIN Person_Persons AS persons ON persons.PersonId =approve.ApproveMan
+WHERE ActionPlan.ProjectId=@projectId and ActionPlan.ActionPlanListId in (select ActionPlanListId from dbo.ActionPlan_ActionPlanListApprove 
+	where PersonId=@PersonId and ApproveDate is null and ApproveType!='S')
+
+
+
+ORDER BY DataTime DESC 
+END
+
+
+GO
+
+

SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs

@@ -100,10 +100,10 @@ namespace FineUIPro.Web.ZHGL.Plan
                     {
                         HFActionPlanListId.Text = this.ActionPlanListId;
                         this.ProjectId = actionPlanList.ProjectId;
-                        if (this.ProjectId != this.CurrUser.LoginProjectId)
-                        {
-                            BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpCompileMan, this.ProjectId, null, null, true);
-                        }
+                        //if (this.ProjectId != this.CurrUser.LoginProjectId)
+                        //{
+                        //    BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpCompileMan, this.ProjectId, null, null, false);
+                        //}
                         if (actionPlanList.Edition != null)
                         {
                             txtEdition.Text = actionPlanList.Edition.ToString();

SGGL/FineUIPro.Web/index.aspx.cs

@@ -309,7 +309,7 @@ namespace FineUIPro.Web
                     this.MenuSwitchMethod(Request.Params["menuType"]);
 
                 }
-                this.MenuSwitchMethod(Request.Params["menuType"]);
+               // this.MenuSwitchMethod(Request.Params["menuType"]);
                 this.InitMenuStyleButton();
                 this.InitMenuModeButton();
                 this.InitLangMenuButton();