SVN r800

SVN-Revision: r800
2025-06-27 07:45:08 +00:00
parent db2ad34557
commit 39a388b0f4
7 changed files with 386 additions and 4 deletions
@@ -2177,6 +2177,15 @@ namespace Lskj.Control.Model
                            }
                            else
                            {
+                                if (model != null && isDirectImport && (model.FieldType == ControlType.LabDate ||
+                                       model.FieldType == ControlType.LabDateTime ||
+                                       model.FieldType == ControlType.LabDateTimeShort ||
+                                       model.FieldType == ControlType.LabTime ||
+                                       model.FieldType == ControlType.LabShortTime)&& (cell == null || cell.CellType == CellType.Blank||string.IsNullOrWhiteSpace(cell+"")))
+                                {
+                                    //日期框如果值是空，就直接跳过。赋空值（""）会报错
+                                    continue;
+                                }
                                if (cell.CellType == CellType.Numeric)
                                {