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

2023-03-09 合同归档修改，安全首页修改

Browse Source
This commit is contained in:
李鹏飞
2023-03-09 15:02:06 +08:00
parent b76821201b
commit ffa50f752f
21 changed files with 1042 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx
+2 -8
View File
@@ -23,14 +23,8 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList runat="server" ID="DropDownList1" Label="数据来源">
<f:ListItem Text="施工管理部" Value="Value1" />
<f:ListItem Text="环境工程事业部" Value="Value2" />
<f:ListItem Text="基础设施事业部" Value="Value3" />
<f:ListItem Text="运营管理部" Value="Value4" />
<f:ListItem Text="宁波公司" Value="Value5" />
<f:ListItem Text="焦化公司" Value="Value6" />
</f:DropDownList>
<f:DropDownList ID="drpDepartId" runat="server" Label="主办部门" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:TextBox runat="server" Label="合同名称" ID="txtContractName" EmptyText="输入查询条件" Width="300px" LabelWidth="90px"
LabelAlign="right">
</f:TextBox>
SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs
+8
View File
@@ -20,6 +20,8 @@ namespace FineUIPro.Web.PHTGL.Filing
if (!IsPostBack)
{
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BLL.DepartService.InitDepartDropDownList(this.drpDepartId, false);
BindGrid();
}
}
@@ -105,6 +107,12 @@ namespace FineUIPro.Web.PHTGL.Filing
strSql += " AND Con.ContractName LIKE @ContractName";
listStr.Add(new SqlParameter("@ContractName", "%" + this.txtContractName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(drpDepartId.SelectedValue))
{
strSql += " AND Con.DepartId = @DepartId";
listStr.Add(new SqlParameter("@DepartId", drpDepartId.SelectedValue));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.designer.cs
Generated
+2 -2
View File
@@ -60,13 +60,13 @@ namespace FineUIPro.Web.PHTGL.Filing
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// DropDownList1 控件。
/// drpDepartId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList1;
protected global::FineUIPro.DropDownList drpDepartId;
/// <summary>
/// txtContractName 控件。
SGGL/FineUIPro.Web/PHTGL/Filing/Files.aspx
+32 -28
View File
@@ -13,9 +13,9 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="实施计划审批" EnableCollapse="true" EnableAjax="false"
runat="server" BoxFlex="1" DataKeyNames="ActionPlanReviewId" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="ActionPlanReviewId" AllowSorting="true" SortField="CreateTime" OnSort="Grid1_Sort"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="基本信息" EnableCollapse="true" EnableAjax="false"
runat="server" BoxFlex="1" DataKeyNames="ContractReviewId" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="ContractReviewId" AllowSorting="true" SortField="ContractNum" OnSort="Grid1_Sort"
SortDirection="DESC" EnableColumnLines="true" OnPageIndexChange="Grid1_PageIndexChange"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true" OnRowCommand="Grid1_RowCommand" EnableRowClickEvent="true"
EnableRowDoubleClickEvent="true"
@@ -23,25 +23,23 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList runat="server" ID="DropDownList1" Label="数据来源">
<f:ListItem Text="施工管理部" Value="Value1" />
<f:ListItem Text="环境工程事业部" Value="Value2" />
<f:ListItem Text="基础设施事业部" Value="Value3" />
<f:ListItem Text="运营管理部" Value="Value4" />
<f:ListItem Text="宁波公司" Value="Value5" />
<f:ListItem Text="焦化公司" Value="Value6" />
</f:DropDownList>
<f:TextBox runat="server" Label="总承包合同编号" ID="txtActionPlanCode" EmptyText="输入查询条件" Width="300px" LabelWidth="140px"
LabelAlign="left">
<f:DropDownList ID="drpDepartId" runat="server" Label="主办部门" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:TextBox runat="server" Label="合同名称" ID="txtContractName" EmptyText="输入查询条件" Width="300px" LabelWidth="90px"
LabelAlign="right">
</f:TextBox>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnQuery" OnClick="btnSearch_Click" ToolTip="查询" Text="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
</f:Button>
<f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
</f:Button>
</Items>
<f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
</f:Button>
<f:Button ID="btnPrinter" EnablePostBack="true" runat="server"
Text="导出评审单" Icon="Printer" OnClick="btnPrinter_Click1" EnableAjax="false" DisableControlBeforePostBack="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
@@ -50,17 +48,23 @@
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField ColumnID="Name" DataField="Name" Width="120px" FieldType="String" HeaderText="项目名称" TextAlign="Center"
<f:RenderField ColumnID="EPCCode" EnableLock="true" Locked="true" DataField="EPCCode" Width="120px" FieldType="String" HeaderText="总承包合同编号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="EPCCode" DataField="EPCCode" Width="120px" FieldType="String" HeaderText="总承包合同编号" TextAlign="Center"
<f:RenderField ColumnID="ProjectShortName" EnableLock="true" Locked="true" DataField="ProjectShortName" Width="180px" FieldType="String" HeaderText="项目名称" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:LinkButtonField ColumnID="export" HeaderText="导出" Width="60px" Icon="ArrowUp" CommandName="export" />
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
<f:RenderField ColumnID="ContractName" EnableLock="true" Locked="true" DataField="ContractName" Width="180px" FieldType="String" HeaderText="合同名称" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractNum" EnableLock="true" Locked="true" DataField="ContractNum" Width="180px" FieldType="String" HeaderText="合同编号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<%-- <f:LinkButtonField ColumnID="export" HeaderText="导出" Width="60px" Icon="ArrowUp" CommandName="export" />
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />--%>
</Columns>
<PageItems>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
@@ -81,10 +85,10 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true"
Width="700px" Height="500px">
</f:Window>
</form>
<script type="text/javascript">
</script>
</script>
</body>
</html>
</html>
SGGL/FineUIPro.Web/PHTGL/Filing/Files.aspx.cs
+101 -18
View File
@@ -20,6 +20,8 @@ namespace FineUIPro.Web.PHTGL.Filing
{
if (!IsPostBack)
{
BLL.DepartService.InitDepartDropDownList(this.drpDepartId, false);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
GetButtonPower();
BindGrid();
@@ -34,8 +36,96 @@ namespace FineUIPro.Web.PHTGL.Filing
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT Rev.ContractReviewId,
Con.ContractId,
Con.ProjectId,
Con.ContractName,
Con.ContractNum,
Con.Parties,
Con.Currency,
Con.ContractAmount,
Con.DepartId,
Con.Agent,
(CASE Con.ContractType WHEN '1' THEN '施工总承包分包合同'
WHEN '2' THEN '施工专业分包合同'
WHEN '3' THEN '施工劳务分包合同'
WHEN '4' THEN '试车服务合同'
WHEN '5' THEN 'ds' END) AS ContractType,
( CASE Rev.State
WHEN @ContractCreating THEN '编制中'
WHEN @Contract_countersign THEN '会签中'
WHEN @ContractReviewing THEN '审批中'
WHEN @ContractReview_Complete THEN '审批成功'
WHEN @ContractReview_Refuse THEN '审批被拒' END) AS State ,
Con.Remarks,
Con.EPCCode,
Con.ProjectShortName,
Con.[OpeningBank-TT] as OpeningBank_TT ,
Con.[OpeningBank-electrophore] as OpeningBank_electrophore,
Con.[BankAccount-TT] as BankAccount_TT,
Con.[BankAccount-electrophore] as BankAccount_electrophore,
Con.[LineNumber-electrophore] as LineNumber_electrophore,
Con.Retentionmoney,
(CASE Con.Status WHEN '0' THEN '已签订'
WHEN '1' THEN '已完毕' END) as Status,
Con.ContactUnitOfPartyA,
Con.ContactPersonOfPartyA,
Con.ContactPersonOfPartyB,
Con.ContactPersonPhoneOfPartyB,
Con.ContactPersonEmailOfPartyB,
Con.ContractAmountExcludingTax,
Con.PriceMethod,
CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate,
CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate,
CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate,
Con.PricingBasis,
(CASE Con.SubcontractingMethod WHEN '1' then '内部分包'
WHEN '2' THEN '外部分包' END ) as SubcontractingMethod,
(CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否'
WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier,
Pro.ProjectCode,
Pro.ProjectName,
Dep.DepartName,
U.PersonName AS AgentName "
+ @" from PHTGL_ContractReview AS Rev"
+ @" LEFT JOIN PHTGL_Contract AS Con ON Con.ContractId=Rev.ContractId"
//+ @" left join PHTGL_ActionPlanFormation as Act on Act.EPCCode=Con.EPCCode"
+ @" LEFT JOIN Base_Project AS Pro ON Pro.ProjectId = Con.ProjectId"
+ @" LEFT JOIN Base_Depart AS Dep ON Dep.DepartId = Con.DepartId"
+ @" LEFT JOIN Person_Persons AS U ON U.PersonId = Con.Agent WHERE 1=1 and Rev.State=@State";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ContractCreating", Const.ContractCreating.ToString()));
listStr.Add(new SqlParameter("@Contract_countersign", Const.Contract_countersign));
listStr.Add(new SqlParameter("@ContractReviewing", Const.ContractReviewing));
listStr.Add(new SqlParameter("@ContractReview_Complete", Const.ContractReview_Complete));
listStr.Add(new SqlParameter("@ContractReview_Refuse", Const.ContractReview_Refuse));
listStr.Add(new SqlParameter("@State", Const.ContractReview_Complete));
if (!(this.CurrUser.PersonId == Const.sysglyId))
{
strSql += " and Con.ProjectId =@ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
}
if (!string.IsNullOrEmpty(this.txtContractName.Text.Trim()))
{
strSql += " AND Con.ContractName LIKE @ContractName";
listStr.Add(new SqlParameter("@ContractName", "%" + this.txtContractName.Text.Trim() + "%"));
}
if (! string .IsNullOrEmpty(drpDepartId.SelectedValue))
{
strSql += " AND Con.DepartId = @DepartId";
listStr.Add(new SqlParameter("@DepartId", drpDepartId.SelectedValue));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
#region 分页 排序
@@ -112,7 +202,7 @@ namespace FineUIPro.Web.PHTGL.Filing
protected void btnRset_Click(object sender, EventArgs e)
{
txtActionPlanCode.Text = "";
txtContractName.Text = "";
BindGrid();
}
@@ -146,24 +236,17 @@ namespace FineUIPro.Web.PHTGL.Filing
#endregion
#region 打印
protected void btnPrinter_Click(object sender, EventArgs e)
protected void btnPrinter_Click1(object sender, EventArgs e)
{
//if (Grid1.SelectedRowIndexArray.Length == 0)
//{
// Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
// return;
//}
//string Id = Grid1.SelectedRowID;
//var Act = PHTGL_ActionPlanReviewService.GetPHTGL_ActionPlanReviewById(Id);
//if (Act == null)
//{
// Alert.ShowInTop("还未创建审批流无法导出！", MessageBoxIcon.Warning);
// return;
//}
//string ActionPlanID = Act.ActionPlanID;
//ActionPlanFormation actionPlanFormation = new ActionPlanFormation();
//actionPlanFormation.Print(ActionPlanID);
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
string Id = Grid1.SelectedRowID;
PHTGL_ContractReviewService.PrintApprovalForm(Id);
}
#endregion
SGGL/FineUIPro.Web/PHTGL/Filing/Files.aspx.designer.cs
Generated
+13 -4
View File
@@ -60,22 +60,22 @@ namespace FineUIPro.Web.PHTGL.Filing
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// DropDownList1 控件。
/// drpDepartId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList1;
protected global::FineUIPro.DropDownList drpDepartId;
/// <summary>
/// txtActionPlanCode 控件。
/// txtContractName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtActionPlanCode;
protected global::FineUIPro.TextBox txtContractName;
/// <summary>
/// btnQuery 控件。
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.PHTGL.Filing
/// </remarks>
protected global::FineUIPro.Button btnRset;
/// <summary>
/// btnPrinter 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrinter;
/// <summary>
/// lblPageIndex 控件。
/// </summary>