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

事故警示调整

Browse Source
This commit is contained in:
夏菊
2025-12-23 09:58:51 +08:00
parent 81291b03f7
commit 19c093122b
10 changed files with 127 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Accident/AccidentWarning.aspx
+12 -4
View File
@@ -21,8 +21,8 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" Label="查询条件" ID="txtSearch" EmptyText="输入事故编号、标题、地点"
Width="360px" LabelWidth="100px" LabelAlign="right">
<f:TextBox runat="server" Label="查询条件" ID="txtSearch" EmptyText="输入事故编号、标题、类型、地点、来源"
Width="420px" LabelWidth="100px" LabelAlign="right">
</f:TextBox>
<f:DatePicker runat="server" Label="事故日期" ID="txtAccidentDateStart" LabelAlign="Right"
LabelWidth="100px" Width="220px">
@@ -55,15 +55,19 @@
SortField="Code" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="Title" DataField="Title"
<f:RenderField Width="200px" ColumnID="Title" DataField="Title"
FieldType="String" HeaderText="事故标题" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="Type" DataField="Type"
SortField="Type" FieldType="String" HeaderText="事故类型" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="AccidentDate" DataField="AccidentDate"
SortField="AccidentDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="事故日期" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="220px" ColumnID="Address" DataField="Address"
<f:RenderField Width="200px" ColumnID="Address" DataField="Address"
SortField="Address" FieldType="String" HeaderText="事故地点" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
@@ -71,6 +75,10 @@
FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="Source" DataField="Source"
FieldType="String" HeaderText="来源" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="CompileManName" DataField="CompileManName"
SortField="CompileManName" FieldType="String" HeaderText="编制人" HeaderTextAlign="Center"
TextAlign="Left">
SGGL/FineUIPro.Web/Accident/AccidentWarning.aspx.cs
+6 -1
View File
@@ -64,9 +64,14 @@ namespace FineUIPro.Web.Accident
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtSearch.Text.Trim()))
{
sb.Append("and (Code like @txtSearch or Title like @txtSearch or Address like @txtSearch ) ");
sb.Append("and (Code like @txtSearch or Title like @txtSearch or Type like @txtSearch or Address like @txtSearch or Source like @txtSearch ) ");
listStr.Add(new SqlParameter("@txtSearch", "%" + this.txtSearch.Text.Trim() + "%"));
}
//if (!string.IsNullOrEmpty(this.txtType.Text.Trim()))
//{
// sb.Append("and (Type like @txtType ) ");
// listStr.Add(new SqlParameter("@txtType", "%" + this.txtType.Text.Trim() + "%"));
//}
if (!string.IsNullOrEmpty(this.txtAccidentDateStart.Text.Trim()))
{
sb.Append("and AccidentDate >= @AccidentDateStart ");
SGGL/FineUIPro.Web/Accident/AccidentWarningDataIn.aspx.cs
+18 -11
View File
@@ -177,27 +177,32 @@ namespace FineUIPro.Web.Accident
string row1 = pds.Rows[i][1].ToString();
if (string.IsNullOrEmpty(row1))
{
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "事故地点", Reason = "此项为必填项！" });
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "事故类型", Reason = "此项为必填项！" });
}
string row2 = pds.Rows[i][2].ToString();
if (!string.IsNullOrEmpty(row2))
if (string.IsNullOrEmpty(row2))
{
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "事故地点", Reason = "此项为必填项！" });
}
string row3 = pds.Rows[i][3].ToString();
if (!string.IsNullOrEmpty(row3))
{
try
{
DateTime date = Convert.ToDateTime(row2.Trim());
DateTime date = Convert.ToDateTime(row3.Trim());
}
catch (Exception)
{
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "事故日期", Reason = $"[{row2}]错误！" });
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "事故日期", Reason = $"[{row3}]错误！" });
}
}
else
{
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "事故日期", Reason = "此项为必填项！" });
}
if (!string.IsNullOrWhiteSpace(row0) && !string.IsNullOrWhiteSpace(row1) && !string.IsNullOrWhiteSpace(row2))
if (!string.IsNullOrWhiteSpace(row0) && !string.IsNullOrWhiteSpace(row1) && !string.IsNullOrWhiteSpace(row2) && !string.IsNullOrWhiteSpace(row3))
{
var acc = oldViewInfos.Where(x => x.Title == row0 && x.Address == row1 && x.AccidentDate == Convert.ToDateTime(row2.Trim()));
var acc = oldViewInfos.Where(x => x.Title == row0 && x.Address == row1 && x.Type == row2 && x.AccidentDate == Convert.ToDateTime(row2.Trim()));
if (acc.Any())
{
errorInfos.Add(new ErrorInfo { Row = (i + 2).ToString(), Column = "事故标题", Reason = "此项事故已存在！" });
@@ -322,13 +327,15 @@ namespace FineUIPro.Web.Accident
model.Id = SQLHelper.GetNewID(typeof(Model.Accident_Warning));
model.Code = BLL.SQLHelper.RunProcNewId("SpGetNewCode5", "Accident_Warning", "Code", $"SG-");
model.Title = pds.Rows[i][0].ToString().Trim();
model.Address = pds.Rows[i][1].ToString().Trim();
DateTime accDate = Convert.ToDateTime(pds.Rows[i][2].ToString().Trim());
model.Type = pds.Rows[i][1].ToString().Trim();
model.Address = pds.Rows[i][2].ToString().Trim();
DateTime accDate = Convert.ToDateTime(pds.Rows[i][3].ToString().Trim());
model.AccidentDate = accDate;
model.AccidentMonthDay = accDate.ToString("MM-dd");
model.ResponsibleUnit = pds.Rows[i][3].ToString().Trim();
model.Content = pds.Rows[i][4].ToString().Trim();
model.Remarks = pds.Rows[i][5].ToString().Trim();
model.ResponsibleUnit = pds.Rows[i][4].ToString().Trim();
model.Content = pds.Rows[i][5].ToString().Trim();
model.Source = pds.Rows[i][6].ToString().Trim();
model.Remarks = pds.Rows[i][7].ToString().Trim();
model.CompileMan = this.CurrUser.UserId;
model.CompileManName = this.CurrUser.UserName;
model.CreateTime = DateTime.Now;
SGGL/FineUIPro.Web/Accident/AccidentWarningEdit.aspx
+10 -4
View File
@@ -28,14 +28,20 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtAddress" runat="server" Label="事故地点" LabelAlign="Right" ShowRedStar="true" Required="true"
MaxLength="50">
<f:TextBox ID="txtType" runat="server" Label="事故类型" LabelAlign="Right" ShowRedStar="true" Required="true" MaxLength="50">
</f:TextBox>
<f:DatePicker ID="txtAccidentDate" runat="server" Label="事故日期" LabelAlign="Right" ShowRedStar="true" Required="true"
EnableEdit="true">
<f:DatePicker ID="txtAccidentDate" runat="server" Label="事故日期" LabelAlign="Right" ShowRedStar="true" Required="true" EnableEdit="true">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtAddress" runat="server" Label="事故地点" LabelAlign="Right" ShowRedStar="true" Required="true" MaxLength="50">
</f:TextBox>
<f:TextBox ID="txtSource" runat="server" Label="事故来源" LabelAlign="Right" MaxLength="50">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtResponsibleUnit" runat="server" Label="责任单位" LabelAlign="Right" MaxLength="50">
SGGL/FineUIPro.Web/Accident/AccidentWarningEdit.aspx.cs
+2
View File
@@ -92,7 +92,9 @@ namespace FineUIPro.Web.Accident
model.Code = this.txtCode.Text.Trim();
model.Title = this.txtTitle.Text.Trim();
model.Content = this.txtContent.Text.Trim();
model.Type = this.txtType.Text.Trim();
model.Address = this.txtAddress.Text.Trim();
model.Source = this.txtSource.Text.Trim();
model.ResponsibleUnit = this.txtResponsibleUnit.Text.Trim();
model.Remarks = this.txtRemarks.Text.Trim();
model.AccidentDate = Funs.GetNewDateTimeOrNow(this.txtAccidentDate.Text.Trim());
SGGL/FineUIPro.Web/Accident/AccidentWarningEdit.aspx.designer.cs
Generated
+20 -2
View File
@@ -60,13 +60,13 @@ namespace FineUIPro.Web.Accident
protected global::FineUIPro.TextBox txtTitle;
/// <summary>
/// txtAddress 控件。
/// txtType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAddress;
protected global::FineUIPro.TextBox txtType;
/// <summary>
/// txtAccidentDate 控件。
@@ -77,6 +77,24 @@ namespace FineUIPro.Web.Accident
/// </remarks>
protected global::FineUIPro.DatePicker txtAccidentDate;
/// <summary>
/// txtAddress 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAddress;
/// <summary>
/// txtSource 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSource;
/// <summary>
/// txtResponsibleUnit 控件。
/// </summary>
SGGL/FineUIPro.Web/File/Excel/DataIn/事故警示导入模板.xls
BIN
View File
Binary file not shown.