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

2023-10-25

Browse Source
This commit is contained in:
李鹏飞
2023-10-25 19:46:20 +08:00
parent fa939f60d3 c7b76c0062
commit 1580bbcbf7
35 changed files with 616 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx
+3 -3
View File
@@ -107,7 +107,7 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject" EnableColumnEdit="False"
FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
</Editor>
@@ -141,13 +141,13 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
FieldType="String" HeaderText="全费用固定综合单价" TextAlign="Left" HeaderTextAlign="Center" EnableColumnEdit="False">
FieldType="String" HeaderText="全费用固定综合单价(元)" TextAlign="Left" HeaderTextAlign="Center" EnableColumnEdit="False">
<Editor>
<f:TextBox ID="TextBox12" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost" EnableColumnEdit="False"
FieldType="String" HeaderText="主材费" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="其中:主材费(元)" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox13" runat="server" Required="true"></f:TextBox>
</Editor>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
+1 -1
View File
@@ -111,7 +111,7 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject"
FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
</Editor>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx
+2 -2
View File
@@ -105,7 +105,7 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject" EnableColumnEdit="False"
FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
</Editor>
@@ -132,7 +132,7 @@
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ControlItemAndCycleCode" DataField="ControlItemAndCycleCode" SortField="ControlItemAndCycleCode"
<f:RenderField Width="150px" ColumnID="WBSCode" DataField="WBSCode" SortField="WBSCode"
FieldType="String" HeaderText="WBS编号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="ControlItemContent" DataField="ControlItemContent" SortField="ControlItemContent"
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs
+5 -5
View File
@@ -60,7 +60,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
MatchWbsId= y.Id ,
y.ContractTrackId,
y.ControlItemAndCycleId,
z.ControlItemAndCycleCode,
z.WBSCode,
z.ControlItemContent,
z.Weights,
y.WorkPackageEstimate,
@@ -176,8 +176,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
object[] ID = Grid1.DataKeys[Grid1.SelectedRowIndex];
var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID[0].ToString());
string ID = Grid1.SelectedRow.DataKeys[0].ToString();
var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID);
if (model != null) ///已上报时不能删除
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - ")));
@@ -215,8 +215,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
object[] ID = Grid1.DataKeys[Grid1.SelectedRowIndex];
var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID[0].ToString());
string ID = Grid1.SelectedRow.DataKeys[0].ToString();
var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID);
if (model != null) ///已上报时不能删除
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - ")));