From 119de48bd50c92d70caa75266a1c0ea7c3e85a6a Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Sun, 27 Oct 2024 16:30:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin_New/v17/.wsuo | Bin 65024 -> 65024 bytes .vs/SGGL_SeDin_New/v17/DocumentLayout.json | 4 - .../ApproveUserReviewDetail.aspx.cs | 4 +- .../BidDocumentsReviewDetail.aspx.cs | 4 +- .../HJGL/WeldingManage/WeldingPlan.aspx.cs | 2 +- .../ApproveUserReview.aspx.cs | 2 +- .../ApproveUserReviewDetail.aspx.cs | 4 +- .../ApproveUserReviewEdit.aspx | 2 +- .../ApproveUserReviewEdit.aspx.cs | 6 ++ .../BidDocumentsReviewDetail.aspx.cs | 16 ++-- .../PHTGL/BiddingManagement/SetSubReview.aspx | 6 ++ .../BiddingManagement/SetSubReview.aspx.cs | 9 ++- .../SetSubReview.aspx.designer.cs | 74 +++++++++++------- 13 files changed, 81 insertions(+), 52 deletions(-) diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index 1e688e056aa1e73cbd8f24407f00600332852186..4c715778fe5558c4e90e66f9169c244038434bc7 100644 GIT binary patch delta 1205 zcmb`G&rcIk5XU>)Z7pTDg;ELpW76rjrO^7kUCX^pNaaCpkym|9JGjE=K9JY_cAJ!yw zackibUit!BC={~sx%3k5yN6OcfPx@jEOe5&kJLu$CdElP(vP3slc8}tiT_mkrtz`d z1u1OEU5!NbKf06$ULgAXMwD~Z-Com}5zV&m0oRC7|gqWTqFbazJM{LGBUJAbD23S{q+ly}nX4iq)}YW4yFFVU(7aszxneT&WhuZq$mUS||kc zlK9a!1l8EJH5*)^?*P8lg_E`zEqxkVBu@(^JQ|usGgEM_;j*Lx0}Ye?4_H>bp zxpl6F>7_Fin2hoTv;iCXEbbY%oMF?;eWD(yTb7!ODgLg*xB}ZnQ}X<8*27M2uXWm- zlFy9I933tOV delta 1101 zcmb_a&ue`@Tn+2+^i8X7$TC0(mv?eA^3J9J&E=jcq*NZ0( z!rVRBn_dk22S`%A8M%4!;KhSilf}fOiZigA_MkB)o$R-}@4fkEzL|N(zT4P$zkVP{ z&%VF=3aL+!cDY z+X;wb+Y?2@BgaFuMIIxYxBsX3v|Z6nZ6XVj(f>nwZxl}Y$o(e~IRl%cz)SnAA~Fu+ zQ6}xUEaMnqB!dVn(IJl_(Ca|iaht^_jMtL1VyBx?TmP{MEi zC|t+cz~_!A|DS(w5BG%Jt`!9E;UH1Qw}NWw;XX)^rW`Da4cj5v)FUnEBz3rk%~OwI z1qaE#$ih;#BRfr~v=Hz|bO%2+KUXHk!=Px3UJG^RCk6STB@JR><@S99m{)tpkOUR+WZ?$v5abur&i z3ibPHp;50j7S)=|1@sWu(%Txf*)%dGx0s>zEWwE#I7qgN|CnVsP0s zDk~3rO5M0G(_5-_kbHq=(@sYA7^5hkQlL9TJjKxb&Ms&VF2M6H#Y=xWAhcfs677-WTj(G diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json index 38269f8f..2bf4a7d0 100644 --- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json +++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json @@ -51,10 +51,6 @@ "$type": "Bookmark", "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}" }, - { - "$type": "Bookmark", - "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" - }, { "$type": "Bookmark", "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}" diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs index 6325554e..3d458ea2 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs @@ -254,14 +254,14 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement } 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)); var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(ApproveUserReviewID); _SetSubReview.ApproveUserReviewID = ApproveUserReviewID; _SetSubReview.ActionPlanID = BidUser.ActionPlanID; _SetSubReview.State = Const.ContractCreating; _SetSubReview.Type = 0; - PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview); + PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);*/ ChangeState(Const.ContractReview_Complete); } diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs index bc3be275..c9115e33 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs @@ -397,14 +397,14 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement } else { - var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId); + /* var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId); Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview(); newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview)); newtable.BidDocumentsReviewId = BidDocumentsReviewId; newtable.ProjectId = Bid.ProjectId; newtable.ActionPlanID = Bid.ActionPlanID; newtable.State = Const.ContractCreating; - PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable); + PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable);*/ ChangeState(Const.ContractReview_Complete); } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs index cbcd8911..b506dbfc 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs @@ -12,7 +12,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { public partial class WeldingPlan : PageBase { - + protected void Page_Load(object sender, EventArgs e) { ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReview.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReview.aspx.cs index fc9bc1ca..b369be43 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReview.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReview.aspx.cs @@ -350,7 +350,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { if (buttonList.Contains(Const.BtnAdd)) { - // btnNew.Hidden = false; + btnNew.Hidden = false; } if (buttonList.Contains(Const.BtnModify)) { diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs index 8d3f8fd5..44f1eeb7 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs @@ -242,14 +242,14 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement } 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)); var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(ApproveUserReviewID); _SetSubReview.ApproveUserReviewID = ApproveUserReviewID; _SetSubReview.ActionPlanID = BidUser.ActionPlanID; _SetSubReview.State = Const.ContractCreating; _SetSubReview.Type = 0; - PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview); + PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);*/ ChangeState(Const.ContractReview_Complete); } diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx index c59c5ffa..e3fbb6a5 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx @@ -25,7 +25,7 @@ - + diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs index 45f54a4c..f9b88f91 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs @@ -151,6 +151,12 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement 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) diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs index 4df03d02..2a9b63ef 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs @@ -384,14 +384,14 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement } else { - var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId); - Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview(); - newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview)); - newtable.BidDocumentsReviewId = BidDocumentsReviewId; - newtable.ProjectId = Bid.ProjectId; - newtable.ActionPlanID = Bid.ActionPlanID; - newtable.State = Const.ContractCreating; - PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable); + //var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId); + //Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview(); + //newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview)); + //newtable.BidDocumentsReviewId = BidDocumentsReviewId; + //newtable.ProjectId = Bid.ProjectId; + //newtable.ActionPlanID = Bid.ActionPlanID; + //newtable.State = Const.ContractCreating; + //PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable); ChangeState(Const.ContractReview_Complete); } } diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx index 95628894..1383b61b 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx @@ -34,6 +34,12 @@ + + diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs index ff167745..8d1670f2 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs @@ -40,7 +40,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement DropType.DataBind(); Funs.FineUIPleaseSelect(DropType); - + btnAdd1.OnClientClick = Window1.GetShowReference("SetSubReviewEdit.aspx", "基本信息") + "return false;"; + btnAdd2.OnClientClick = Window1.GetShowReference("SetSubReviewEdit2.aspx", "基本信息") + "return false;"; GetButtonPower(); BindGrid(); @@ -439,7 +440,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { btnNew.Hidden = false; btnNew2.Hidden = false; - + btnAdd1.Hidden = false; + btnAdd2.Hidden = false; } if (buttonList.Contains(Const.BtnModify)) { @@ -647,7 +649,6 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement } #endregion - - + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.designer.cs index 990dcede..5a9265a3 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.PHTGL.BiddingManagement { - - - public partial class SetSubReview { - +namespace FineUIPro.Web.PHTGL.BiddingManagement +{ + + + public partial class SetSubReview + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// txtSetSubReviewCode 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSetSubReviewCode; - + /// /// DropType 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropType; - + /// /// DropState 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropState; - + /// /// btnSearch 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnRset 控件。 /// @@ -101,7 +103,25 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnRset; - + + /// + /// btnAdd1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAdd1; + + /// + /// btnAdd2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAdd2; + /// /// btnMenuDelete 控件。 /// @@ -110,7 +130,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnMenuDelete; - + /// /// Toolbar1 控件。 /// @@ -119,7 +139,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// MenuButton1 控件。 /// @@ -128,7 +148,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button MenuButton1; - + /// /// btnPrinter 控件。 /// @@ -137,7 +157,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnPrinter; - + /// /// btnNew 控件。 /// @@ -146,7 +166,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnNew2 控件。 /// @@ -155,7 +175,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew2; - + /// /// btnQueryApprove 控件。 /// @@ -164,7 +184,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnQueryApprove; - + /// /// lblPageIndex 控件。 /// @@ -173,7 +193,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// ToolbarSeparator1 控件。 /// @@ -182,7 +202,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -191,7 +211,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -200,7 +220,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -209,7 +229,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement { /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Menu1 控件。 ///