From 0d7a9e236f9055e45f05b9e0496ee8e588eb5c5d Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Mon, 23 Oct 2023 11:27:55 +0800
Subject: [PATCH] * Fix create testtask bug.

---
 module/testtask/control.php        |  2 +-
 module/testtask/js/common.ui.js    | 21 +++++++++++++++++----
 module/testtask/ui/create.html.php | 10 +++++-----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 6299bf83f0..0325c4c315 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -195,7 +195,7 @@ class testtask extends control
             if($formData->execution)
             {
                 $execution = $this->loadModel('execution')->fetchByID($formData->execution);
-                $formData->projectID = $execution->project;
+                $formData->project = $execution->project;
             }
 
             /* 创建测试单。*/
diff --git a/module/testtask/js/common.ui.js b/module/testtask/js/common.ui.js
index 948b0f6158..48cce3855f 100644
--- a/module/testtask/js/common.ui.js
+++ b/module/testtask/js/common.ui.js
@@ -75,13 +75,26 @@ function loadTestReports(productID)
  */
 function suitEndDate()
 {
-    beginDate = $('#begin').val();
+    beginDate = $('#begin').zui('datePicker').$.value;
     if(!beginDate) return;
-    endDate = $('#end').val();
+    endDate = $('#end').zui('datePicker').$.value;
     if(endDate) return;
 
-    endDate = $.zui.formatDate(convertStringToDate(beginDate).addDays(1), 'yyyy-MM-dd');
-    $('#end').val(endDate);
+    endDate = getNextDay(beginDate); 
+    $('#end').zui('datePicker').$.changeState({value: endDate});
+}
+
+function getNextDay(dateString) 
+{
+    var currentDate = new Date(dateString);
+    currentDate.setDate(currentDate.getDate() + 1);
+
+    var nextYear = currentDate.getFullYear();
+    var nextMonth = ('0' + (currentDate.getMonth() + 1)).slice(-2);
+    var nextDay = ('0' + currentDate.getDate()).slice(-2);
+
+    var nextDate = nextYear + '-' + nextMonth + '-' + nextDay;
+    return nextDate;
 }
 
 /**
diff --git a/module/testtask/ui/create.html.php b/module/testtask/ui/create.html.php
index 1910e64fe8..533abc805e 100644
--- a/module/testtask/ui/create.html.php
+++ b/module/testtask/ui/create.html.php
@@ -109,20 +109,20 @@ formPanel
         set::required(true),
         inputGroup
         (
-            input
+            datePicker
             (
+                set::id('begin'),
                 set::name('begin'),
-                set::type('date'),
                 set::required(true),
                 on::change('suitEndDate'),
             ),
             $lang->testtask->end,
-            input
+            datePicker
             (
+                set::id('end'),
                 set::name('end'),
-                set::type('date'),
                 set::required(true),
-            )
+            ),
         )
     ),
     formGroup