风险分级管控清单改为文档式;安全防护验收新增检查人/检查时间并修复默认当前账号;实体重生成并移除旁路Code文件

- 风险分级管控清单(RiskControlList)由『一风险点一记录』明细结构改为文档式:工程名称(手输)/项目(绑定当前项目)/编制人/编制日期/附件/备注;新增 ProjectName/CompileMan/CompileDate 列(CREATE TABLE 脚本 2026-08-27-001);BLL 映射、编辑页/列表页、菜单(CQMS)同步
- 安全防护验收(SafetyAcceptanceEdit)加入 检查人/检查时间,检查人默认当前登录账号并兜底不显示问题
- 重新生成 Model.cs(含 HSSE_RiskControlList 新列与 HSSE_SafetyPatrol.Code),删除已由实体内置的旁路 HSSE_SafetyPatrol.Code.cs 及其 csproj 引用
This commit is contained in:
2026-08-27 15:54:05 +08:00
parent 192824ea90
commit 8b13fc67ab
17 changed files with 452 additions and 124 deletions
@@ -17,25 +17,17 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="风险分级管控清单" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="RiskId"
DataIDField="RiskId" AllowSorting="true"
SortField="RiskName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
SortField="ProjectName" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
OnRowCommand="Grid1_RowCommand" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="风险点" ID="txtRiskName" EmptyText="输入查询条件"
<f:TextBox runat="server" Label="工程名称" ID="txtProjectName" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="220px" LabelAlign="right"
LabelWidth="80px">
</f:TextBox>
<f:DropDownList ID="ddlRiskLevel" runat="server" Label="等级" LabelAlign="right" LabelWidth="50px"
Width="140px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:ListItem Text="全部" Value="" />
<f:ListItem Text="重大" Value="重大" />
<f:ListItem Text="较大" Value="较大" />
<f:ListItem Text="一般" Value="一般" />
<f:ListItem Text="低" Value="低" />
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server" OnClick="btnNew_Click">
@@ -50,33 +42,25 @@
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="RiskName" DataField="RiskName"
SortField="RiskName" FieldType="String" HeaderText="风险点" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="RiskLevel" DataField="RiskLevel"
SortField="RiskLevel" FieldType="String" HeaderText="风险等级" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RiskType" DataField="RiskType"
SortField="RiskType" FieldType="String" HeaderText="风险类别" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="260px" ColumnID="ControlMeasure" DataField="ControlMeasure"
SortField="ControlMeasure" FieldType="String" HeaderText="管控措施" HeaderTextAlign="Center"
<f:RenderField Width="260px" ColumnID="ProjectName" DataField="ProjectName"
SortField="ProjectName" FieldType="String" HeaderText="工程名称" HeaderTextAlign="Center"
TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="ManagerUnit" DataField="ManagerUnit"
SortField="ManagerUnit" FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center"
TextAlign="Left">
<f:RenderField Width="100px" ColumnID="CompileMan" DataField="CompileMan"
SortField="CompileMan" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="ManagerMan" DataField="ManagerMan"
SortField="ManagerMan" FieldType="String" HeaderText="责任人" HeaderTextAlign="Center"
<f:RenderField Width="120px" ColumnID="CompileDate" DataField="CompileDate"
SortField="CompileDate" FieldType="Date" Renderer="Date" HeaderText="编制日期" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:LinkButtonField Width="80px" ColumnID="UploadFile" CommandName="attchUrl"
HeaderText="附件" HeaderTextAlign="Center" TextAlign="Center" Text="附件">
</f:LinkButtonField>
<f:RenderField Width="200px" ColumnID="Remark" DataField="Remark"
SortField="Remark" FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />