lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改安全实施计划

Browse Source
This commit is contained in:
高飞
2023-07-03 09:47:13 +08:00
parent a4f541fd35
commit f5a5663374
3 changed files with 94 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2023-07-03.sql
+46
View File
@@ -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
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/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs
+29 -29
View File
@@ -171,26 +171,26 @@ namespace FineUIPro.Web.HSSE.ActionPlan
Panel2.Enabled = false; Panel2.Enabled = false;
} }
//提交版本人多次修改 //提交版本人多次修改
if (actionPlanList.CompileMan.Equals(CurrUser.PersonId)) //if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
{ //{
txtActionPlanListCode.Enabled = true; // txtActionPlanListCode.Enabled = true;
txtActionPlanListName.Enabled = true; // txtActionPlanListName.Enabled = true;
txtVersionNo.Enabled = true; // txtVersionNo.Enabled = true;
drpProjectType.Enabled = true; // drpProjectType.Enabled = true;
drpCompileMan.Enabled = true; // drpCompileMan.Enabled = true;
txtCompileDate.Enabled = true; // txtCompileDate.Enabled = true;
ContactImg = 0; // ContactImg = 0;
Panel2.Enabled = true; // Panel2.Enabled = true;
Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId); // Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId);
if (approve == null) // if (approve == null)
{ // {
rblIsAgree.Hidden = true; // rblIsAgree.Hidden = true;
rblIsAgree.Required = false; // rblIsAgree.Required = false;
options.Hidden = true; // options.Hidden = true;
txtOptions.Required = false; // txtOptions.Required = false;
optio.Hidden = true; // optio.Hidden = true;
} // }
} //}
} }
WindowAtt_Close(null, null); WindowAtt_Close(null, null);
} }
@@ -514,15 +514,15 @@ namespace FineUIPro.Web.HSSE.ActionPlan
actionPlanList.States = actionPlanList1.States; actionPlanList.States = actionPlanList1.States;
} }
//提交时候，更新提交版本 //提交时候，更新提交版本
if (CurrUser.PersonId.Equals(actionPlanList1.CompileMan)) //if (CurrUser.PersonId.Equals(actionPlanList1.CompileMan))
{ //{
if (actionPlanList1.States != Const.ActionPlanList_Audit) // if (actionPlanList1.States != Const.ActionPlanList_Audit)
{ // {
edtion++; // edtion++;
} // }
actionPlanList.Edition = Convert.ToInt32(edtion); // actionPlanList.Edition = Convert.ToInt32(edtion);
actionPlanList.States = Const.ActionPlanList_Audit; // actionPlanList.States = Const.ActionPlanList_Audit;
} //}
BLL.ActionPlanListService.UpdateActionPlanList(actionPlanList); BLL.ActionPlanListService.UpdateActionPlanList(actionPlanList);
//判断状态，全部会签同意，则审批完成 //判断状态，全部会签同意，则审批完成
if (type == BLL.Const.BtnSubmit) if (type == BLL.Const.BtnSubmit)
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs
+19 -19
View File
@@ -228,25 +228,25 @@ namespace FineUIPro.Web.ZHGL.Plan
this.gvDepart.EnableRowDoubleClickEvent = false; this.gvDepart.EnableRowDoubleClickEvent = false;
} }
//提交版本人多次修改 //提交版本人多次修改
if (actionPlanList.CompileMan.Equals(CurrUser.PersonId)) //if (actionPlanList.CompileMan.Equals(CurrUser.PersonId))
{ //{
txtActionPlanListCode.Enabled = true; // txtActionPlanListCode.Enabled = true;
txtActionPlanListName.Enabled = true; // txtActionPlanListName.Enabled = true;
txtVersionNo.Enabled = true; // txtVersionNo.Enabled = true;
drpProjectType.Enabled = true; // drpProjectType.Enabled = true;
drpCompileMan.Enabled = true; // drpCompileMan.Enabled = true;
txtCompileDate.Enabled = true; // txtCompileDate.Enabled = true;
ContactImg = 0; // ContactImg = 0;
Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId); // Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId);
if (approve == null) // if (approve == null)
{ // {
rblIsAgree.Hidden = true; // rblIsAgree.Hidden = true;
rblIsAgree.Required = false; // rblIsAgree.Required = false;
options.Hidden = true; // options.Hidden = true;
txtOptions.Required = false; // txtOptions.Required = false;
optio.Hidden = true; // optio.Hidden = true;
} // }
} //}
} }
WindowAtt_Close(null, null); WindowAtt_Close(null, null);
} }