Merge branch dev/bug-63284 of zentao/zentaopms (#9427)

module/execution/config.php

@@ -30,10 +30,12 @@ $config->execution->create = new stdclass();
 $config->execution->edit   = new stdclass();
 $config->execution->start  = new stdclass();
 $config->execution->close  = new stdclass();
-$config->execution->create->requiredFields  = 'name,begin,end';
-$config->execution->edit->requiredFields    = 'name,begin,end';
-$config->execution->start->requiredFields   = 'realBegan';
-$config->execution->close->requiredFields   = 'realEnd';
+$config->execution->putoff = new stdclass();
+$config->execution->create->requiredFields = 'name,begin,end';
+$config->execution->edit->requiredFields   = 'name,begin,end';
+$config->execution->start->requiredFields  = 'realBegan';
+$config->execution->close->requiredFields  = 'realEnd';
+$config->execution->putoff->requiredFields = 'begin,end';
 
 $config->execution->custom = new stdclass();
 $config->execution->custom->batchEditFields = 'days,PM';

module/execution/model.php

@@ -807,6 +807,7 @@ class executionModel extends model
         $this->dao->update(TABLE_EXECUTION)->data($execution, 'comment,delta')
             ->autoCheck()
             ->checkFlow()
+            ->batchCheck($this->config->execution->putoff->requiredFields, 'notempty')
             ->where('id')->eq($executionID)
             ->exec();
 

module/execution/ui/putoff.html.php

@@ -23,6 +23,7 @@ formPanel
         (
             set::width('1/2'),
             set::label($lang->execution->dateRange),
+            set::required(true),
             inputGroup
             (
                 setID('dateBox'),
@@ -65,6 +66,7 @@ formPanel
         (
             set::width('1/2'),
             set::label($lang->execution->days),
+            set::required(true),
             inputControl
             (
                 input(set::name('days')),