This commit is contained in:
parent
05fac8d6c4
commit
65d027e559
|
|
@ -212,10 +212,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl
|
||||||
errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "计划试验日期", Reason = "不是日期格式!" });
|
errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "计划试验日期", Reason = "不是日期格式!" });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
//else
|
||||||
{
|
//{
|
||||||
errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "计划试验日期", Reason = "此项为必填项!" });
|
// errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "计划试验日期", Reason = "此项为必填项!" });
|
||||||
}
|
//}
|
||||||
if (!string.IsNullOrWhiteSpace(completedDate))
|
if (!string.IsNullOrWhiteSpace(completedDate))
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|
@ -227,10 +227,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl
|
||||||
errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "试验完成日期", Reason = "不是日期格式!" });
|
errorInfos.Add(new ErrorInfo { Row = (i+2).ToString(), Column = "试验完成日期", Reason = "不是日期格式!" });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
//else
|
||||||
{
|
//{
|
||||||
errorInfos.Add(new ErrorInfo { Row = i.ToString(), Column = "试验完成日期", Reason = "此项为必填项!" });
|
// errorInfos.Add(new ErrorInfo { Row = i.ToString(), Column = "试验完成日期", Reason = "此项为必填项!" });
|
||||||
}
|
//}
|
||||||
if (!string.IsNullOrWhiteSpace(completedState))
|
if (!string.IsNullOrWhiteSpace(completedState))
|
||||||
{
|
{
|
||||||
if (completedState != "已完成" && completedState != "未完成")
|
if (completedState != "已完成" && completedState != "未完成")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue