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

feat: 完善材料管理与焊接业务功能

Browse Source
This commit is contained in:
李鹏飞
2026-08-06 15:33:11 +08:00
parent e418b60fdb
commit 1de898812e
49 changed files with 2566 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+21 -5
View File
@@ -90,7 +90,11 @@
EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
</f:Button>
<f:Button ID="btnStatisticsMat" ToolTip="匹配材料" Icon="TabGo" runat="server" OnClick="btnStatisticsMat_Click" Hidden="true">
</f:Button>
</f:Button>
<f:Button ID="btnExportPartialComponents" Text="导出部分已焊组件" ToolTip="按当前区域导出所选单位工程的部分已焊组件"
Icon="TableGo" runat="server" OnClick="btnExportPartialComponents_Click" EnableAjax="false"
DisableControlBeforePostBack="true" EnablePostBack="true">
</f:Button>
</Items>
</f:Toolbar>
@@ -163,7 +167,7 @@
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="材料匹配"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId" ForceFit="true"
EnableColumnLines="true" DataIDField="PipelineId" AllowSorting="true"
EnableColumnLines="true" DataIDField="PipelineId" AllowSorting="true" EnableTextSelection="true"
SortField="MatchRate" SortDirection="DESC" EnableCheckBoxSelect="true">
<Columns>
<f:RenderField Width="150px" ColumnID="UnitWorkName" DataField="UnitWorkName" SortField="UnitWorkName"
@@ -189,7 +193,7 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="材料匹配明细" EnableRowClickEvent="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="Id,PipelineId,PrefabricatedComponents,WeldJointId" ForceFit="true"
EnableColumnLines="true" DataIDField="Id" AllowSorting="true" FixedRowHeight="true" RowHeight="46"
EnableColumnLines="true" DataIDField="Id" AllowSorting="true" FixedRowHeight="true" RowHeight="46" EnableTextSelection="true"
SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" EnableSummary="true" SummaryPosition="Bottom" >
<Columns>
<f:RenderField Width="200px" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
@@ -200,6 +204,10 @@
FieldType="String" HeaderText="预制组件号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="ComponentMatchRateString" DataField="ComponentMatchRateString" SortField="ComponentMatchRate"
FieldType="String" HeaderText="组件匹配率" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WeldJointCode" DataField="WeldJointCode" SortField="WeldJointCode"
FieldType="String" HeaderText="焊口号" HeaderTextAlign="Center"
TextAlign="Left">
@@ -236,9 +244,10 @@
FieldType="String" HeaderText="匹配率" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="dataload" Handler="onMaterialDetailDataLoad" />
</Listeners>
</f:Grid>
</Items>
</f:Panel>
@@ -262,6 +271,13 @@
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
function onMaterialDetailDataLoad(event) {
// 逐级依赖管线和组件合并，避免同名组件跨管线或相同匹配率跨组件合并。
this.mergeColumns(['PipelineCode', 'PrefabricatedComponents', 'ComponentMatchRateString'], {
depends: true
});
}
</script>
</body>
</html>