xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:升级

Browse Source
This commit is contained in:
geh
2025-06-19 19:23:01 +08:00
parent 0cb37e2c02
commit 7aa8baadbb
111 changed files with 14465 additions and 1480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/FineUIPro.Web/CQMS/WBS/ControlPoint.aspx.cs
+6 -2
View File
@@ -949,11 +949,15 @@ namespace FineUIPro.Web.CQMS.WBS
}
else if (CheckAcceptType.ToString() == "4")
{
name = "单位工程一次验收";
name = "单位工程验收";
}
else if (CheckAcceptType.ToString() == "5")
{
name = "材料进场复验";
name = "分部工程验收";
}
else if (CheckAcceptType.ToString() == "6")
{
name = "分项工程验收";
}
}
return name;
SUBQHSE/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx
+6 -5
View File
@@ -46,11 +46,12 @@
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCheckAcceptType" Label="验收类型" LabelWidth="180px">
<f:ListItem Value="1" Text="关键工序验收" />
<f:ListItem Value="2" Text="特殊过程验收" />
<f:ListItem Value="3" Text="隐蔽工程验收" />
<f:ListItem Value="4" Text="单位工程一次验收" />
<f:ListItem Value="5" Text="材料进场复验" />
<f:ListItem Value="1" Text="关键工序验收"/>
<f:ListItem Value="2" Text="特殊过程验收"/>
<f:ListItem Value="3" Text="隐蔽工程验收"/>
<f:ListItem Value="4" Text="单位工程验收"/>
<f:ListItem Value="5" Text="分部工程验收"/>
<f:ListItem Value="6" Text="分项工程验收"/>
</f:DropDownList>
</Items>
</f:FormRow>
SUBQHSE/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs
Generated
+111 -109
View File
@@ -1,239 +1,241 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
// <auto-generated>
// This code was generated by a tool.
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.WBS {
public partial class EditBreakdown {
namespace FineUIPro.Web.CQMS.WBS
{
public partial class EditBreakdown
{
/// <summary>
/// form1 控件。
/// form1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// PageManager1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// SimpleForm1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtBreakdownCode 控件。
/// txtBreakdownCode control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox txtBreakdownCode;
/// <summary>
/// txtBreakdownName 控件。
/// txtBreakdownName control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox txtBreakdownName;
/// <summary>
/// txtBasis 控件。
/// txtBasis control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextArea txtBasis;
/// <summary>
/// txtCheckPoints 控件。
/// txtCheckPoints control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextArea txtCheckPoints;
/// <summary>
/// txtRecordAndCode 控件。
/// txtRecordAndCode control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextArea txtRecordAndCode;
/// <summary>
/// txtClass 控件。
/// txtClass control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox txtClass;
/// <summary>
/// drpCheckAcceptType 控件。
/// drpCheckAcceptType control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckAcceptType;
/// <summary>
/// tr1 控件。
/// tr1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.FormRow tr1;
/// <summary>
/// FenBao 控件。
/// FenBao control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox FenBao;
/// <summary>
/// tr2 控件。
/// tr2 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.FormRow tr2;
/// <summary>
/// WuHuan 控件。
/// WuHuan control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox WuHuan;
/// <summary>
/// tr3 控件。
/// tr3 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.FormRow tr3;
/// <summary>
/// JianLi 控件。
/// JianLi control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox JianLi;
/// <summary>
/// tr4 控件。
/// tr4 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.FormRow tr4;
/// <summary>
/// YeZhu 控件。
/// YeZhu control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox YeZhu;
/// <summary>
/// txtSortIndex 控件。
/// txtSortIndex control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.NumberBox txtSortIndex;
/// <summary>
/// txtRemark 控件。
/// txtRemark control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// rblIsAcceptance 控件。
/// rblIsAcceptance control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsAcceptance;
/// <summary>
/// Toolbar1 控件。
/// Toolbar1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnAttachUrl 控件。
/// btnAttachUrl control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnSave 控件。
/// btnSave control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// WindowAtt 控件。
/// WindowAtt control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
}
SUBQHSE/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx
+6 -5
View File
@@ -46,11 +46,12 @@
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCheckAcceptType" Label="验收类型" LabelWidth="180px">
<f:ListItem Value="1" Text="关键工序验收" />
<f:ListItem Value="2" Text="特殊过程验收" />
<f:ListItem Value="3" Text="隐蔽工程验收" />
<f:ListItem Value="4" Text="单位工程一次验收" />
<f:ListItem Value="5" Text="材料进场复验" />
<f:ListItem Value="1" Text="关键工序验收"/>
<f:ListItem Value="2" Text="特殊过程验收"/>
<f:ListItem Value="3" Text="隐蔽工程验收"/>
<f:ListItem Value="4" Text="单位工程验收"/>
<f:ListItem Value="5" Text="分部工程验收"/>
<f:ListItem Value="6" Text="分项工程验收"/>
</f:DropDownList>
</Items>
</f:FormRow>
SUBQHSE/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs
Generated
+111 -109
View File
@@ -1,239 +1,241 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
// <auto-generated>
// This code was generated by a tool.
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.WBS {
public partial class EditBreakdownProject {
namespace FineUIPro.Web.CQMS.WBS
{
public partial class EditBreakdownProject
{
/// <summary>
/// form1 控件。
/// form1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// PageManager1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// SimpleForm1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtBreakdownCode 控件。
/// txtBreakdownCode control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox txtBreakdownCode;
/// <summary>
/// txtBreakdownName 控件。
/// txtBreakdownName control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox txtBreakdownName;
/// <summary>
/// txtBasis 控件。
/// txtBasis control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextArea txtBasis;
/// <summary>
/// txtCheckPoints 控件。
/// txtCheckPoints control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextArea txtCheckPoints;
/// <summary>
/// txtRecordAndCode 控件。
/// txtRecordAndCode control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextArea txtRecordAndCode;
/// <summary>
/// txtClass 控件。
/// txtClass control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox txtClass;
/// <summary>
/// drpCheckAcceptType 控件。
/// drpCheckAcceptType control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckAcceptType;
/// <summary>
/// tr1 控件。
/// tr1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.FormRow tr1;
/// <summary>
/// FenBao 控件。
/// FenBao control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox FenBao;
/// <summary>
/// tr2 控件。
/// tr2 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.FormRow tr2;
/// <summary>
/// WuHuan 控件。
/// WuHuan control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox WuHuan;
/// <summary>
/// tr3 控件。
/// tr3 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.FormRow tr3;
/// <summary>
/// JianLi 控件。
/// JianLi control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox JianLi;
/// <summary>
/// tr4 控件。
/// tr4 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.FormRow tr4;
/// <summary>
/// YeZhu 控件。
/// YeZhu control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextBox YeZhu;
/// <summary>
/// txtSortIndex 控件。
/// txtSortIndex control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.NumberBox txtSortIndex;
/// <summary>
/// txtRemark 控件。
/// txtRemark control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// rblIsAcceptance 控件。
/// rblIsAcceptance control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsAcceptance;
/// <summary>
/// Toolbar1 控件。
/// Toolbar1 control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnAttachUrl 控件。
/// btnAttachUrl control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// btnSave 控件。
/// btnSave control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// WindowAtt 控件。
/// WindowAtt control.
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
}
SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx
+45 -47
View File
@@ -1,12 +1,10 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectControlPoint.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.ProjectControlPoint" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>现场控制点裁剪</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style>
@@ -24,27 +22,27 @@
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
EnableCollapse="true" Width="380" Title="公司-项目" TitleToolTip="公司-项目" ShowBorder="true"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft" Layout="Fit">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true" AutoScroll="true"
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree" />
BodyPadding="0px">
<uc1:UnitProjectTControl ID="ucTree" runat="server" Onchange="changeTree"/>
</f:ContentPanel>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelLeftRegion2" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
RegionPercent="20%" Title="现场控制点裁剪" TitleToolTip="现场控制点裁剪" ShowBorder="true" ShowHeader="true"
BodyPadding="10px">
<f:Panel runat="server" ID="panelLeftRegion1" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
RegionPercent="20%" Title="现场控制点裁剪" TitleToolTip="现场控制点裁剪" ShowBorder="true" ShowHeader="true"
BodyPadding="10px">
<Items>
<f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true" OnNodeCheck="trWBS_NodeCheck" EnableCheckBox="true" OnlyLeafCheck="true"
OnNodeCommand="trWBS_NodeCommand" OnNodeExpand="trWBS_NodeExpand" AutoLeafIdentification="true"
runat="server">
OnNodeCommand="trWBS_NodeCommand" OnNodeExpand="trWBS_NodeExpand" AutoLeafIdentification="true"
runat="server">
<Listeners>
<f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
<f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu"/>
</Listeners>
</f:Tree>
<f:HiddenField runat="server" ID="hdSelectId">
@@ -54,81 +52,81 @@
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
<Items>
<f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="BreakdownProjectId" AllowSorting="true" EnableColumnLines="true"
SortField="BreakdownCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" EnableCheckBoxSelect="true" KeepCurrentSelection="true"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" ForceFit="true" OnRowCommand="Grid1_RowCommand"
ShowSelectedCell="true" DataIDField="BreakdownProjectId" AllowPaging="true" IsDatabasePaging="true"
PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange">
runat="server" BoxFlex="1" DataKeyNames="BreakdownProjectId" AllowSorting="true" EnableColumnLines="true"
SortField="BreakdownCode" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" EnableCheckBoxSelect="true" KeepCurrentSelection="true"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" ForceFit="true" OnRowCommand="Grid1_RowCommand"
ShowSelectedCell="true" DataIDField="BreakdownProjectId" AllowPaging="true" IsDatabasePaging="true"
PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange">
<Toolbars>
<f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Label runat="server" Width="380px" ID="lbHd"></f:Label>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Text="增加"
Hidden="true">
Hidden="true">
</f:Button>
<f:Button ID="btnSave" ToolTip="保存" Icon="SystemSave" runat="server" Text="保存" Hidden="true"
OnClick="btnSave_Click">
OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="70px" ColumnID="BreakdownCode" DataField="BreakdownCode" FieldType="String"
HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="BreakdownName" DataField="BreakdownName" FieldType="String"
HeaderText="质量控制点检查、检测项" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="质量控制点检查、检测项" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Basis" DataField="Basis" FieldType="String"
HeaderText="执行依据或规范" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="执行依据或规范" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CheckPoints" DataField="CheckPoints" FieldType="String"
HeaderText="质量检查要点" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="质量检查要点" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RecordAndCode" DataField="RecordAndCode" FieldType="String"
HeaderText="质量记录及格式文本号" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="质量记录及格式文本号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CheckPoints" DataField="CheckPoints" FieldType="String"
HeaderText="质量记录名称" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="质量记录名称" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RecordAndCode" DataField="RecordAndCode" FieldType="String"
HeaderText="记录格式文本号" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="记录格式文本号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px" TextAlign="Center" Icon="ArrowDown" CommandName="download" />
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="40px" TextAlign="Center" Icon="ArrowDown" CommandName="download"/>
<f:RenderField Width="40px" ColumnID="Class" DataField="Class" FieldType="String"
HeaderText="控制等级" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="控制等级" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="40px" ColumnID="FenBao" DataField="FenBao" FieldType="String" Hidden="true"
HeaderText="分包" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="分包" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="40px" ColumnID="WuHuan" DataField="WuHuan" FieldType="String" Hidden="true"
HeaderText="公司" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="公司" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="40px" ColumnID="JianLi" DataField="JianLi" FieldType="String" Hidden="true"
HeaderText="监理" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="监理" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="40px" ColumnID="YeZhu" DataField="YeZhu" FieldType="String" Hidden="true"
HeaderText="业主" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="业主" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="40px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="40px" ColumnID="ModelURL" DataField="ModelURL" FieldType="String" Hidden="true"
HeaderText="模板附件" HeaderTextAlign="Center" TextAlign="Center">
HeaderText="模板附件" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="CheckAcceptType" Width="100px" HeaderText="验收类型" HeaderTextAlign="Center"
TextAlign="Left">
TextAlign="Left">
<ItemTemplate>
<asp:Label ID="lbCheckAcceptType" runat="server" Text='<%# ConvertCheckAcceptType(Eval("CheckAcceptType")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu"/>
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
@@ -136,9 +134,9 @@
<f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="100" Value="100" />
<f:ListItem Text="500" Value="500" />
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="100" Value="100"/>
<f:ListItem Text="500" Value="500"/>
</f:DropDownList>
</PageItems>
</f:Grid>
@@ -158,7 +156,7 @@
Target="Self" EnableResize="false" runat="server" OnClose="Window3_Close" IsModal="true"
Width="1000px" Height="600px">
</f:Window>
<f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Windowtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
@@ -169,9 +167,9 @@
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" Hidden="true" Icon="Pencil"
runat="server" Text="修改">
</f:MenuButton>
<f:MenuButton ID="btnMenuCopy" OnClick="btnMenuCopy_Click" EnablePostBack="true" Hidden="true" Icon="DatabaseCopy"
runat="server" Text="拷贝">
</f:MenuButton>
<f:MenuButton ID="btnMenuCopy" OnClick="btnMenuCopy_Click" EnablePostBack="true" Hidden="true" Icon="DatabaseCopy"
runat="server" Text="拷贝" >
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true" Icon="Delete"
ConfirmText="确认删除选中项？" ConfirmTarget="Top" runat="server" Text="删除">
</f:MenuButton>
SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
+14 -21
View File
@@ -15,9 +15,8 @@ namespace FineUIPro.Web.CQMS.WBS
{
public partial class ProjectControlPoint : PageBase
{
#region 项目主键
/// <summary>
/// 项目主键
/// 主键
/// </summary>
public string ProjectId
{
@@ -30,7 +29,6 @@ namespace FineUIPro.Web.CQMS.WBS
ViewState["ProjectId"] = value;
}
}
#endregion
/// <summary>
/// 被选择项列表
/// </summary>
@@ -71,12 +69,13 @@ namespace FineUIPro.Web.CQMS.WBS
{
if (!IsPostBack)
{
this.SelectedList = new List<string>();
this.NoSelectedList = new List<string>();
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.ProjectId))
@@ -85,9 +84,6 @@ namespace FineUIPro.Web.CQMS.WBS
////权限按钮方法
this.GetButtonPower();
}
this.SelectedList = new List<string>();
this.NoSelectedList = new List<string>();
//GetButtonPower();
InitTreeMenu();
this.Grid1.Columns[2].Hidden = false;
this.Grid1.Columns[3].Hidden = true;
@@ -102,8 +98,7 @@ namespace FineUIPro.Web.CQMS.WBS
}
}
#endregion
#region 加载树
/// <summary>
/// 公司级树加载
/// </summary>
@@ -112,23 +107,21 @@ namespace FineUIPro.Web.CQMS.WBS
protected void changeTree(object sender, EventArgs e)
{
this.ProjectId = this.ucTree.ProjectId;
this.GetButtonPower();
if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
btnNew.Hidden = true;
btnSave.Hidden = true;
}
this.GetButtonPower();
this.InitTreeMenu();
}
#region 加载树
/// <summary>
/// 加载树
/// </summary>
private void InitTreeMenu()
{
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
this.trWBS.Nodes.Clear();
this.trWBS.ShowBorder = false;
this.trWBS.ShowHeader = false;
@@ -329,10 +322,6 @@ namespace FineUIPro.Web.CQMS.WBS
/// <param name="e"></param>
protected void trWBS_NodeCheck(object sender, FineUIPro.TreeCheckEventArgs e)
{
if (string.IsNullOrEmpty(this.ProjectId))
{
return;
}
if (BLL.CommonService.GetAllButtonPowerList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectControlPointMenuId, BLL.Const.BtnSave))
{
Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(e.NodeID);
@@ -1409,11 +1398,15 @@ namespace FineUIPro.Web.CQMS.WBS
}
else if (CheckAcceptType.ToString() == "4")
{
name = "单位工程一次验收";
name = "单位工程验收";
}
else if (CheckAcceptType.ToString() == "5")
{
name = "材料进场复验";
name = "分部工程验收";
}
else if (CheckAcceptType.ToString() == "6")
{
name = "分项工程验收";
}
}
return name;
SUBQHSE/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.designer.cs
Generated
+2 -2
View File
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.CQMS.WBS
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
/// <summary>
/// panelLeftRegion2 控件。
/// panelLeftRegion1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion2;
protected global::FineUIPro.Panel panelLeftRegion1;
/// <summary>
/// trWBS 控件。