lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20210708

Browse Source
This commit is contained in:
杨红卫
2021-07-08 20:34:29 +08:00
parent 7f785d6423
commit e092c6cfb0
24 changed files with 5142 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
+1 -1
View File
@@ -119,7 +119,7 @@
</f:Panel>
<f:Window ID="Window1" Title="项目" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true"
Width="900px" Height="500px">
Width="900px" Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnEnter" EnablePostBack="true" runat="server" Icon="Outline" Text="进入项目"
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
+8 -3
View File
@@ -77,13 +77,18 @@
<Items>
<f:DropDownList ID="drpDriveManager" runat="server" Label="开车经理" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" LabelWidth="150px" MaxLength="500" ></f:TextBox>
<f:DropDownList ID="drpUnit" Label="所属单位" runat="server" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" LabelWidth="150px" MaxLength="500" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpUnit" Label="所属单位" runat="server" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtJTProjectCode" runat="server" Label="集团项目号" MaxLength="50" LabelWidth="150px"></f:TextBox>
<f:CheckBox runat="server" ID="ckbIsForeign" Label="海外项目" LabelWidth="150px"></f:CheckBox>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
+6 -1
View File
@@ -63,6 +63,7 @@ namespace FineUIPro.Web.ProjectData
if (project != null)
{
this.txtProjectCode.Text = project.ProjectCode;
this.txtJTProjectCode.Text = project.JTProjectCode;
this.txtProjectName.Text = project.ProjectName;
this.txtProjectAddress.Text = project.ProjectAddress;
this.txtWorkRange.Text = project.WorkRange;
@@ -184,6 +185,7 @@ namespace FineUIPro.Web.ProjectData
Base_Project project = new Base_Project
{
ProjectCode = this.txtProjectCode.Text.Trim(),
JTProjectCode = this.txtJTProjectCode.Text.Trim(),
ProjectName = Regex.Replace(this.txtProjectName.Text, @"\s", ""),
ProjectAddress = this.txtProjectAddress.Text.Trim(),
WorkRange = this.txtWorkRange.Text.Trim(),
@@ -200,7 +202,10 @@ namespace FineUIPro.Web.ProjectData
EnglishRemark = this.txtEnglishRemark.Text.Trim(),
Progress = Funs.GetNewDecimal(this.txtProgress.Text),
};
if (string.IsNullOrEmpty(project.JTProjectCode))
{
project.JTProjectCode = project.ProjectCode;
}
//Country = this.txtCountry.Text.Trim(),
/// Province = this.drpProvince.SelectedValue,
if (this.drpCountry.SelectedValue != Const._Null)
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs
Generated
+11 -2
View File
@@ -174,6 +174,15 @@ namespace FineUIPro.Web.ProjectData {
/// </remarks>
protected global::FineUIPro.DropDownList drpDriveManager;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// txtProjectAddress 控件。
/// </summary>
@@ -184,13 +193,13 @@ namespace FineUIPro.Web.ProjectData {
protected global::FineUIPro.TextBox txtProjectAddress;
/// <summary>
/// drpUnit 控件。
/// txtJTProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
protected global::FineUIPro.TextBox txtJTProjectCode;
/// <summary>
/// ckbIsForeign 控件。
SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx
+17 -12
View File
@@ -20,45 +20,50 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectCode" runat="server" Label="项目号" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox ID="txtShortName" runat="server" Label="简称" Readonly="true" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtShortName" runat="server" Label="简称" Readonly="true" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="50% 25% 25%">
<Items>
<f:TextBox ID="txtProjectType" runat="server" Label="项目类型" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox ID="txtProjectState" runat="server" Label="项目状态" Readonly="true" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtProjectState2" runat="server" Label="细分状态" Readonly="true" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtProjectState" runat="server" Label="项目状态" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox ID="txtProjectState2" runat="server" Label="细分状态" Readonly="true" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="开工日期" ID="txtStartDate" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox runat="server" Label="竣工日期" ID="txtEndDate" Readonly="true" LabelWidth="140px"></f:TextBox>
<f:TextBox runat="server" Label="竣工日期" ID="txtEndDate" Readonly="true" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtDuration" Label="项目建设工期(月)" LabelWidth="150px" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtProjectManager" runat="server" Label="项目经理" Readonly="true" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtProjectManager" runat="server" Label="项目经理" Readonly="true" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtConstructionManager" runat="server" Label="施工经理" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox ID="txtHSSEManager" runat="server" Label="安全经理" Readonly="true" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtHSSEManager" runat="server" Label="安全经理" Readonly="true" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtQAManager" runat="server" Label="质量经理" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox ID="txtDriveManager" runat="server" Label="开车经理" Readonly="true" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtDriveManager" runat="server" Label="开车经理" Readonly="true" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" Readonly="true" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox ID="txtUnitName" runat="server" Label="所属单位" Readonly="true" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtJTProjectCode" runat="server" Label="集团项目号" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox ID="txtUnitName" runat="server" Label="所属单位" Readonly="true" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
@@ -74,19 +79,19 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtProjectMoney" Label="合同额(万元)" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtConstructionMoney" Label="施工合同额(万元)" LabelWidth="140px" Readonly="true"></f:TextBox>
<f:TextBox runat="server" ID="txtConstructionMoney" Label="施工合同额(万元)" LabelWidth="150px" Readonly="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtTelephone" Label="项目部电话" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtCountry" Label="国家" LabelWidth="140px" Readonly="true"></f:TextBox>
<f:TextBox runat="server" ID="txtCountry" Label="国家" LabelWidth="150px" Readonly="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtProvince" Label="省份" Readonly="true" LabelWidth="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtCity" Label="城市" LabelWidth="140px" Readonly="true"></f:TextBox>
<f:TextBox runat="server" ID="txtCity" Label="城市" LabelWidth="150px" Readonly="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs
+1
View File
@@ -43,6 +43,7 @@ namespace FineUIPro.Web.ProjectData
if (project != null)
{
this.txtProjectCode.Text = project.ProjectCode;
this.txtJTProjectCode.Text = project.JTProjectCode;
this.txtProjectName.Text = project.ProjectName;
this.txtProjectAddress.Text = project.ProjectAddress;
this.txtRemark.Text = project.Remark;
SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs
Generated
+9
View File
@@ -174,6 +174,15 @@ namespace FineUIPro.Web.ProjectData {
/// </remarks>
protected global::FineUIPro.TextBox txtProjectAddress;
/// <summary>
/// txtJTProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJTProjectCode;
/// <summary>
/// txtUnitName 控件。
/// </summary>