From fcd6f4c333f76b677f84521795b7db35f9d59746 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Wed, 15 Jun 2022 10:57:05 +0000
Subject: [PATCH] * Finish task#56932.

---
 module/execution/view/batchedit.html.php | 24 ++++++++++++++++++++++++
 module/programplan/view/create.html.php  | 24 ++++++++++++++++++++++++
 module/story/view/create.html.php        |  2 +-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php
index 26d3631ce8..c8e68c6f56 100755
--- a/module/execution/view/batchedit.html.php
+++ b/module/execution/view/batchedit.html.php
@@ -142,6 +142,10 @@ js::set('confirmSync', $lang->execution->confirmSync);
 js::set('emptyBegin', $lang->programplan->emptyBegin);
 js::set('emptyEnd', $lang->programplan->emptyEnd);
 js::set('planFinishSmall', $lang->programplan->error->planFinishSmall);
+js::set('errorBegin', $lang->execution->errorLetterProject);
+js::set('errorEnd', $lang->execution->errorGreaterProject);
+js::set('projectBeginDate', $project->begin);
+js::set('projectEndDate', $project->end);
 ?>
 
 <script>
@@ -190,6 +194,26 @@ $('#executionForm').submit(function()
             alert(planFinishSmall);
             return false;
         }
+
+        if(beginDate < projectBeginDate)
+        {
+            submitForm = false;
+            var errorBeginTip  = errorBegin.replace('%s', projectBeginDate);
+            var errorBeginHtml = '<div id="help' + beginDateID + '" class="text-danger help-text">' + errorBeginTip + '</div>';
+            $('#' + beginDateID).after(errorBeginHtml);
+            alert(errorBeginTip);
+            return false;
+        }
+
+        if(endDate > projectEndDate)
+        {
+            submitForm = false;
+            var errorEndTip  = errorEnd.replace('%s', projectEndDate);
+            var errorEndHtml = '<div id="help' + endDateID + '" class="text-danger help-text">' + errorEndTip + '</div>';
+            $('#' + endDateID).after(errorEndHtml);
+            alert(errorEndTip);
+            return false;
+        }
     });
 
     if(!submitForm) return false;
diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php
index 36dd7b2c99..c947131b82 100644
--- a/module/programplan/view/create.html.php
+++ b/module/programplan/view/create.html.php
@@ -209,6 +209,10 @@
 js::set('emptyBegin', $lang->programplan->emptyBegin);
 js::set('emptyEnd', $lang->programplan->emptyEnd);
 js::set('planFinishSmall', $lang->programplan->error->planFinishSmall);
+js::set('errorBegin', $lang->programplan->errorBegin);
+js::set('errorEnd', $lang->programplan->errorEnd);
+js::set('projectBeginDate', $project->begin);
+js::set('projectEndDate', $project->end);
 ?>
 <script>
 $('[data-toggle="popover"]').popover();
@@ -259,6 +263,26 @@ $('#planForm').submit(function()
             alert(planFinishSmall);
             return false;
         }
+
+        if(beginDate < projectBeginDate)
+        {
+            submitForm = false;
+            var errorBeginTip  = errorBegin.replace('%s', projectBeginDate);
+            var errorBeginHtml = '<div id="help' + beginDateID + '" class="text-danger help-text">' + errorBeginTip + '</div>';
+            $('#' + beginDateID).after(errorBeginHtml);
+            alert(errorBeginTip);
+            return false;
+        }
+
+        if(endDate > projectEndDate)
+        {
+            submitForm = false;
+            var errorEndTip  = errorEnd.replace('%s', projectEndDate);
+            var errorEndHtml = '<div id="help' + endDateID + '" class="text-danger help-text">' + errorEndTip + '</div>';
+            $('#' + endDateID).after(errorEndHtml);
+            alert(errorEndTip);
+            return false;
+        }
     });
 
     if(!submitForm) return false;
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index de13873e57..038ac846a2 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -279,7 +279,7 @@
             <th><?php echo $lang->story->mailto;?></th>
             <td colspan="4">
               <div class="input-group">
-                <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "class='form-control chosen' data-placeholder='{$lang->chooseUsersToMail}' multiple");?>
+                <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "class='form-control picker-select' data-placeholder='{$lang->chooseUsersToMail}' multiple");?>
                 <?php echo $this->fetch('my', 'buildContactLists');?>
               </div>
             </td>