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

修改试车管理

Browse Source
This commit is contained in:
高飞
2023-06-27 10:14:53 +08:00
parent f1c55719b3
commit 291d71f92c
34 changed files with 7375 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs
+15 -11
View File
@@ -105,22 +105,26 @@ namespace FineUIPro.Web.Comprehensive
DataRowView row = e.DataItem as DataRowView;
string IsVerification = row["IsVerification"].ToString();
string NextTestDate = row["NextTestDate"].ToString();
if (IsVerification=="是" && !string.IsNullOrEmpty(NextTestDate)) //在校验期内
string InspectionType= row["InspectionType"].ToString();
if (InspectionType == "计量")
{
if (DateTime.Compare(DateTime.Parse(NextTestDate).AddDays(-15), DateTime.Now) < 0)
if (IsVerification == "是" && !string.IsNullOrEmpty(NextTestDate)) //在校验期内
{
// Grid1.Rows[e.RowIndex].RowCssClass = "Red";
//过期为红色
e.RowCssClass = "Red";
if (DateTime.Compare(DateTime.Parse(NextTestDate).AddDays(-15), DateTime.Now) < 0)
{
// Grid1.Rows[e.RowIndex].RowCssClass = "Red";
//过期为红色
e.RowCssClass = "Red";
}
}
else
{
e.RowCssClass = "Yellow";
}
}
else
{
e.RowCssClass = "Yellow";
}
}
#region 查询
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
+8 -8
View File
@@ -215,14 +215,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
Alert.ShowInTop("请选择报验单位！", MessageBoxIcon.Warning);
return;
}
if (this.drpPostId.SelectedText == "焊工")
{
if (string.IsNullOrEmpty(txtWelderCode.Text.Trim()))
{
Alert.ShowInTop("焊工编号必填！", MessageBoxIcon.Warning);
return;
}
}
//if (this.drpPostId.SelectedText == "焊工")
//{
//if (string.IsNullOrEmpty(txtWelderCode.Text.Trim()))
//{
// Alert.ShowInTop("焊工编号必填！", MessageBoxIcon.Warning);
// return;
//}
//}
// 焊工部分
Model.BS_Welder welder = new Model.BS_Welder();
if (this.drpUnitId.SelectedValue != BLL.Const._Null)