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-12 07:10:19 +08:00
parent a873d6c064
commit 227b1472c9
7 changed files with 85 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2023-07-11.sql
+2
View File
@@ -0,0 +1,2 @@
alter table dbo.ActionPlan_ActionPlanListApprove drop constraint FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList
GO
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx
+2 -1
View File
@@ -56,9 +56,10 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:RadioButtonList runat="server" ID="rblIsReview" Label="备案/部门评审" LabelWidth="140px" AutoPostBack="true" OnSelectedIndexChanged="rblIsReview_SelectedIndexChanged"> <f:RadioButtonList runat="server" ID="rblIsReview" Label="备案/评审" LabelWidth="140px" AutoPostBack="true" OnSelectedIndexChanged="rblIsReview_SelectedIndexChanged">
<f:RadioItem Text="备案" Value="False" Selected="true" /> <f:RadioItem Text="备案" Value="False" Selected="true" />
<f:RadioItem Text="部门评审" Value="True" /> <f:RadioItem Text="部门评审" Value="True" />
<f:RadioItem Text="公司部门评审" Value="True2" />
</f:RadioButtonList> </f:RadioButtonList>
<f:DropDownList ID="drpReviewMan" runat="server" Label="评审负责人" LabelAlign="Right" Hidden="true" EnableEdit="true" <f:DropDownList ID="drpReviewMan" runat="server" Label="评审负责人" LabelAlign="Right" Hidden="true" EnableEdit="true"
LabelWidth="120px"> LabelWidth="120px">
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs
+49 -22
View File
@@ -138,6 +138,10 @@ namespace FineUIPro.Web.ZHGL.Plan
this.drpReviewMan.Hidden = false; this.drpReviewMan.Hidden = false;
this.drpReviewMan.SelectedValue = actionPlanList.ReviewMan; this.drpReviewMan.SelectedValue = actionPlanList.ReviewMan;
} }
else if (actionPlanList.IsCompanyReview == true)
{
this.rblIsReview.SelectedValue = "True2";
}
else else
{ {
this.rblIsReview.SelectedValue = "False"; this.rblIsReview.SelectedValue = "False";
@@ -231,26 +235,12 @@ namespace FineUIPro.Web.ZHGL.Plan
this.btnMenuDelete.Hidden = true; this.btnMenuDelete.Hidden = true;
this.gvDepart.EnableRowDoubleClickEvent = false; this.gvDepart.EnableRowDoubleClickEvent = false;
} }
//提交版本人多次修改 var approves = BLL.ActionPlanListApproveService.GetReviewings(this.ActionPlanListId, actionPlanList.Edition.Value);
//if (actionPlanList.CompileMan.Equals(CurrUser.PersonId)) if (approves.Count == 0)
//{ {
// txtActionPlanListCode.Enabled = true; this.drpPerson.Hidden = true;
// txtActionPlanListName.Enabled = true; this.rblIsCompanyReview.Hidden = true;
// txtVersionNo.Enabled = true; }
// drpProjectType.Enabled = true;
// drpCompileMan.Enabled = true;
// txtCompileDate.Enabled = true;
// ContactImg = 0;
// Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId);
// if (approve == null)
// {
// rblIsAgree.Hidden = true;
// rblIsAgree.Required = false;
// options.Hidden = true;
// txtOptions.Required = false;
// optio.Hidden = true;
// }
//}
} }
WindowAtt_Close(null, null); WindowAtt_Close(null, null);
} }
@@ -380,7 +370,14 @@ namespace FineUIPro.Web.ZHGL.Plan
{ {
actionPlanList.CompileDate = Convert.ToDateTime(this.txtCompileDate.Text.Trim()); actionPlanList.CompileDate = Convert.ToDateTime(this.txtCompileDate.Text.Trim());
} }
if (this.rblIsReview.SelectedValue != "True2")
{
actionPlanList.IsReview = Convert.ToBoolean(this.rblIsReview.SelectedValue); actionPlanList.IsReview = Convert.ToBoolean(this.rblIsReview.SelectedValue);
}
else
{
actionPlanList.IsCompanyReview = true;
}
if (this.drpReviewMan.SelectedValue != BLL.Const._Null) if (this.drpReviewMan.SelectedValue != BLL.Const._Null)
{ {
actionPlanList.ReviewMan = this.drpReviewMan.SelectedValue; actionPlanList.ReviewMan = this.drpReviewMan.SelectedValue;
@@ -576,6 +573,10 @@ namespace FineUIPro.Web.ZHGL.Plan
{ {
actionPlanList.States = BLL.Const.ActionPlanList_Reviewing; actionPlanList.States = BLL.Const.ActionPlanList_Reviewing;
} }
else if (rblIsReview.SelectedValue == "True2") //公司部门评审
{
actionPlanList.States = BLL.Const.ActionPlanList_DepartReview;
}
else else
{ {
actionPlanList.States = BLL.Const.ActionPlanList_Complete; actionPlanList.States = BLL.Const.ActionPlanList_Complete;
@@ -606,6 +607,10 @@ namespace FineUIPro.Web.ZHGL.Plan
} }
} }
} }
else if (rblIsReview.SelectedValue == "True2") //公司部门评审
{
//OAWebSevice.PushoaActionPlan(); //推送OA待办
}
} }
else else
{ {
@@ -703,12 +708,21 @@ namespace FineUIPro.Web.ZHGL.Plan
{ {
this.drpReviewMan.Hidden = false; this.drpReviewMan.Hidden = false;
this.drpPerson.Hidden = false; this.drpPerson.Hidden = false;
this.gvDepart.Hidden = true;
}
else if (this.rblIsReview.SelectedValue == "True2")
{
this.drpReviewMan.Hidden = true;
this.drpPerson.Hidden = true;
this.gvDepart.Hidden = false;
BindDepart();
} }
else else
{ {
this.drpReviewMan.Hidden = true; this.drpReviewMan.Hidden = true;
this.drpPerson.Hidden = true; this.drpPerson.Hidden = true;
this.drpReviewMan.SelectedValue = this.CurrUser.PersonId; this.drpReviewMan.SelectedValue = this.CurrUser.PersonId;
this.gvDepart.Hidden = true;
} }
} }
@@ -727,11 +741,20 @@ namespace FineUIPro.Web.ZHGL.Plan
private void BindDepart() private void BindDepart()
{ {
Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(this.ActionPlanListId); Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(this.HFActionPlanListId.Text);
if (actionPlanList != null)
{
var list = ActionPlanListApproveService.getDepartListData(ActionPlanListId, actionPlanList.Edition); var list = ActionPlanListApproveService.getDepartListData(ActionPlanListId, actionPlanList.Edition);
gvDepart.DataSource = list; gvDepart.DataSource = list;
gvDepart.DataBind(); gvDepart.DataBind();
} }
else
{
var list = ActionPlanListApproveService.getDepartListData(this.HFActionPlanListId.Text, 0);
gvDepart.DataSource = list;
gvDepart.DataBind();
}
}
/// <summary> /// <summary>
/// 关闭弹出窗口 /// 关闭弹出窗口
@@ -745,7 +768,11 @@ namespace FineUIPro.Web.ZHGL.Plan
protected void btnNew_Click(object sender, EventArgs e) protected void btnNew_Click(object sender, EventArgs e)
{ {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DepartEdit.aspx?ActionPlanListId={0}", this.ActionPlanListId, "编辑 - "))); if (string.IsNullOrEmpty(HFActionPlanListId.Text)) //新增记录
{
HFActionPlanListId.Text = SQLHelper.GetNewID(typeof(Model.ActionPlan_ActionPlanList));
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DepartEdit.aspx?ActionPlanListId={0}", this.HFActionPlanListId.Text, "编辑 - ")));
} }
#region 编辑 #region 编辑
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx
+2 -1
View File
@@ -55,9 +55,10 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:RadioButtonList runat="server" ID="rblIsReview" Label="备案/部门评审" LabelWidth="140px" Readonly="true"> <f:RadioButtonList runat="server" ID="rblIsReview" Label="备案/评审" LabelWidth="140px" Readonly="true">
<f:RadioItem Text="备案" Value="False" Selected="true" /> <f:RadioItem Text="备案" Value="False" Selected="true" />
<f:RadioItem Text="部门评审" Value="True" /> <f:RadioItem Text="部门评审" Value="True" />
<f:RadioItem Text="公司部门评审" Value="True2" />
</f:RadioButtonList> </f:RadioButtonList>
<f:DropDownList ID="drpReviewMan" runat="server" Label="评审负责人" LabelAlign="Right" Hidden="true" EnableEdit="true" Readonly="true" <f:DropDownList ID="drpReviewMan" runat="server" Label="评审负责人" LabelAlign="Right" Hidden="true" EnableEdit="true" Readonly="true"
LabelWidth="120px"> LabelWidth="120px">
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListView.aspx.cs
+10
View File
@@ -74,6 +74,10 @@ namespace FineUIPro.Web.ZHGL.Plan
this.drpReviewMan.Hidden = false; this.drpReviewMan.Hidden = false;
this.drpReviewMan.SelectedValue = actionPlanList.ReviewMan; this.drpReviewMan.SelectedValue = actionPlanList.ReviewMan;
} }
else if (actionPlanList.IsCompanyReview == true)
{
this.rblIsReview.SelectedValue = "True2";
}
else else
{ {
this.rblIsReview.SelectedValue = "False"; this.rblIsReview.SelectedValue = "False";
@@ -103,6 +107,12 @@ namespace FineUIPro.Web.ZHGL.Plan
var list = ActionPlanListApproveService.getListData(ActionPlanListId); var list = ActionPlanListApproveService.getListData(ActionPlanListId);
gvApprove.DataSource = list; gvApprove.DataSource = list;
gvApprove.DataBind(); gvApprove.DataBind();
var approves = BLL.ActionPlanListApproveService.GetReviewings(this.ActionPlanListId, actionPlanList.Edition.Value);
if (approves.Count == 0)
{
this.drpPerson.Hidden = true;
this.rblIsCompanyReview.Hidden = true;
}
WindowAtt_Close(null, null); WindowAtt_Close(null, null);
} }
} }
SGGL/FineUIPro.Web/ZHGL/Plan/DepartEdit.aspx.cs
+7
View File
@@ -105,7 +105,14 @@ namespace FineUIPro.Web.ZHGL.Plan
approve.ApproveMan = this.drpApproveMan.SelectedValue; approve.ApproveMan = this.drpApproveMan.SelectedValue;
} }
approve.ApproveType = BLL.Const.ActionPlanList_DepartReview; approve.ApproveType = BLL.Const.ActionPlanList_DepartReview;
if (actionPlanList == null)
{
approve.Edition = 0;
}
else
{
approve.Edition = actionPlanList.Edition; approve.Edition = actionPlanList.Edition;
}
approve.IsPushOa = 0; approve.IsPushOa = 0;
if (!string.IsNullOrEmpty(this.ActionPlanListApproveId)) if (!string.IsNullOrEmpty(this.ActionPlanListApproveId))
{ {
SGGL/Model/Model.cs
+8 -77
View File
@@ -10804,8 +10804,6 @@ namespace Model
private EntityRef<Person_Persons> _Person_Persons; private EntityRef<Person_Persons> _Person_Persons;
private EntitySet<ActionPlan_ActionPlanListApprove> _ActionPlan_ActionPlanListApprove;
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -10844,7 +10842,6 @@ namespace Model
{ {
this._Base_Project = default(EntityRef<Base_Project>); this._Base_Project = default(EntityRef<Base_Project>);
this._Person_Persons = default(EntityRef<Person_Persons>); this._Person_Persons = default(EntityRef<Person_Persons>);
this._ActionPlan_ActionPlanListApprove = new EntitySet<ActionPlan_ActionPlanListApprove>(new Action<ActionPlan_ActionPlanListApprove>(this.attach_ActionPlan_ActionPlanListApprove), new Action<ActionPlan_ActionPlanListApprove>(this.detach_ActionPlan_ActionPlanListApprove));
OnCreated(); OnCreated();
} }
@@ -11204,19 +11201,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList", Storage="_ActionPlan_ActionPlanListApprove", ThisKey="ActionPlanListId", OtherKey="ActionPlanListId", DeleteRule="NO ACTION")]
public EntitySet<ActionPlan_ActionPlanListApprove> ActionPlan_ActionPlanListApprove
{
get
{
return this._ActionPlan_ActionPlanListApprove;
}
set
{
this._ActionPlan_ActionPlanListApprove.Assign(value);
}
}
public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@@ -11236,18 +11220,6 @@ namespace Model
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
} }
} }
private void attach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity)
{
this.SendPropertyChanging();
entity.ActionPlan_ActionPlanList = this;
}
private void detach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity)
{
this.SendPropertyChanging();
entity.ActionPlan_ActionPlanList = null;
}
} }
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_ActionPlanListApprove")] [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_ActionPlanListApprove")]
@@ -11280,8 +11252,6 @@ namespace Model
private System.Nullable<int> _IsPushOa; private System.Nullable<int> _IsPushOa;
private EntityRef<ActionPlan_ActionPlanList> _ActionPlan_ActionPlanList;
private EntityRef<Person_Persons> _Person_Persons; private EntityRef<Person_Persons> _Person_Persons;
#region 可扩展性方法定义 #region 可扩展性方法定义
@@ -11316,7 +11286,6 @@ namespace Model
public ActionPlan_ActionPlanListApprove() public ActionPlan_ActionPlanListApprove()
{ {
this._ActionPlan_ActionPlanList = default(EntityRef<ActionPlan_ActionPlanList>);
this._Person_Persons = default(EntityRef<Person_Persons>); this._Person_Persons = default(EntityRef<Person_Persons>);
OnCreated(); OnCreated();
} }
@@ -11352,10 +11321,6 @@ namespace Model
{ {
if ((this._ActionPlanListId != value)) if ((this._ActionPlanListId != value))
{ {
if (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnActionPlanListIdChanging(value); this.OnActionPlanListIdChanging(value);
this.SendPropertyChanging(); this.SendPropertyChanging();
this._ActionPlanListId = value; this._ActionPlanListId = value;
@@ -11569,40 +11534,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList", Storage="_ActionPlan_ActionPlanList", ThisKey="ActionPlanListId", OtherKey="ActionPlanListId", IsForeignKey=true)]
public ActionPlan_ActionPlanList ActionPlan_ActionPlanList
{
get
{
return this._ActionPlan_ActionPlanList.Entity;
}
set
{
ActionPlan_ActionPlanList previousValue = this._ActionPlan_ActionPlanList.Entity;
if (((previousValue != value)
|| (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._ActionPlan_ActionPlanList.Entity = null;
previousValue.ActionPlan_ActionPlanListApprove.Remove(this);
}
this._ActionPlan_ActionPlanList.Entity = value;
if ((value != null))
{
value.ActionPlan_ActionPlanListApprove.Add(this);
this._ActionPlanListId = value.ActionPlanListId;
}
else
{
this._ActionPlanListId = default(string);
}
this.SendPropertyChanged("ActionPlan_ActionPlanList");
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_Person_Persons", Storage="_Person_Persons", ThisKey="ApproveMan", OtherKey="PersonId", IsForeignKey=true)] [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_Person_Persons", Storage="_Person_Persons", ThisKey="ApproveMan", OtherKey="PersonId", IsForeignKey=true)]
public Person_Persons Person_Persons public Person_Persons Person_Persons
{ {
@@ -98169,7 +98100,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(2000)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")]
public string CanWelderCode public string CanWelderCode
{ {
get get
@@ -98189,7 +98120,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(4000)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(3000)")]
public string CanWelderId public string CanWelderId
{ {
get get
@@ -209277,7 +209208,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardAndPunishDecision", DbType="NVarChar(200)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardAndPunishDecision", DbType="NVarChar(100)")]
public string RewardAndPunishDecision public string RewardAndPunishDecision
{ {
get get
@@ -220756,7 +220687,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(2000)")]
public string WorkAreaId public string WorkAreaId
{ {
get get
@@ -268101,7 +268032,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(2000)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")]
public string CanWelderCode public string CanWelderCode
{ {
get get
@@ -268117,7 +268048,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(4000)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderId", DbType="NVarChar(3000)")]
public string CanWelderId public string CanWelderId
{ {
get get
@@ -282582,7 +282513,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(2000)")]
public string WorkAreaId public string WorkAreaId
{ {
get get
@@ -283507,7 +283438,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(2000)")]
public string WorkAreaId public string WorkAreaId
{ {
get get