From eb3a6ac1fac48ec842cf78dc0fb11d7d6db461e7 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Wed, 29 Mar 2023 16:51:16 +0800 Subject: [PATCH] =?UTF-8?q?2023-03-29=20001=20=E5=90=88=E5=90=8C=E6=8B=9B?= =?UTF-8?q?=E6=A0=87=E6=96=87=E4=BB=B6=E5=8F=B0=E8=B4=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin/v17/.wsuo | Bin 29184 -> 29184 bytes DataBase/版本日志/SGGLDB_V2023-03-24.sql | 10 +- DataBase/版本日志/SGGLDB_V2023-03-29_lpf.sql | 36 ++++++++ .../0-3合同管理（Menu_HTGL）.sql | 14 ++- .../1-6合同管理（Menu_PHTGL）.sql | 2 +- SGGL/BLL/Common/Const.cs | 3 +- .../BidDocStandingBookService.cs | 10 +- .../DataIn/BidDocumentsStandingBookIn.xlsx | Bin 9159 -> 9201 bytes .../Filing/BidDocumentsStandingBook.aspx | 6 ++ .../Filing/BidDocumentsStandingBook.aspx.cs | 86 +++++++++++++----- .../Filing/BidDocumentsStandingBookEdit.aspx | 27 +++--- .../BidDocumentsStandingBookEdit.aspx.cs | 61 +++++++++---- ...DocumentsStandingBookEdit.aspx.designer.cs | 24 ++++- .../Filing/BidDocumentsStandingBookIn.aspx | 11 ++- .../Filing/BidDocumentsStandingBookIn.aspx.cs | 46 +++++++++- SGGL/FineUIPro.Web/common/Menu_CQMS.xml | 1 - SGGL/FineUIPro.Web/common/Menu_HJGL.xml | 1 + SGGL/FineUIPro.Web/common/Menu_HTGL.xml | 1 + SGGL/FineUIPro.Web/common/Menu_PHTGL.xml | 2 +- SGGL/Model/Model.cs | 70 +++++++++++--- 20 files changed, 334 insertions(+), 77 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-03-29_lpf.sql diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 96b6ff64d5636d35bbd12b57fe157e00cc1d8d4e..387ff00629b73cb3bab09f58f10ad3db53076556 100644 GIT binary patch delta 1077 zcmbu8&uhyM)_DfBsYH|dvY))nym@cGGjCpH2P!+T zKF7mZ^ziQf_1#z3gp6Ji zKl44DRj9dmZ8WJT9YzpXZCMS`X7*vxnZgDiG|iK90o(Ee$YRO94{0n7RqH3N7NHkVziTz;9rGqGrmq$5-7aMAj?L!p+*(b~=W#>z;~UjA@NuhP`}F$Km#s&> z{0GT%U*A?&;K*AQsCjv9uz?LJuE_}rx_$CHC;55Zw`mYr!>|kQF6gasQazCrSw{^Y zSiquEfkk~!u|n+(UyJ@%YNRi0)Iv$zbShX3J%tFiLrsB+V1rft*c|;_;PkJj-ohU$ zu@!G(!||+V;j!gRNgR7U-7aV6=|xuxBw!C};6PfY<79|>`?6-jYNAx1tqjK__^>QM$L}JW zY`ur_!ylmcQDo$%*aUck?MPO!1;J@Wu78F zqU2oT$WrZ`QlIYf8=*mDhLBg9bHocu-jxW$BGs-CN(8wVb%5Mm5ShVmcTcr?ZvMAOkb7)V$b5k}v#%3ynN7y{S z?dvtbnr@;!YGI{JgSRYM8U6&GA^dbLqV{Akp$TtF_(m(DvF5CzErVHV&U4>2s~UUY z%l^H!xf-8P3b2N4)54Z0pndtC#uq=Sv|~$@MDb{Dsk76`yL4Tc4y?(xnE /// 招标工作台账 /// - public const string BidDocumentsStandingBookMenuId = "11f4f882-28a9-4610-a657-6a58336097d2"; + public const string ProjectBidDocumentsStandingBookMenuId = "11f4f882-28a9-4610-a657-6a58336097d2"; + diff --git a/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs b/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs index ff5d9613..cb5e848a 100644 --- a/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs +++ b/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs @@ -42,6 +42,8 @@ namespace BLL (string.IsNullOrEmpty(table.BidWinner) || x.BidWinner.Contains(table.BidWinner)) && (string.IsNullOrEmpty(table.SetSubReviewCode) || x.SetSubReviewCode.Contains(table.SetSubReviewCode)) && (string.IsNullOrEmpty(table.ProjectId) || x.ProjectId.Contains(table.ProjectId))&& + (string.IsNullOrEmpty(table.BidNoticeCode) || x.BidNoticeCode.Contains(table.BidNoticeCode))&& + (string.IsNullOrEmpty(table.BidUnitFileCode) || x.BidUnitFileCode.Contains(table.BidUnitFileCode))&& (table.State == null||x.State==table.State) select x ; @@ -84,7 +86,9 @@ namespace BLL x.BidWinner, x.SetSubReviewCode, x.ProjectId, - x.State + x.State, + x.BidNoticeCode, + x.BidUnitFileCode }; } @@ -119,6 +123,8 @@ namespace BLL SetSubReviewCode = newtable.SetSubReviewCode, ProjectId= newtable.ProjectId, State=newtable.State, + BidNoticeCode=newtable.BidNoticeCode, + BidUnitFileCode=newtable.BidUnitFileCode, }; db.PHTGL_BidDocumentsStandingBook.InsertOnSubmit(table); db.SubmitChanges(); @@ -156,6 +162,8 @@ namespace BLL table.SetSubReviewCode = newtable.SetSubReviewCode; table.ProjectId=newtable.ProjectId; table.State=newtable.State; + table.BidNoticeCode= newtable.BidNoticeCode; + table.BidUnitFileCode=newtable.BidUnitFileCode; db.SubmitChanges(); } diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/BidDocumentsStandingBookIn.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/BidDocumentsStandingBookIn.xlsx index 5e568135f20a77a6a28452da308e5a151af81c88..3900ae9b1377ec40f80263091f80e96b98c2f09b 100644 GIT binary patch delta 2618 zcmY+GXE+;*7sg|RT1BNngo=ofDxs?OrfS5DQbokRR?S$IqE?L}qUCSTYqX_^y$Kzt zwyO57(bg8Tb$joJd!PULbe`v&^XWXl_k9O$?cAz)!$3IcKYw z&3l_cQZ;d3#=OfCREC79U?sF(;eKp)(PuS<;nl62J^rvTe3mN(K|*jTYd1N=qj#-@ zlk(#TYe#O_pfpot4_7)9S}Q=upuTmFIz-hROswGGW&muPRqV1XBM>r017g!OF`kj!|=XECQR1s<3(=$30KV;ci!W+qDtg_wS#xMkBP4fmy=eo`!Hr)q+!(yox|diCgXm@pm$c>r#%{ zMnXk{sm2298J^&NH8E13q6wJ3Jcv*rpvDF|f<@~l!x3ye?8S70gU{}1MyLZ{KRCV! zqiK3Tapaw^^B{D_@pr1AP9tPdw&QriIqHea_@2;`Lir$61Wo>V+At7>2M0HUZZ zxg65FA1T4dLXK825OBLUb@-&>RMg0^b@bvlt<6WHI>&;SRBmLJCyC-Xg$P_8?)J}( zxk)=22qciS@Pf`@1HUD%WE?5&eM**OT6c4S-E{Mnx};M&gQlu?=J44SU?gG&)cn8}oHqrp|O%(c0hW%n@(13KA@)QYKLx4_B^RaX{a?o@sXJN1MzN-WAZ3>l663LCg6QvWB$iarlEoOAuU>e6wqsYQ35_>glh z97++x-XH;Ajw_r{4}4J?k#Z%HdI*oqVy=&C4m&4fXM$svK0McH1V1U>;&aTl2D!I5 zM6H>~RmbLtB=#RWWaPdvh^4QPuJjcxy%k;ekLAeu!O;misdo%* zrt;aszK@A%{M|$h49Yy?4)1@mrzF?T!th;@wZ=8+_A}>R`BS&DC0XJ1_- zXi{Cvqm|~ssZrZ46e~1cf$4bX7u8Fzms3^o^4!#Roe(uqz ze!v=1-N2%{mb{S+cozL|D0!^exxmzAF)0hqgHWe2O_gu)upxE^c6$%j&$Qa>oU)k3H%J zL}i!VSwz7~Z3FRE#p|d-^SAG_IKhkyuSM0=7RN5V%u94gzSE-U6uaqED(q4^ZtInZ zC1<7y7Su+;199m>M~Aimh~io7PrxlZCfoN1Pf#dKL2^~FWoi*+?^HP>K z*NAa#T=?m0^=-#NC#LsjYYmn2SU}3QlJ8gfhCEN3Q6i<)Xw-67UsmxIL-29-sa^1g z#5QvFUh=4hbm*o&cH7iarqgeSANSMCf`D0MO*CK79*JuUJQ%rp0F6FO$td@Jx_vfC zI4cDH{3SfZ>n;wx?4w=GyPsEP(o#OYM78ju7gMueV)n5@8uO~_Vh?$b`9G?ukbK?+mJZ>U?>YG8?!fm#1e{7Acdi=u_|Hjq+z z*EL?39$27rjWp}LR%#Vz0J0irSayC6)4EmTMzXgrEpjN5+jiPuNHWLL8Gp!35YY-- zg~Zlg4*RnyxlJp~*XDnZmCgyWO4Ijuy73PkHNj1^0|-16-&Mn#u=Xeer!ALX_MOHI zD^^JRL!ykcU(JrO>=i+7|4pB@INtLNUEX9)21U!auv;cm$X>;A>yAffpiVD={8Nlp zX{!yBdI%E8#n4n`+8H#B1USe;@2yUeugDp%dLFbmrx|PPN+v*IeEPUzt zr19lng;vGNA^`&FI(lD$wlbl;xZPQ{j@PTGvrGU0 delta 2556 zcmVRK)_i*Ujj z@%3wx>qqUkZw{ASET)_X^f?QEm!!0Y}zL1r>#d3FG$a*yz0%?_6@gR9GL~Crh*?RkMMiX+rmac}g z>?2N9r4n6Ba4!21l_c`@12FlL>>fZ=qR6@hO~7lrsBVAhW_v5=kpKf~-$^793`^4E zOoG%l)L$#B61x|35V3YbJ{43D=pB#{gaacEJv_}vSjJi*5?>Fz$^Ewz(;WRp~(Q$0Y7&KbFX8j--blm>YM$~KUa`m*$1&`8D*Wy`U* z&)yR{kAX6>>XzyWVJm9B{)kerrZj-dP{Sii<^xXUehS>mSz~1njMW~CVB=PEnPt$t zr`8a|2$fZ=J_~UYj)bPB@4eO>I0r?o0|LGv$cnXD zebxR8laT`yvk3|_0ttw>>sgrt000-0MGPQ+l-rJ*Fc60CEA<_a?*kYTHlUDI)o9g~ zTD9u&+A$`vf-$w7ld669jtzuuqgG_2#N%Mk_mA!0EbdRD@(xUCF6$g&KSUm@sVsQC z$|mtDp|7}otZ}W%h#_KN2zvt%b4+iQ0p9RjcKwV&~(cL(Y|b04I`z0 zRDu}zt2Tjd6eER85>*g|VG;*c3G8W4IRU9W!>22TUU4%{B#fQnv!RuZ0FSkVBBUkFPsFuPqU+w&qvzryY_frxDr z4oyGygqDkf!wK6}d5V=edV{l%7zN9P^UrtAj`~^OGi3dRRg4-28W?#-Ht$(!-mS85X#@vUoUY7>8d07EP4?j48; znNI&YHz)IPJKQ|9wz;%Y@TPtT%`#+RV4kuv@LI48hCWg+W9zc0n^M|7_^?!}#r>OW zqjUvXJW4{rRkvc*?dTQc2GUlA38IEi z^NIlg034G}8XbR4OT#c2$M1sQq2#Waf+Es(2SM=WK|ergqb;mSZ8CAUDT?!DY>IA& zfm>10i`9d;clKqPw)+-lPCa;yx4e*F{?G3TQL_hbPT5C3bqLnL!h8lO2%E%m@U8~7 zx7O!YfI^vpEh9%T(m(-Gkkw~rR7#m5&SI(on=x+{LTZ27$TjFZ@emd}JH&SlCZ_%_ zq@Irqi`ob=HwPCpnPuo24hD)z@|cNxmw=MT&R!m^{VwP#b##^Kaj_qtjripWualX}*Xzz{|Hh4C1qH8a&IHZ;p?O>1$g6qhVP}e&uS?#QMj${w~EC6#s>j zz8>?Zn?J7P`xtdzL_B$2Nf4&t!;}{FdcWP2NeBhS@1}nOlaT`y1urRC{Y$eN947&P zOT#b}h2I7LL&mX@hys+XIikP)li}%IJBy+uL^D`Z!J98)`0aATog#! zQEp1K_uf#99p8guE(s1D#BFO8^WkZKci1rg!FGT%LY7#8XM%Z#dthuPB03=jpOEI$ zHUmI#3=JsI-r+P!@sHPoRqoG*L76#~^hXnRI>nu{1s}!9eQdv0+!c6M>95x?=QrWdTM6RsSZzT@jV$nQC7^~v + + + + <%-- diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs index 8a3b8f5b..2470fc3e 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs @@ -26,6 +26,20 @@ namespace FineUIPro.Web.PHTGL.Filing } } #endregion + /// + /// 级别，1 为项目级 + /// + public string Type + { + get + { + return (string)ViewState["Type"]; + } + set + { + ViewState["Type"] = value; + } + } #region 加载 /// /// 加载页面 @@ -37,22 +51,24 @@ namespace FineUIPro.Web.PHTGL.Filing if (!IsPostBack) { ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - btnNew.OnClientClick = Window1.GetShowReference("BidDocumentsStandingBookEdit.aspx", "基本信息") + "return false;"; BLL.DepartService.InitDepartDropDownList(this.drpDepartId, false); - + Type = Request.Params["Type"]; GetButtonPower(); - this.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + if (Type=="1") { - this.ProjectId = Request.Params["projectId"]; + btnNew.OnClientClick = Window1.GetShowReference("BidDocumentsStandingBookEdit.aspx?Type=1", "基本信息") + "return false;"; + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } } + else + { + btnNew.OnClientClick = Window1.GetShowReference("BidDocumentsStandingBookEdit.aspx", "基本信息") + "return false;"; - //this.drpStates.DataValueField = "Value"; - //drpStates.DataTextField = "Text"; - //drpStates.DataSource = BLL.DropListService.GetState(); - //drpStates.DataBind(); - //Funs.FineUIPleaseSelect(drpStates); - + } + BindGrid(); } @@ -64,11 +80,15 @@ namespace FineUIPro.Web.PHTGL.Filing private void BindGrid() { Model.PHTGL_BidDocumentsStandingBook _BidDocumentsStandingBook = new Model.PHTGL_BidDocumentsStandingBook(); - - if (!(this.CurrUser.PersonId == Const.sysglyId || this.CurrUser.PersonId == Const.hfnbdId)) + + if (Type=="1") { - _BidDocumentsStandingBook.ProjectId = this.CurrUser.LoginProjectId; + if (!(this.CurrUser.PersonId == Const.sysglyId || this.CurrUser.PersonId == Const.hfnbdId)) + { + _BidDocumentsStandingBook.ProjectId = this.CurrUser.LoginProjectId; + } } + if (!string.IsNullOrEmpty(drpDepartId.SelectedValue) ) { @@ -195,7 +215,16 @@ namespace FineUIPro.Web.PHTGL.Filing var model=BLL.BidDocStandingBookService.GetPHTGL_BidDocumentsStandingBookById(id); if (model != null) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("BidDocumentsStandingBookEdit.aspx?BidDocumentsStandingBookId={0}", id, "编辑 - "))); + if (Type=="1") + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("BidDocumentsStandingBookEdit.aspx?BidDocumentsStandingBookId={0}?Type=1", id, "编辑 - "))); + + } + else + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("BidDocumentsStandingBookEdit.aspx?BidDocumentsStandingBookId={0}", id, "编辑 - "))); + + } } } protected void btnEdit_Click(object sender, EventArgs e) @@ -282,7 +311,7 @@ namespace FineUIPro.Web.PHTGL.Filing { return; } - var buttonList = CommonService.GetAllButtonList(CurrUser.LoginProjectId, CurrUser.PersonId, Const.BidDocumentsStandingBookMenuId); + var buttonList = CommonService.GetAllButtonList(CurrUser.LoginProjectId, CurrUser.PersonId, Const.ProjectBidDocumentsStandingBookMenuId); if (buttonList.Count() > 0) { if (buttonList.Contains(Const.BtnAdd)) @@ -367,7 +396,16 @@ namespace FineUIPro.Web.PHTGL.Filing protected void btnImport_Click(object sender, EventArgs e) { - PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("BidDocumentsStandingBookIn.aspx?", "导入 - "))); + if (Type=="1") + { + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("BidDocumentsStandingBookIn.aspx?Type=1", "导入 - "))); + + } + else + { + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("BidDocumentsStandingBookIn.aspx", "导入 - "))); + + } } public string ConvertState(object State) @@ -421,13 +459,13 @@ namespace FineUIPro.Web.PHTGL.Filing } // BLL.LogService.AddSys_Log(this.CurrUser, p.ContractName, p.ContractId, BLL.Const.ContractMenuId, BLL.Const.BtnDelete); BLL.BidDocStandingBookService.DeletePHTGL_BidDocumentsStandingBookById(rowID); - AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-BidUnit", Const.BidDocumentsStandingBookMenuId); - AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-BidNotice", Const.BidDocumentsStandingBookMenuId); - AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-ActionPlan", Const.BidDocumentsStandingBookMenuId); - AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-BidDocuments", Const.BidDocumentsStandingBookMenuId); - AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-ApprovePersonForm", Const.BidDocumentsStandingBookMenuId); - AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-SetSubReview", Const.BidDocumentsStandingBookMenuId); - AttachFileService.DeleteAttachFile(Funs.RootPath, rowID +"-ShortListApproval", Const.BidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-BidUnit", Const.ProjectBidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-BidNotice", Const.ProjectBidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-ActionPlan", Const.ProjectBidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-BidDocuments", Const.ProjectBidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-ApprovePersonForm", Const.ProjectBidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID + "-SetSubReview", Const.ProjectBidDocumentsStandingBookMenuId); + AttachFileService.DeleteAttachFile(Funs.RootPath, rowID +"-ShortListApproval", Const.ProjectBidDocumentsStandingBookMenuId); } } } diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx index 91a343f7..6e6ffdda 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx @@ -56,8 +56,9 @@ - - + + @@ -84,7 +85,7 @@ - @@ -100,24 +101,28 @@ - + + + + - + + + + - - - - + + diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs index ed93beac..4df73fc7 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs @@ -27,6 +27,17 @@ namespace FineUIPro.Web.PHTGL.Filing ViewState["BidDocumentsStandingBookId"] = value; } } + public string Type + { + get + { + return (string)ViewState["Type"]; + } + set + { + ViewState["Type"] = value; + } + } #endregion protected void Page_Load(object sender, EventArgs e) @@ -37,6 +48,8 @@ namespace FineUIPro.Web.PHTGL.Filing //BLL.PHTGL_SetSubReviewService.InitGetSetSubCompleteDropDownList(DropSetSubReviewCode, this.CurrUser.PersonId, this.CurrUser.LoginProjectId, false); ////权限按钮方法 this.BidDocumentsStandingBookId = Request.Params["BidDocumentsStandingBookId"]; + Type = Request.Params["Type"]; + this.GetButtonPower(); if (!string.IsNullOrEmpty(this.BidDocumentsStandingBookId)) @@ -59,6 +72,8 @@ namespace FineUIPro.Web.PHTGL.Filing this.txtApprovePersonFormCode.Text = model.ApprovePersonFormCode; this.txtBidWinner.Text = model.BidWinner; this.txtSetSubReviewCode.Text = model.SetSubReviewCode; + this.txtBidNoticeCode.Text=model.BidNoticeCode; + this.txtBidUnitFileCode.Text = model.BidUnitFileCode; } } } @@ -87,9 +102,15 @@ namespace FineUIPro.Web.PHTGL.Filing table.Bidding_StartTime = this.txtBidding_StartTime.Text; table.ApprovePersonFormCode = this.txtApprovePersonFormCode.Text; table.BidWinner = this.txtBidWinner.Text; - table.SetSubReviewCode = this.txtSetSubReviewCode.Text; - table.ProjectId = this.CurrUser.LoginProjectId; + table.SetSubReviewCode = this.txtSetSubReviewCode.Text; table.State = 0; + table.BidNoticeCode=this.txtBidNoticeCode.Text; + table.BidUnitFileCode=this.txtBidUnitFileCode.Text; + if (Type == "1") + { + table.ProjectId = this.CurrUser.LoginProjectId; + + } if (string.IsNullOrEmpty(this.BidDocumentsStandingBookId)) { table.BidDocumentsStandingBookId = SQLHelper.GetNewID(typeof(Model.PHTGL_BidDocumentsStandingBook)); @@ -116,37 +137,37 @@ namespace FineUIPro.Web.PHTGL.Filing protected void btnSubmit_Click(object sender, EventArgs e) { - if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-BidUnit", BLL.Const.BidDocumentsStandingBookMenuId)) + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-BidUnit", BLL.Const.ProjectBidDocumentsStandingBookMenuId)) { ShowNotify("未上传中标单位投标文件，无法提交！", MessageBoxIcon.Warning); return; } - if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-BidNotice", BLL.Const.BidDocumentsStandingBookMenuId)) + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-BidNotice", BLL.Const.ProjectBidDocumentsStandingBookMenuId)) { ShowNotify("未上传中标通知书，无法提交！", MessageBoxIcon.Warning); return; } - if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-ActionPlan", BLL.Const.BidDocumentsStandingBookMenuId)) + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-ActionPlan", BLL.Const.ProjectBidDocumentsStandingBookMenuId)) { ShowNotify("未上传实施计划文件，无法提交！", MessageBoxIcon.Warning); return; } - if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-BidDocuments", BLL.Const.BidDocumentsStandingBookMenuId)) + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-BidDocuments", BLL.Const.ProjectBidDocumentsStandingBookMenuId)) { ShowNotify("未上传招标文件，无法提交！", MessageBoxIcon.Warning); return; } - if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-ApprovePersonForm", BLL.Const.BidDocumentsStandingBookMenuId)) + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-ApprovePersonForm", BLL.Const.ProjectBidDocumentsStandingBookMenuId)) { ShowNotify("未上传评委名单审批表文件，无法提交！", MessageBoxIcon.Warning); return; } - if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-SetSubReview", BLL.Const.BidDocumentsStandingBookMenuId)) + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-SetSubReview", BLL.Const.ProjectBidDocumentsStandingBookMenuId)) { ShowNotify("未上传确定中标人审批表文件，无法提交！", MessageBoxIcon.Warning); return; } - if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-ShortListApproval", BLL.Const.BidDocumentsStandingBookMenuId)) + if (!BLL.AttachFileService.Getfile(BidDocumentsStandingBookId + "-ShortListApproval", BLL.Const.ProjectBidDocumentsStandingBookMenuId)) { ShowNotify("未上传短名单审批表文件，无法提交！", MessageBoxIcon.Warning); return; @@ -167,8 +188,14 @@ namespace FineUIPro.Web.PHTGL.Filing table.ApprovePersonFormCode = this.txtApprovePersonFormCode.Text; table.BidWinner = this.txtBidWinner.Text; table.SetSubReviewCode = this.txtSetSubReviewCode.Text; - table.ProjectId = this.CurrUser.LoginProjectId; table.State = 1; + table.BidNoticeCode = this.txtBidNoticeCode.Text; + table.BidUnitFileCode = this.txtBidUnitFileCode.Text; + if (Type == "1") + { + table.ProjectId = this.CurrUser.LoginProjectId; + + } if (string.IsNullOrEmpty(this.BidDocumentsStandingBookId)) { table.BidDocumentsStandingBookId = SQLHelper.GetNewID(typeof(Model.PHTGL_BidDocumentsStandingBook)); @@ -228,7 +255,7 @@ namespace FineUIPro.Web.PHTGL.Filing BidDocumentsStandingBookId = Guid.NewGuid().ToString(); } PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", - this.BidDocumentsStandingBookId+ "-BidUnit", BLL.Const.BidDocumentsStandingBookMenuId))); + this.BidDocumentsStandingBookId+ "-BidUnit", BLL.Const.ProjectBidDocumentsStandingBookMenuId))); } /// /// 中标通知书 @@ -242,7 +269,7 @@ namespace FineUIPro.Web.PHTGL.Filing BidDocumentsStandingBookId = Guid.NewGuid().ToString(); } PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", - this.BidDocumentsStandingBookId+ "-BidNotice", BLL.Const.BidDocumentsStandingBookMenuId))); + this.BidDocumentsStandingBookId+ "-BidNotice", BLL.Const.ProjectBidDocumentsStandingBookMenuId))); } /// /// 实施计划文件 @@ -256,7 +283,7 @@ namespace FineUIPro.Web.PHTGL.Filing BidDocumentsStandingBookId = Guid.NewGuid().ToString(); } PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", - this.BidDocumentsStandingBookId + "-ActionPlan", BLL.Const.BidDocumentsStandingBookMenuId))); + this.BidDocumentsStandingBookId + "-ActionPlan", BLL.Const.ProjectBidDocumentsStandingBookMenuId))); } /// @@ -272,7 +299,7 @@ namespace FineUIPro.Web.PHTGL.Filing BidDocumentsStandingBookId = Guid.NewGuid().ToString(); } PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", - this.BidDocumentsStandingBookId + "-BidDocuments", BLL.Const.BidDocumentsStandingBookMenuId))); + this.BidDocumentsStandingBookId + "-BidDocuments", BLL.Const.ProjectBidDocumentsStandingBookMenuId))); } /// /// 评委名单审批表文件 @@ -287,7 +314,7 @@ namespace FineUIPro.Web.PHTGL.Filing BidDocumentsStandingBookId = Guid.NewGuid().ToString(); } PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", - this.BidDocumentsStandingBookId + "-ApprovePersonForm", BLL.Const.BidDocumentsStandingBookMenuId))); + this.BidDocumentsStandingBookId + "-ApprovePersonForm", BLL.Const.ProjectBidDocumentsStandingBookMenuId))); } /// /// 确定中标人审批表文件 @@ -302,7 +329,7 @@ namespace FineUIPro.Web.PHTGL.Filing BidDocumentsStandingBookId = Guid.NewGuid().ToString(); } PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", - this.BidDocumentsStandingBookId + "-SetSubReview", BLL.Const.BidDocumentsStandingBookMenuId))); + this.BidDocumentsStandingBookId + "-SetSubReview", BLL.Const.ProjectBidDocumentsStandingBookMenuId))); } /// /// 短名单审批表文件 @@ -316,7 +343,7 @@ namespace FineUIPro.Web.PHTGL.Filing BidDocumentsStandingBookId = Guid.NewGuid().ToString(); } PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/BidDocumentsStandingBook&menuId={1}", - this.BidDocumentsStandingBookId + "-ShortListApproval", BLL.Const.BidDocumentsStandingBookMenuId))); + this.BidDocumentsStandingBookId + "-ShortListApproval", BLL.Const.ProjectBidDocumentsStandingBookMenuId))); } #endregion diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs index 7a21525e..099d3185 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs @@ -138,7 +138,7 @@ namespace FineUIPro.Web.PHTGL.Filing /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtProposedInviter; + protected global::FineUIPro.TextArea txtProposedInviter; /// /// txtBidWinner 控件。 @@ -222,13 +222,13 @@ namespace FineUIPro.Web.PHTGL.Filing protected global::FineUIPro.Button btnAttachUrl_ShortListApprovalCode; /// - /// Toolbar1 控件。 + /// txtBidNoticeCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Toolbar Toolbar1; + protected global::FineUIPro.TextBox txtBidNoticeCode; /// /// btnAttachUrl_BidNotice 控件。 @@ -239,6 +239,15 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::FineUIPro.Button btnAttachUrl_BidNotice; + /// + /// txtBidUnitFileCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtBidUnitFileCode; + /// /// btnAttachUrl_BidUnit 控件。 /// @@ -248,6 +257,15 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::FineUIPro.Button btnAttachUrl_BidUnit; + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + /// /// btnSave 控件。 /// diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx index a131d6f4..960165ca 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx @@ -20,10 +20,10 @@ - - + + + + + diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx.cs index 437eb25b..d1d5181c 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookIn.aspx.cs @@ -29,7 +29,17 @@ namespace FineUIPro.Web.PHTGL.Filing /// 错误集合 /// public static string errorInfos = string.Empty; - + public string Type + { + get + { + return (string)ViewState["Type"]; + } + set + { + ViewState["Type"] = value; + } + } #endregion #region 加载 @@ -48,6 +58,7 @@ namespace FineUIPro.Web.PHTGL.Filing BidDocStandingBookList.Clear(); } errorInfos = string.Empty; + Type = Request.Params["Type"]; } } @@ -63,6 +74,8 @@ namespace FineUIPro.Web.PHTGL.Filing { try { + Grid1.DataSource = null; + Grid1.DataBind(); if (this.fuAttachUrl.HasFile == false) { ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning); @@ -93,6 +106,30 @@ namespace FineUIPro.Web.PHTGL.Filing string filePath = initFullPath + this.hdFileName.Text; this.fuAttachUrl.PostedFile.SaveAs(filePath); ImportXlsToData(rootPath + initPath + this.hdFileName.Text); + + if (string.IsNullOrEmpty(errorInfos)) + { + if (!string.IsNullOrEmpty(this.hdFileName.Text)) + { + if (BidDocStandingBookList.Count > 0) + { + this.Grid1.Hidden = false; + this.Grid1.DataIDField = "BidDocumentsStandingBookId"; + this.Grid1.DataSource = BidDocStandingBookList; + this.Grid1.DataBind(); + Grid1.RecordCount = BidDocStandingBookList.Count; + } + + } + else + { + ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning); + } + } + else + { + ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning); + } } catch (Exception ex) { @@ -163,7 +200,10 @@ namespace FineUIPro.Web.PHTGL.Filing Model.PHTGL_BidDocumentsStandingBook _BidDocumentsStandingBook = new PHTGL_BidDocumentsStandingBook(); _BidDocumentsStandingBook.BidDocumentsStandingBookId = SQLHelper.GetNewID(); _BidDocumentsStandingBook.State = 0; - _BidDocumentsStandingBook.ProjectId = this.CurrUser.LoginProjectId; + if (Type=="1") + { + _BidDocumentsStandingBook.ProjectId = this.CurrUser.LoginProjectId; + } _BidDocumentsStandingBook.EPCCode = pds[i].A; _BidDocumentsStandingBook.ProjectShortName = pds[i].B; _BidDocumentsStandingBook.ProjectCode = pds[i].C; @@ -179,6 +219,8 @@ namespace FineUIPro.Web.PHTGL.Filing _BidDocumentsStandingBook.ApprovePersonFormCode = pds[i].M; _BidDocumentsStandingBook.BidWinner = pds[i].N; _BidDocumentsStandingBook.SetSubReviewCode = pds[i].O; + _BidDocumentsStandingBook.BidNoticeCode= pds[i].P; + _BidDocumentsStandingBook.BidUnitFileCode= pds[i].Q; BidDocStandingBookList.Add(_BidDocumentsStandingBook); //if (col24 != null) diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml index 23ba0c8e..2631bcd6 100644 --- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml +++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml @@ -36,7 +36,6 @@ - diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index 6b877755..65eed927 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -60,5 +60,6 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index ee18d81b..6e95f066 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -7,4 +7,5 @@ + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml index 3ff79d95..65bcce82 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PHTGL.xml @@ -20,7 +20,7 @@ - + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index f4fdd7ff..5ff100f2 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -11880,7 +11880,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ToKeyId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ToKeyId", DbType="NVarChar(100)")] public string ToKeyId { get @@ -11960,7 +11960,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachPath", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachPath", DbType="NVarChar(100)")] public string AttachPath { get @@ -74357,7 +74357,7 @@ namespace Model OnCreated(); } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] public string MaterialCode { get @@ -74461,7 +74461,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(3000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string MaterialDef { get @@ -79051,7 +79051,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] public string MaterialCode { get @@ -122768,7 +122768,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(100)")] public string MaterialName { get @@ -122788,7 +122788,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(200)")] public string SpecificationAndModel { get @@ -122808,7 +122808,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(100)")] public string MaterialCode { get @@ -122828,7 +122828,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(100)")] public string Material { get @@ -151295,6 +151295,10 @@ namespace Model private System.Nullable _State; + private string _BidNoticeCode; + + private string _BidUnitFileCode; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -151335,6 +151339,10 @@ namespace Model partial void OnProjectIdChanged(); partial void OnStateChanging(System.Nullable value); partial void OnStateChanged(); + partial void OnBidNoticeCodeChanging(string value); + partial void OnBidNoticeCodeChanged(); + partial void OnBidUnitFileCodeChanging(string value); + partial void OnBidUnitFileCodeChanged(); #endregion public PHTGL_BidDocumentsStandingBook() @@ -151702,6 +151710,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BidNoticeCode", DbType="NVarChar(100)")] + public string BidNoticeCode + { + get + { + return this._BidNoticeCode; + } + set + { + if ((this._BidNoticeCode != value)) + { + this.OnBidNoticeCodeChanging(value); + this.SendPropertyChanging(); + this._BidNoticeCode = value; + this.SendPropertyChanged("BidNoticeCode"); + this.OnBidNoticeCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BidUnitFileCode", DbType="NVarChar(100)")] + public string BidUnitFileCode + { + get + { + return this._BidUnitFileCode; + } + set + { + if ((this._BidUnitFileCode != value)) + { + this.OnBidUnitFileCodeChanging(value); + this.SendPropertyChanging(); + this._BidUnitFileCode = value; + this.SendPropertyChanged("BidUnitFileCode"); + this.OnBidUnitFileCodeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -220731,7 +220779,7 @@ namespace Model { } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ToKeyId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ToKeyId", DbType="NVarChar(100)")] public string ToKeyId { get @@ -245576,7 +245624,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ToKeyId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ToKeyId", DbType="NVarChar(100)")] public string ToKeyId { get