diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 96b6ff64..387ff006 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ diff --git a/DataBase/版本日志/SGGLDB_V2023-03-24.sql b/DataBase/版本日志/SGGLDB_V2023-03-24.sql index 50ee428b..6530815e 100644 --- a/DataBase/版本日志/SGGLDB_V2023-03-24.sql +++ b/DataBase/版本日志/SGGLDB_V2023-03-24.sql @@ -4,4 +4,12 @@ alter table PHTGL_BidDocumentsStandingBook ADD ProjectId nvarchar(100) alter table PHTGL_BidDocumentsStandingBook ADD State int alter table AttachFile alter column ToKeyId nvarchar(100) - alter table AttachFile alter column AttachPath nvarchar(100) \ No newline at end of file + alter table AttachFile alter column AttachPath nvarchar(100) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'024F85B5-E19C-4AE9-9605-4779B61F7CF4',N'11f4f882-28a9-4610-a657-6a58336097d2',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'BF0DC6A6-ED3B-4CCA-8BBD-A107B98807BA',N'11f4f882-28a9-4610-a657-6a58336097d2',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'26C1682B-67AC-4E7D-BEEF-0458668F4AC2',N'11f4f882-28a9-4610-a657-6a58336097d2',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'D2024122-FDB2-49A8-9128-35DB4B25A29B',N'11f4f882-28a9-4610-a657-6a58336097d2',N'',1) \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2023-03-29_lpf.sql b/DataBase/版本日志/SGGLDB_V2023-03-29_lpf.sql new file mode 100644 index 00000000..bb14f223 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-03-29_lpf.sql @@ -0,0 +1,36 @@ + + alter table PHTGL_BidDocumentsStandingBook ADD BidNoticeCode nvarchar(100) + alter table PHTGL_BidDocumentsStandingBook ADD BidUnitFileCode nvarchar(100) + + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'б֪ͨ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_BidDocumentsStandingBook', @level2type=N'COLUMN',@level2name=N'BidNoticeCode' +GO + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ͷļ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_BidDocumentsStandingBook', @level2type=N'COLUMN',@level2name=N'BidUnitFileCode' +GO + +delete from [Sys_Menu] where [MenuId]='11f4f882-28a9-4610-a657-6a58336097d2' +delete from [Sys_ButtonToMenu] where [MenuId]='11f4f882-28a9-4610-a657-6a58336097d2' +GO +INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) + VALUES ( N'11f4f882-28a9-4610-a657-6a58336097d2',N'б깤̨',N'PHTGL/Filing/BidDocumentsStandingBook.aspx?Type=1',30,N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'Menu_PHTGL',0,1,1) + GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'024F85B5-E19C-4AE9-9605-4779B61F7CF4',N'11f4f882-28a9-4610-a657-6a58336097d2',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'BF0DC6A6-ED3B-4CCA-8BBD-A107B98807BA',N'11f4f882-28a9-4610-a657-6a58336097d2',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'26C1682B-67AC-4E7D-BEEF-0458668F4AC2',N'11f4f882-28a9-4610-a657-6a58336097d2',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'D2024122-FDB2-49A8-9128-35DB4B25A29B',N'11f4f882-28a9-4610-a657-6a58336097d2',N'',1) + GO +INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) +VALUES ( N'C18B4A2E-7BE7-43E6-A969-8A6292D19987',N'б깤̨',N'PHTGL/Filing/BidDocumentsStandingBook.aspx',40,N'0',N'Menu_HTGL',1,0,1) +GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'7903BFCB-6744-467C-B114-558A978BF40B',N'C18B4A2E-7BE7-43E6-A969-8A6292D19987',N'޸',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'377C7B8E-CC15-4002-B391-4DF580AD4248',N'C18B4A2E-7BE7-43E6-A969-8A6292D19987',N'ɾ',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'3567F71F-8A85-4147-9EE8-8BD931ECDBD7',N'C18B4A2E-7BE7-43E6-A969-8A6292D19987',N'',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'1C04B9DD-0737-4E48-88D5-20A39F3AD42E',N'C18B4A2E-7BE7-43E6-A969-8A6292D19987',N'',1) +GO \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql b/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql index 97686b85..2c9ef138 100644 --- a/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql +++ b/DataBase/菜单初始化脚本/0-3合同管理（Menu_HTGL）.sql @@ -67,4 +67,16 @@ GO VALUES ( N'AC470E65-700A-42CF-BA12-0036EBBD5E9F',N'9C4E7381-4080-4082-8C4D-B041149D48C7',N'保存',4) GO - \ No newline at end of file +INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) +VALUES ( N'C18B4A2E-7BE7-43E6-A969-8A6292D19987',N'招标工作台账',N'PHTGL/Filing/BidDocumentsStandingBook.aspx',40,N'0',N'Menu_HTGL',1,0,1) +GO + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'7903BFCB-6744-467C-B114-558A978BF40B',N'C18B4A2E-7BE7-43E6-A969-8A6292D19987',N'修改',2) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'377C7B8E-CC15-4002-B391-4DF580AD4248',N'C18B4A2E-7BE7-43E6-A969-8A6292D19987',N'删除',3) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'3567F71F-8A85-4147-9EE8-8BD931ECDBD7',N'C18B4A2E-7BE7-43E6-A969-8A6292D19987',N'保存',4) + INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) + VALUES ( N'1C04B9DD-0737-4E48-88D5-20A39F3AD42E',N'C18B4A2E-7BE7-43E6-A969-8A6292D19987',N'增加',1) +GO + diff --git a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql index bff813d0..f2cd35b6 100644 --- a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql +++ b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql @@ -136,7 +136,7 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff GO INSERT [Sys_Menu] ([MenuId],[MenuName],[Url],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'11f4f882-28a9-4610-a657-6a58336097d2',N'б깤̨',N'PHTGL/Filing/BidDocumentsStandingBook.aspx',30,N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'Menu_PHTGL',0,1,1) + VALUES ( N'11f4f882-28a9-4610-a657-6a58336097d2',N'б깤̨',N'PHTGL/Filing/BidDocumentsStandingBook.aspx?Type=1',30,N'79A6D6B1-E29F-4921-8867-142CEED7997B',N'Menu_PHTGL',0,1,1) GO INSERT [Sys_ButtonToMenu] ([ButtonToMenuId],[MenuId],[ButtonName],[SortIndex]) VALUES ( N'024F85B5-E19C-4AE9-9605-4779B61F7CF4',N'11f4f882-28a9-4610-a657-6a58336097d2',N'޸',2) diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 323a60a3..97505004 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -2923,7 +2923,8 @@ /// /// 招标工作台账 /// - 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 5e568135..3900ae9b 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/BidDocumentsStandingBookIn.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/BidDocumentsStandingBookIn.xlsx differ diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx index 8a2a6184..c8b969dc 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx @@ -142,6 +142,12 @@ + + + + <%-- 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