gaofei/SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250908 焊接统计分析表

Browse Source
This commit is contained in:
毕文静
2025-09-08 11:30:40 +08:00
parent f6b2bdfb81
commit ced7b82085
17 changed files with 947 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ProjectData/WorkArea.aspx
+4
View File
@@ -64,6 +64,10 @@
SortField="SupervisorUnitName" FieldType="String" HeaderText="监理单位" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CompletionDate" DataField="CompletionDate"
SortField="CompletionDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="竣工日期" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="描述" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
SGGL/FineUIPro.Web/ProjectData/WorkArea.aspx.cs
+2 -2
View File
@@ -43,8 +43,8 @@ namespace FineUIPro.Web.ProjectData
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT WorkArea.ProjectId, WorkArea.WorkAreaId,WorkArea.WorkAreaCode,WorkArea.SystemId,WorkArea.WorkAreaName,WorkArea.UnitId,Unit.UnitName,WorkArea.SupervisorUnitId,SupervisorUnit.UnitName AS SupervisorUnitName,WorkArea.InstallationId,Installation.InstallationName,WorkArea.Remark"
+ @" FROM ProjectData_WorkArea AS WorkArea "
string strSql = @"SELECT WorkArea.ProjectId, WorkArea.WorkAreaId,WorkArea.WorkAreaCode,WorkArea.SystemId,WorkArea.WorkAreaName,WorkArea.UnitId,Unit.UnitName,WorkArea.SupervisorUnitId,SupervisorUnit.UnitName AS SupervisorUnitName,WorkArea.InstallationId,Installation.InstallationName,WorkArea.Remark,WorkArea.CompletionDate"
+ @" FROM ProjectData_WorkArea AS WorkArea "
+ @" LEFT JOIN Project_Installation AS Installation ON WorkArea.InstallationId=Installation.InstallationId "
+ @" LEFT JOIN Base_Unit AS Unit ON WorkArea.UnitId=Unit.UnitId"
+ @" LEFT JOIN Base_Unit AS SupervisorUnit ON WorkArea.SupervisorUnitId=SupervisorUnit.UnitId WHERE 1=1 ";
SGGL/FineUIPro.Web/ProjectData/WorkAreaEdit.aspx
+49 -44
View File
@@ -8,51 +8,56 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtWorkAreaCode" Label="编号" ShowRedStar="true" Required="true"
runat="server" FocusOnPageLoad="true">
</f:TextBox>
<f:TextBox ID="txtWorkAreaName" Label="名称" ShowRedStar="true" Required="true"
runat="server" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpUnit" Label="所属单位" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpInstallation" Label="装置" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpSupervisorUnit" Label="监理单位" runat="server" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtRemark" Label="描述" runat="server" >
</f:TextBox>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
OnClick="btnSave_Click" >
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtWorkAreaCode" Label="编号" ShowRedStar="true" Required="true"
runat="server" FocusOnPageLoad="true">
</f:TextBox>
<f:TextBox ID="txtWorkAreaName" Label="名称" ShowRedStar="true" Required="true"
runat="server">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpUnit" Label="所属单位" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpInstallation" Label="装置" runat="server"
ShowRedStar="true" Required="true" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpSupervisorUnit" Label="监理单位" runat="server" EnableEdit="true">
</f:DropDownList>
<f:DatePicker ID="txtCompletionDate" runat="server" Label="竣工日期"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRemark" Label="描述" runat="server">
</f:TextBox>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</form>
<script type="text/javascript">
</script>
</script>
</body>
</html>
SGGL/FineUIPro.Web/ProjectData/WorkAreaEdit.aspx.cs
+2
View File
@@ -93,6 +93,7 @@
{
this.drpSupervisorUnit.SelectedValue = workArea.SupervisorUnitId;
}
this.txtCompletionDate.Text = workArea.CompletionDate.HasValue ? string.Format("{0:yyyy-MM-dd}", workArea.CompletionDate) : "";
}
}
#endregion
@@ -134,6 +135,7 @@
{
workArea.SupervisorUnitId = this.drpSupervisorUnit.SelectedValue;
}
workArea.CompletionDate = Funs.GetNewDateTime(this.txtCompletionDate.Text);
if (string.IsNullOrEmpty(this.WorkAreaId))
{
SGGL/FineUIPro.Web/ProjectData/WorkAreaEdit.aspx.designer.cs
Generated
+26 -15
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.common.ProjectSet {
public partial class WorkAreaEdit {
namespace FineUIPro.Web.common.ProjectSet
{
public partial class WorkAreaEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.common.ProjectSet {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.common.ProjectSet {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.common.ProjectSet {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtWorkAreaCode 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.common.ProjectSet {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkAreaCode;
/// <summary>
/// txtWorkAreaName 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.common.ProjectSet {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkAreaName;
/// <summary>
/// drpUnit 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.common.ProjectSet {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpInstallation 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.common.ProjectSet {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpInstallation;
/// <summary>
/// drpSupervisorUnit 控件。
/// </summary>
@@ -83,7 +85,16 @@ namespace FineUIPro.Web.common.ProjectSet {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSupervisorUnit;
/// <summary>
/// txtCompletionDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCompletionDate;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.common.ProjectSet {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.common.ProjectSet {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>