1、单位数据清理合并功能;

2、单位新增编辑功能调整,补充英文名称等;
3、建筑企业单位资质字典;
This commit is contained in:
2025-09-02 10:48:28 +08:00
parent ce304ec7d9
commit 6ccc14a8be
54 changed files with 3964 additions and 2471 deletions
@@ -5,6 +5,13 @@
<head runat="server">
<title>单位清理合并</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.customlabel span {
margin-left: 140px;
color: red;
font-weight: bold;
}
</style>
</head>
<body>
<form id="form1" runat="server">
@@ -14,18 +21,7 @@
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpUnitId" runat="server" Label="合并后单位" EnableEdit="true" ForceSelection="false" Required="true" ShowRedStar="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpMergeUnitId" runat="server" Label="需要合并的单位" EnableEdit="true" ForceSelection="false" Required="true" ShowRedStar="true">
</f:DropDownList>
</Items>
<%--<Items>
<f:DropDownBox runat="server" ID="drpMergeUnitBox" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Label="需要合并的单位" EmptyText="请从下拉表格中选择需要合并的单位" DataControlID="Grid2"
<f:DropDownBox runat="server" ID="drpUnitBox" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Label="合并后单位" EmptyText="请从下拉表格中选择合并后的单位" DataControlID="Grid1"
EnableMultiSelect="false" MatchFieldWidth="false" Required="true" ShowRedStar="true">
<PopPanel>
<f:Panel ID="Panel1" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
@@ -35,18 +31,62 @@
<Rows>
<f:FormRow>
<Items>
<f:TwinTriggerBox Width="200px" runat="server" EmptyText="按单位代码、名称查找" ShowLabel="false" ID="ttbPmpProCodeSearch"
ShowTrigger1="false" OnTrigger1Click="ttbPmpProCodeSearch_Trigger1Click" OnTrigger2Click="ttbPmpProCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search">
<f:TwinTriggerBox Width="200px" runat="server" EmptyText="按单位代码、名称查找" ShowLabel="false" ID="ttbUnitNameCodeSearch"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" ShowTrigger1="false" OnTrigger1Click="ttbUnitNameCodeSearch_Trigger1Click" OnTrigger2Click="ttbUnitNameCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="Grid2" BoxFlex="1" DataKeyNames="Name"
DataIDField="Name" DataTextField="Name" EnableMultiSelect="false"
<f:Grid ID="Grid1" BoxFlex="1" DataKeyNames="UnitId"
DataIDField="UnitId" DataTextField="UnitName" EnableMultiSelect="false"
PageSize="50" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="Grid1_PageIndexChange" runat="server" EnableCheckBoxSelect="true"
AllowSorting="false" SortField="UnitName" SortDirection="ASC"
OnSort="Grid1_Sort">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="true">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:BoundField ExpandUnusedSpace="true" Width="120px" DataField="UnitCode" HeaderText="单位代码" />
<f:BoundField ExpandUnusedSpace="true" Width="280px" DataField="UnitName" HeaderText="单位名称" />
<f:BoundField ExpandUnusedSpace="true" Width="180px" DataField="ShortUnitName" HeaderText="单位简称" />
<f:BoundField ExpandUnusedSpace="true" Width="120px" DataField="UnitTypeName" HeaderText="类型" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
</PopPanel>
</f:DropDownBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpMergeUnitBox" Label="需要合并的单位" EmptyText="请从下拉表格中选择需要合并的单位" DataControlID="Grid2"
EnableMultiSelect="true" MatchFieldWidth="false" Required="true" ShowRedStar="true">
<PopPanel>
<f:Panel ID="Panel2" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Form ID="Form3" ShowBorder="False" ShowHeader="False" runat="server">
<Rows>
<f:FormRow>
<Items>
<f:TwinTriggerBox Width="200px" runat="server" EmptyText="按单位编码、名称查找" ShowLabel="false" ID="ttbMergeUnitNameCodeSearch"
AutoPostBack="true" OnTextChanged="MergeTextBox_TextChanged" ShowTrigger1="false" OnTrigger1Click="ttbMergeUnitNameCodeSearch_Trigger1Click" OnTrigger2Click="ttbMergeUnitNameCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="Grid2" BoxFlex="1" DataKeyNames="UnitId"
DataIDField="UnitId" DataTextField="UnitName" EnableMultiSelect="true"
PageSize="50" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="Grid2_PageIndexChange" runat="server" EnableCheckBoxSelect="true"
AllowSorting="false" SortField="StNum" SortDirection="DESC"
AllowSorting="false" SortField="UnitName" SortDirection="ASC"
OnSort="Grid2_Sort">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
@@ -55,16 +95,17 @@
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:BoundField Width="80px" DataField="StNum" HeaderText="项目编号" />
<f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Name" HeaderText="项目名称" />
<f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Address" HeaderText="地址" />
<f:BoundField ExpandUnusedSpace="true" Width="120px" DataField="UnitCode" HeaderText="单位编码" />
<f:BoundField ExpandUnusedSpace="true" Width="280px" DataField="UnitName" HeaderText="单位名称" />
<f:BoundField ExpandUnusedSpace="true" Width="180px" DataField="ShortUnitName" HeaderText="单位简称" />
<f:BoundField ExpandUnusedSpace="true" Width="120px" DataField="UnitTypeName" HeaderText="类型" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
</PopPanel>
</f:DropDownBox>
</Items>--%>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
@@ -74,7 +115,22 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label4" runat="server" Text="请谨慎操作,合并后数据无法恢复!!!"></f:Label>
<f:Label ID="Label2" runat="server" Text="注:" CssClass="customlabel"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label3" runat="server" Text="1、请谨慎操作,合并后数据无法恢复;" CssClass="customlabel"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label4" runat="server" Text="2、建议在系统使用低峰时期合并项目单位数据;" CssClass="customlabel"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="Label5" runat="server" Text="3、数据合并过程缓慢,请勿关闭此界面,请耐心等待。" CssClass="customlabel"></f:Label>
</Items>
</f:FormRow>
</Rows>