This commit is contained in:
2024-10-30 17:15:38 +08:00
37 changed files with 415 additions and 298 deletions
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="10/09/2024 16:33:27" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="10/12/2024 15:13:53" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGKbA2Bx03EOue9PYrCFwa+"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRF3hHwWOeKvKBRVSwNsZpqq"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="pipelineCode" DataType="System.String" PropName="PipelineComponentId"/>
<Column Name="Mat" DataType="System.String" PropName="PipelineComponentCode"/>
@@ -156,7 +156,7 @@ namespace FastReport
<BarcodeObject Name="Barcode1" Left="3.78" Width="141.75" Height="141.75" AutoSize="false" Text="https://sggl.sedin.com.cn/StaticPage/HJGL/index.html?id=[Table1.WeldJointId]&amp;weldjoint=1" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
</TableCell>
<TableCell Name="Cell36" VertAlign="Center" Font="宋体, 11pt">
<TextObject Name="Text1" Left="9.45" Top="18.9" Width="217.35" Height="103.95" Text="[Table1.SortIndex]#" Font="黑体, 72pt, style=Bold"/>
<TextObject Name="Text1" Left="9.45" Top="18.9" Width="217.35" Height="103.95" Text="[Table1.SortIndex]#" Font="黑体, 48pt, style=Bold"/>
</TableCell>
</TableRow>
</TableObject>
File diff suppressed because one or more lines are too long
@@ -520,6 +520,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
= x.HardResult,
= x.TrustBatchCode,
= x.NDECode,
=x.DetectionTypeCode,
=x.DetectionRateCode
}).ToList();
MiniExcel.SaveAs(path, q);
@@ -78,11 +78,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
protected void btnSave_Click(object sender, EventArgs e)
{
if (dropPipelineComponentCode.Values.Length==0)
/*if (dropPipelineComponentCode.Values.Length==0)
{
ShowNotify("请选择预制组件", MessageBoxIcon.Warning);
return;
}
}*/
if (string.IsNullOrEmpty(PackagingManageId))
{
Model.HJGL_PackagingManage table = new Model.HJGL_PackagingManage() ;
@@ -61,6 +61,10 @@
<f:DropDownList ID="drpWeldingDailyCode" Label="日报编号" runat="server" AutoSelectFirstItem="true"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="drpFlowingSection" Label="流水段" AutoPostBack="true"
runat="server" LabelWidth="80px"
Width="180px" LabelAlign="Left">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
@@ -27,7 +27,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
HJGL_PipelineComponentService.InitMainItemDownList(drpState,true);
HJGL_PipelineComponentService.InitMainItemDownProductionStateList(drpProductionState,true);
var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId
select x.FlowingSection).Distinct().ToList();
this.drpFlowingSection.DataTextField = "Value";
this.drpFlowingSection.DataValueField = "Value";
this.drpFlowingSection.DataSource = pipeline;
this.drpFlowingSection.DataBind();
Funs.FineUIPleaseSelect(drpFlowingSection);
}
}
@@ -285,6 +292,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
listStr.Add(new SqlParameter("@ProductionState", drpProductionState.SelectedValue.ToString()));
}
if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null)
{
strSql += " AND pipe.FlowingSection =@FlowingSection";
listStr.Add(new SqlParameter("@FlowingSection", drpFlowingSection.SelectedValue.ToString()));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
GridDataTable = tb;
@@ -149,6 +149,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldingDailyCode;
/// <summary>
/// drpFlowingSection 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpFlowingSection;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -1311,7 +1311,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
WeldJointId = x.WeldJointId,
Spec = x.Specification,
SortIndex = x.WeldJointCode.Replace(x.PipelineCode + "/", ""),
}).ToList();
}).OrderBy(x=> x.pipelineCode).ThenBy(x=> x.SortIndex).ToList();
var tb = LINQToDataTable(result);
if (tb != null && tb.Rows.Count > 0)
{
@@ -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);
@@ -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))
{
@@ -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);
}
@@ -25,7 +25,7 @@
</f:FormRow>
<f:FormRow>
<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" EnableEdit="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="140px"></f:DropDownList>
<f:TextBox ID="txtBidProject" runat="server" Label="招标项目" LabelAlign="Right" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
@@ -43,7 +43,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
ApproveUserReviewID = Request.Params["ApproveUserReviewID"];
BLL.DepartService.InitDepartDropDownList(DropDepart, true);
BLL.PHTGL_BidDocumentsReviewService.InitGetBidCompleteDropDownList(drpBidDocumentCode, true);
BLL.PHTGL_BidDocumentsReviewService.InitGetBidCompleteDropDownList(drpBidDocumentCode,this.CurrUser.LoginProjectId, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropUser, null, Const.UnitId_SEDIN, null, false);
///绑定施工管理部正副主任
@@ -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)
@@ -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);
}
}
@@ -34,6 +34,12 @@
<f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
</f:Button>
<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="确定删除当前数据?"
OnClick="btnMenuDelete_Click">
</f:Button>
@@ -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();
@@ -55,7 +56,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
/// </summary>
private void BindGrid()
{
string strSql = @" select Sub.SetSubReviewID
string strSql = @" select Sub.SetSubReviewID
,Sub.SetSubReviewCode
,Acp.ProjectShortName
,BidDoc.BidDocumentsCode
@@ -72,13 +73,11 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
WHEN @Type_ConEvaluation THEN '综合评估法' END) AS Type
,U.PersonName AS CreateUser
,Pro.ProjectName
,Pro.ProjectCode"
+ @" from PHTGL_SetSubReview as Sub "
+ @" LEFT JOIN PHTGL_BidApproveUserReview as BidUser on BidUser.ApproveUserReviewID = Sub.ApproveUserReviewID "
+ @" LEFT JOIN PHTGL_BidDocumentsReview as BidDoc on BidDoc.BidDocumentsReviewId = BidUser.BidDocumentsReviewId "
+ @" LEFT JOIN PHTGL_ActionPlanFormation AS Acp ON Acp.ActionPlanID =BidDoc.ActionPlanID "
+ @" LEFT JOIN Person_Persons AS U ON U.PersonId = Sub.CreateUser "
+ @" LEFT JOIN Base_Project AS Pro ON Pro.ProjectId = BidUser.ProjectId WHERE 1=1 ";
,Pro.ProjectCode from PHTGL_SetSubReview as Sub
LEFT JOIN PHTGL_BidDocumentsReview as BidDoc on BidDoc.BidDocumentsReviewId = Sub.BidDocumentsReviewId
LEFT JOIN PHTGL_ActionPlanFormation AS Acp ON Acp.ActionPlanID =BidDoc.ActionPlanID
LEFT JOIN Person_Persons AS U ON U.PersonId = BidDoc.CreateUser
LEFT JOIN Base_Project AS Pro ON Pro.ProjectId = BidDoc.ProjectId WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -91,7 +90,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
if (!(this.CurrUser.PersonId == Const.sysglyId))
{
strSql += " and BidUser.ProjectId =@ProjectId";
strSql += " and BidDoc.ProjectId =@ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
}
@@ -383,17 +382,22 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
if (this.judgementDelete(rowID, isShow))
{
var p = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(rowID);
if (p != null)
if (p != null&& p.State==Const.ContractCreating)
{
BLL.LogService.AddSys_Log(this.CurrUser, p.SetSubReviewID, p.ApproveUserReviewID, BLL.Const.SetSubReview, BLL.Const.BtnDelete);
PHTGL_ApproveService.DeletePHTGL_ApproveBycontractId(rowID);
BLL.AttachFileService.DeleteAttachFile(Funs.RootPath, rowID, BLL.Const.SetSubReview);
PHTGL_SetSubReviewService.DeletePHTGL_SetSubReviewById(rowID);
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}
else
{
ShowNotify("审批表已提交,无法删除!", MessageBoxIcon.Question);
}
}
}
BindGrid();
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}
}
@@ -439,16 +443,17 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
btnNew.Hidden = false;
btnNew2.Hidden = false;
btnAdd1.Hidden = false;
btnAdd2.Hidden = false;
}
if (buttonList.Contains(Const.BtnModify))
{
//btnMenuEdit.Hidden = false;
}
//if (buttonList.Contains(Const.BtnDelete))
//{
// btnMenuDelete.Hidden = false;
//}
if (buttonList.Contains(Const.BtnDelete))
{
btnMenuDelete.Hidden = false;
}
}
}
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
@@ -647,7 +652,6 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
}
#endregion
}
}
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.PHTGL.BiddingManagement {
public partial class SetSubReview {
namespace FineUIPro.Web.PHTGL.BiddingManagement
{
public partial class SetSubReview
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtSetSubReviewCode 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSetSubReviewCode;
/// <summary>
/// DropType 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropType;
/// <summary>
/// DropState 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropState;
/// <summary>
/// btnSearch 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary>
/// btnRset 控件。
/// </summary>
@@ -101,7 +103,25 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
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>
/// btnMenuDelete 控件。
/// </summary>
@@ -110,7 +130,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnMenuDelete;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -119,7 +139,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// MenuButton1 控件。
/// </summary>
@@ -128,7 +148,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button MenuButton1;
/// <summary>
/// btnPrinter 控件。
/// </summary>
@@ -137,7 +157,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrinter;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnNew2 控件。
/// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew2;
/// <summary>
/// btnQueryApprove 控件。
/// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQueryApprove;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -209,7 +229,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -127,8 +127,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
if (!string.IsNullOrEmpty(SetSubReviewID))
{
var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(_SetSubReview.ApproveUserReviewID);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(_SetSubReview.BidDocumentsReviewId);
if (_SetSubReview != null)
{
txtSetSubReviewCode.Text = _SetSubReview.SetSubReviewCode;
@@ -25,7 +25,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtSetSubReviewCode" runat="server" Label="审批表编号" ShowRedStar="true" LabelAlign="Right" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="DropBidCode" runat="server" Label="招标文件编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="120px"></f:DropDownList>
<f:DropDownList ID="DropBidCode" runat="server" Label="招标文件编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="120px" EnableEdit="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
@@ -67,7 +67,7 @@
<Items>
<f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
runat="server" DataKeyNames="ID" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
EnableColumnLines="true" DataIDField="ID" MaxHeight="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">
EnableColumnLines="true" DataIDField="ID" Height="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">
<Toolbars>
<f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left">
<Items>
@@ -44,7 +44,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
SetSubReviewID = Request.Params["SetSubReviewID"];
BLL.DepartService.InitDepartDropDownList(DropDepart, true);
PHTGL_BidApproveUserReviewService.InitGetBidCompleteDropDownList(DropBidCode, true);
BLL.PHTGL_BidDocumentsReviewService.InitGetBidCompleteDropDownList(DropBidCode, this.CurrUser.LoginProjectId, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropConstructionManager, null, Const.UnitId_SEDIN, null, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropProjectManager, null, Const.UnitId_SEDIN, null, true);
@@ -111,8 +111,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
if (!string.IsNullOrEmpty(SetSubReviewID))
{
var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(_SetSubReview.ApproveUserReviewID);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(_SetSubReview.BidDocumentsReviewId);
var Act = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDocument.ActionPlanID);
if (_SetSubReview != null)
{
@@ -121,7 +120,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
txtSetSubReviewCode.Text = Act.ProjectCode + ".000.C01.93-";
}
DropBidCode.SelectedValue = _SetSubReview.ApproveUserReviewID;
DropBidCode.SelectedValue = _SetSubReview.BidDocumentsReviewId;
txtProjectName.Text = PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDocument.ActionPlanID).ProjectShortName;
txtBidContent.Text = BidDocument.BidContent;
StartTime.SelectedDate = BidDocument.Bidding_StartTime;
@@ -174,10 +173,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
if (DropBidCode.SelectedValue != Const._Null)
{
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(DropBidCode.SelectedValue);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(DropBidCode.SelectedValue);
string projectcode = BLL.ProjectService.GetProjectCodeByProjectId(BidUser.ProjectId);
string projectcode = BLL.ProjectService.GetProjectCodeByProjectId(BidDocument.ProjectId);
if (string.IsNullOrEmpty(SetSubReviewID))
{
this.txtSetSubReviewCode.Text = projectcode + ".000.C01.93-";
@@ -254,9 +252,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview();
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(DropBidCode.SelectedValue);
_SetSubReview.ApproveUserReviewID = DropBidCode.SelectedValue;
_SetSubReview.ActionPlanID = BidUser.ActionPlanID;
var BidDoc = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(DropBidCode.SelectedValue);
_SetSubReview.ActionPlanID = BidDoc.ActionPlanID;
_SetSubReview.BidDocumentsReviewId = DropBidCode.SelectedValue;
_SetSubReview.SetSubReviewCode = txtSetSubReviewCode.Text.Trim().ToString();
_SetSubReview.CreateUser = this.CurrUser.PersonId;
_SetSubReview.State = state;
@@ -271,42 +269,49 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
_SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));
SetSubReviewID = _SetSubReview.SetSubReviewID;
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
if (state== Const.ContractCreat_Complete)
{
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
ShowNotify("未上传业主审批结果,无法保存!", MessageBoxIcon.Warning);
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
{
ShowNotify("未上传业主审批结果,无法保存!", MessageBoxIcon.Warning);
return false;
}
}
if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
{
ShowNotify("未上评标报告,无法保存!", MessageBoxIcon.Warning);
return false;
}
}
if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
{
ShowNotify("未上评标报告,无法保存!", MessageBoxIcon.Warning);
return false;
}
}
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);
}
else
{
_SetSubReview.SetSubReviewID = SetSubReviewID;
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
if (state == Const.ContractCreat_Complete)
{
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
ShowNotify("未上传业主审批结果,无法保存!", MessageBoxIcon.Warning);
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
{
ShowNotify("未上传业主审批结果,无法保存!", MessageBoxIcon.Warning);
return false;
}
}
if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
{
ShowNotify("未上评标报告,无法保存!", MessageBoxIcon.Warning);
return false;
}
}
if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
{
ShowNotify("未上评标报告,无法保存!", MessageBoxIcon.Warning);
return false;
}
PHTGL_SetSubReviewService.UpdatePHTGL_SetSubReview(_SetSubReview);
}
@@ -385,11 +390,17 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
/// <param name="e"></param>
protected void btnAttachUrl_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID, BLL.Const.SetSubReview)));
if (Save(Const.ContractCreating))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID, BLL.Const.SetSubReview)));
}
}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID + "report", BLL.Const.SetSubReview)));
if (Save(Const.ContractCreating))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID + "report", BLL.Const.SetSubReview)));
}
}
#endregion
}
@@ -25,7 +25,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtSetSubReviewCode" runat="server" Label="审批表编号" ShowRedStar="true" LabelAlign="Right" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="DropBidCode" runat="server" Label="招标文件编号" LabelAlign="Right" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" AutoPostBack="true" LabelWidth="120px"></f:DropDownList>
<f:DropDownList ID="DropBidCode" runat="server" Label="招标文件编号" LabelAlign="Right" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" AutoPostBack="true" LabelWidth="120px" EnableEdit="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
@@ -74,7 +74,7 @@
<Items>
<f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
runat="server" DataKeyNames="ID" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
EnableColumnLines="true" DataIDField="ID" MaxHeight="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">
EnableColumnLines="true" DataIDField="ID" Height="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">
<Toolbars>
<f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left">
<Items>
@@ -43,7 +43,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
SetSubReviewID = Request.Params["SetSubReviewID"];
BLL.DepartService.InitDepartDropDownList(DropDepart, true);
PHTGL_BidApproveUserReviewService.InitGetBidCompleteDropDownList(DropBidCode, true);
BLL.PHTGL_BidDocumentsReviewService.InitGetBidCompleteDropDownList(DropBidCode, this.CurrUser.LoginProjectId, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropConstructionManager, null, Const.UnitId_SEDIN, null, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropProjectManager, null, Const.UnitId_SEDIN, null, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropApproval_Construction, null, CurrUser.UnitId, Const.ConstructionMinister + "," + Const.ConstructionViceMinister, false);
@@ -105,8 +105,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
if (!string.IsNullOrEmpty(SetSubReviewID))
{
var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(_SetSubReview.ApproveUserReviewID);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(_SetSubReview.BidDocumentsReviewId);
var Act = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDocument.ActionPlanID);
if (_SetSubReview != null)
@@ -116,7 +115,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
txtSetSubReviewCode.Text = Act.ProjectCode + ".000.C01.93-";
}
DropBidCode.SelectedValue = _SetSubReview.ApproveUserReviewID;
DropBidCode.SelectedValue = _SetSubReview.BidDocumentsReviewId;
txtProjectName.Text = PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDocument.ActionPlanID).ProjectShortName;
txtBidContent.Text = BidDocument.BidContent;
StartTime.SelectedDate = BidDocument.Bidding_StartTime;
@@ -166,9 +165,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
if (DropBidCode.SelectedValue != Const._Null)
{
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(DropBidCode.SelectedValue);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
string projectcode = BLL.ProjectService.GetProjectCodeByProjectId(BidUser.ProjectId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(DropBidCode.SelectedValue);
string projectcode = BLL.ProjectService.GetProjectCodeByProjectId(BidDocument.ProjectId);
if (string.IsNullOrEmpty(SetSubReviewID))
{
this.txtSetSubReviewCode.Text = projectcode + ".000.C01.93-";
@@ -246,9 +245,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
}
Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview();
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(DropBidCode.SelectedValue);
_SetSubReview.ApproveUserReviewID = DropBidCode.SelectedValue;
_SetSubReview.ActionPlanID = BidUser.ActionPlanID;
var BidDoc = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(DropBidCode.SelectedValue);
_SetSubReview.ActionPlanID = BidDoc.ActionPlanID;
_SetSubReview.BidDocumentsReviewId = DropBidCode.SelectedValue;
_SetSubReview.SetSubReviewCode = txtSetSubReviewCode.Text.Trim().ToString();
_SetSubReview.CreateUser = this.CurrUser.PersonId;
_SetSubReview.State = state;
@@ -263,45 +262,51 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
_SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));
SetSubReviewID = _SetSubReview.SetSubReviewID;
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
if (state == Const.ContractCreat_Complete)
{
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
ShowNotify("未上传业主审批结果,无法保存!", MessageBoxIcon.Warning);
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
{
ShowNotify("未上传业主审批结果,无法保存!", MessageBoxIcon.Warning);
return false;
}
}
if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
{
ShowNotify("未上评标报告,无法保存!", MessageBoxIcon.Warning);
return false;
}
}
if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
{
ShowNotify("未上评标报告,无法保存!", MessageBoxIcon.Warning);
return false;
}
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);
}
else
{
_SetSubReview.SetSubReviewID = SetSubReviewID;
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
if (state == Const.ContractCreat_Complete)
{
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
ShowNotify("未上传业主审批结果,无法保存!", MessageBoxIcon.Warning);
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
{
ShowNotify("未上传业主审批结果,无法保存!", MessageBoxIcon.Warning);
return false;
}
}
if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
{
ShowNotify("未上评标报告,无法保存!", MessageBoxIcon.Warning);
return false;
}
}
if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
{
ShowNotify("未上评标报告,无法保存!", MessageBoxIcon.Warning);
return false;
}
PHTGL_SetSubReviewService.UpdatePHTGL_SetSubReview(_SetSubReview);
}
BLL.PHTGL_SetSubReview_Sch1Service.DeletePHTGL_SetSubReview_Sch1BySetSubReviewID(SetSubReviewID);
JArray EditorArr = Grid1.GetMergedData();
if (EditorArr.Count > 0)
@@ -374,12 +379,17 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
/// <param name="e"></param>
protected void btnAttachUrl_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID, BLL.Const.SetSubReview)));
if (Save(Const.ContractCreating))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID, BLL.Const.SetSubReview)));
}
}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID + "report", BLL.Const.SetSubReview)));
if (Save(Const.ContractCreating))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID + "report", BLL.Const.SetSubReview)));
}
}
#endregion