提交代码

2025-05-24 14:49:05 +08:00
parent debd6973a7
commit 3867399b7e
10 changed files with 165 additions and 25 deletions
@@ -373,8 +373,14 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
            {
                usingPlan.TeamGroupId = this.drpTeamGroup.SelectedValue;
            }
-
-            usingPlan.CancelDate = Funs.GetNewDateTime(this.txtCancelDate.Text.Trim());
+            if (!string.IsNullOrEmpty(this.txtCancelDate.Text.Trim()))
+            {
+                usingPlan.CancelDate = DateTime.Now;
+            }
+            else
+            {
+                usingPlan.CancelDate = null;
+            }
            usingPlan.IsCancel = Convert.ToBoolean(this.rblIsCancel.SelectedValue);
            usingPlan.CancelResult = this.txtCancelResult.Text.Trim();
            usingPlan.IsSubmit = isSubmit;