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

修改合同流程

Browse Source
This commit is contained in:
李鹏飞
2024-10-27 16:30:44 +08:00
parent d717b110a7
commit 119de48bd5
13 changed files with 81 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SGGL_SeDin_New/v17/.wsuo
BIN
View File
Binary file not shown.
.vs/SGGL_SeDin_New/v17/DocumentLayout.json
-4
View File
@@ -51,10 +51,6 @@
"$type": "Bookmark", "$type": "Bookmark",
"Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
}, },
{
"$type": "Bookmark",
"Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{ {
"$type": "Bookmark", "$type": "Bookmark",
"Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
+2 -2
View File
@@ -254,14 +254,14 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
} }
else else
{ {
Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview(); /* Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview();
_SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview)); _SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(ApproveUserReviewID); var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(ApproveUserReviewID);
_SetSubReview.ApproveUserReviewID = ApproveUserReviewID; _SetSubReview.ApproveUserReviewID = ApproveUserReviewID;
_SetSubReview.ActionPlanID = BidUser.ActionPlanID; _SetSubReview.ActionPlanID = BidUser.ActionPlanID;
_SetSubReview.State = Const.ContractCreating; _SetSubReview.State = Const.ContractCreating;
_SetSubReview.Type = 0; _SetSubReview.Type = 0;
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview); PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);*/
ChangeState(Const.ContractReview_Complete); ChangeState(Const.ContractReview_Complete);
} }
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
+2 -2
View File
@@ -397,14 +397,14 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
} }
else else
{ {
var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId); /* var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId);
Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview(); Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview();
newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview)); newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview));
newtable.BidDocumentsReviewId = BidDocumentsReviewId; newtable.BidDocumentsReviewId = BidDocumentsReviewId;
newtable.ProjectId = Bid.ProjectId; newtable.ProjectId = Bid.ProjectId;
newtable.ActionPlanID = Bid.ActionPlanID; newtable.ActionPlanID = Bid.ActionPlanID;
newtable.State = Const.ContractCreating; newtable.State = Const.ContractCreating;
PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable); PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable);*/
ChangeState(Const.ContractReview_Complete); ChangeState(Const.ContractReview_Complete);
} }
} }
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReview.aspx.cs
+1 -1
View File
@@ -350,7 +350,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{ {
if (buttonList.Contains(Const.BtnAdd)) if (buttonList.Contains(Const.BtnAdd))
{ {
// btnNew.Hidden = false; btnNew.Hidden = false;
} }
if (buttonList.Contains(Const.BtnModify)) if (buttonList.Contains(Const.BtnModify))
{ {
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
+2 -2
View File
@@ -242,14 +242,14 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
} }
else else
{ {
Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview(); /* Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview();
_SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview)); _SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(ApproveUserReviewID); var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(ApproveUserReviewID);
_SetSubReview.ApproveUserReviewID = ApproveUserReviewID; _SetSubReview.ApproveUserReviewID = ApproveUserReviewID;
_SetSubReview.ActionPlanID = BidUser.ActionPlanID; _SetSubReview.ActionPlanID = BidUser.ActionPlanID;
_SetSubReview.State = Const.ContractCreating; _SetSubReview.State = Const.ContractCreating;
_SetSubReview.Type = 0; _SetSubReview.Type = 0;
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview); PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);*/
ChangeState(Const.ContractReview_Complete); ChangeState(Const.ContractReview_Complete);
} }
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:DropDownList ID="drpBidDocumentCode" runat="server" Label="招标文件编号" LabelAlign="Right" Readonly="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="140px"></f:DropDownList> <f:DropDownList ID="drpBidDocumentCode" runat="server" Label="招标文件编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="140px"></f:DropDownList>
<f:TextBox ID="txtBidProject" runat="server" Label="招标项目" LabelAlign="Right" LabelWidth="140px"></f:TextBox> <f:TextBox ID="txtBidProject" runat="server" Label="招标项目" LabelAlign="Right" LabelWidth="140px"></f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs
+6
View File
@@ -151,6 +151,12 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{ {
var bid=PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(drpBidDocumentCode.SelectedValue);
if (bid!= null)
{
txtProjectName.Text = PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(bid.ActionPlanID).ProjectShortName;
txtBidProject.Text = bid.BidDocumentsName ;
}
} }
private bool Save(int state) private bool Save(int state)
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
+8 -8
View File
@@ -384,14 +384,14 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
} }
else else
{ {
var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId); //var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId);
Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview(); //Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview();
newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview)); //newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview));
newtable.BidDocumentsReviewId = BidDocumentsReviewId; //newtable.BidDocumentsReviewId = BidDocumentsReviewId;
newtable.ProjectId = Bid.ProjectId; //newtable.ProjectId = Bid.ProjectId;
newtable.ActionPlanID = Bid.ActionPlanID; //newtable.ActionPlanID = Bid.ActionPlanID;
newtable.State = Const.ContractCreating; //newtable.State = Const.ContractCreating;
PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable); //PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable);
ChangeState(Const.ContractReview_Complete); ChangeState(Const.ContractReview_Complete);
} }
} }
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx
+6
View File
@@ -34,6 +34,12 @@
<f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server"> <f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
</f:Button> </f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill> <f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnAdd1" ToolTip="新增" Icon="Add" Text="新增(综合评估法)" EnablePostBack="true" runat="server"
Hidden="true">
</f:Button>
<f:Button ID="btnAdd2" ToolTip="新增" Icon="Add" Text="新增(经评审的最低投标报价法)" EnablePostBack="true" runat="server"
Hidden="true">
</f:Button>
<f:Button ID="btnMenuDelete" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" <f:Button ID="btnMenuDelete" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
OnClick="btnMenuDelete_Click"> OnClick="btnMenuDelete_Click">
</f:Button> </f:Button>
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs
+4 -3
View File
@@ -40,7 +40,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
DropType.DataBind(); DropType.DataBind();
Funs.FineUIPleaseSelect(DropType); Funs.FineUIPleaseSelect(DropType);
btnAdd1.OnClientClick = Window1.GetShowReference("SetSubReviewEdit.aspx", "基本信息") + "return false;";
btnAdd2.OnClientClick = Window1.GetShowReference("SetSubReviewEdit2.aspx", "基本信息") + "return false;";
GetButtonPower(); GetButtonPower();
BindGrid(); BindGrid();
@@ -439,7 +440,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{ {
btnNew.Hidden = false; btnNew.Hidden = false;
btnNew2.Hidden = false; btnNew2.Hidden = false;
btnAdd1.Hidden = false;
btnAdd2.Hidden = false;
} }
if (buttonList.Contains(Const.BtnModify)) if (buttonList.Contains(Const.BtnModify))
{ {
@@ -648,6 +650,5 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
#endregion #endregion
} }
} }
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.designer.cs
Generated
+22 -2
View File
@@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.PHTGL.BiddingManagement { namespace FineUIPro.Web.PHTGL.BiddingManagement
{
public partial class SetSubReview { public partial class SetSubReview
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@@ -102,6 +104,24 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnRset; protected global::FineUIPro.Button btnRset;
/// <summary>
/// btnAdd1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAdd1;
/// <summary>
/// btnAdd2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAdd2;
/// <summary> /// <summary>
/// btnMenuDelete 控件。 /// btnMenuDelete 控件。
/// </summary> /// </summary>