diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 86162d4178..87ed04529d 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -277,7 +277,7 @@ $lang->execution->howToUpdateBurn     = "<a href='http://api.zentao.net/goto.php
 $lang->execution->whyNoStories        = "Keine Story kann verknüpft werden. Bitte prüfen Sie ob ein Story mit {$lang->executionCommon} verknüpft ist {$lang->productCommon} und stellen Sie sicher das diese geprüft ist.";
 $lang->execution->productStories      = "{$lang->executionCommon} verknüpfte Story ist ein Subset von {$lang->productCommon}, welche nur nach überprüfung verknüpft werden kann. Bitte <a href='%s'> Story verknüpfen</a>。";
 $lang->execution->haveDraft           = "There are %s draft stories can't be linked.";
-$lang->execution->doneExecutions        = 'Erledigt';
+$lang->execution->doneExecutions      = 'Erledigt';
 $lang->execution->selectDept          = 'Abteilung wählen';
 $lang->execution->selectDeptTitle     = 'Abteilung wählen';
 $lang->execution->copyTeam            = 'Team kopieren';
@@ -285,12 +285,13 @@ $lang->execution->copyFromTeam        = "Kopieren von {$lang->executionCommon} T
 $lang->execution->noMatched           = "$lang->executionCommon mit '%s' konnte nicht gefunden werden.";
 $lang->execution->copyTitle           = "Wählen Sie ein {$lang->executionCommon} zum Kopieren.";
 $lang->execution->copyTeamTitle       = "Wählen Sie ein {$lang->executionCommon} Team zum Kopieren.";
-$lang->execution->copyNoExecution       = "{$lang->executionCommon} kann nicht kopiert werden.";
-$lang->execution->copyFromExecution     = "Kopie von {$lang->executionCommon} <strong>%s</strong>";
+$lang->execution->copyNoExecution     = "{$lang->executionCommon} kann nicht kopiert werden.";
+$lang->execution->copyFromExecution   = "Kopie von {$lang->executionCommon} <strong>%s</strong>";
 $lang->execution->cancelCopy          = 'Kopieren abbrechen';
 $lang->execution->byPeriod            = 'Nach Zeit';
 $lang->execution->byUser              = 'Nach Benutzer';
-$lang->execution->noExecution           = 'Keine Projekte. ';
+$lang->execution->noExecution         = 'Keine Projekte. ';
+$lang->execution->noExecutions        = "No {$lang->execution->common}.";
 $lang->execution->noMembers           = 'Keine Mitglieder. ';
 $lang->execution->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
 $lang->execution->linkPRJStoryTip     = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the project)";
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 21dc5aed81..f68dd5d4bb 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -291,6 +291,7 @@ $lang->execution->cancelCopy          = 'Cancel Copy';
 $lang->execution->byPeriod            = 'By Time';
 $lang->execution->byUser              = 'By User';
 $lang->execution->noExecution         = "No {$lang->executionCommon}. ";
+$lang->execution->noExecutions        = "No {$lang->execution->common}.";
 $lang->execution->noMembers           = 'No team members yet. ';
 $lang->execution->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
 // $lang->execution->linkProjectStoryTip = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)";
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 5e9a4a1e0b..70eb03758b 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -277,7 +277,7 @@ $lang->execution->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php
 $lang->execution->whyNoStories        = "Aucune story ne peut être associée. Vérifiez s'il existe des stories dans {$lang->executionCommon} qui sont associées à {$lang->productCommon} et vérifiez qu'elles ont bien été validées.";
 $lang->execution->productStories      = "Les stories associées au {$lang->executionCommon} sont une portion des stories associées au {$lang->productCommon}. Les stories ne peuvent être associées à un {$lang->executionCommon} qu'après avoir été validées. <a href='%s'> Associer Stories</a> maintenant.";
 $lang->execution->haveDraft           = "%s stories sont encore en conception, elles ne peuvent pas être associées au {$lang->executionCommon} actuellement.";
-$lang->execution->doneExecutions        = 'Terminé';
+$lang->execution->doneExecutions      = 'Terminé';
 $lang->execution->selectDept          = 'Sélection Compartiment';
 $lang->execution->selectDeptTitle     = 'Sélection Utilisateur';
 $lang->execution->copyTeam            = 'Copier Equipe';
@@ -285,12 +285,13 @@ $lang->execution->copyFromTeam        = "Copié de l'Equipe {$lang->executionCom
 $lang->execution->noMatched           = "Aucun $lang->executionCommon inclus '%s' ne peut être trouvé.";
 $lang->execution->copyTitle           = "Choisissez un {$lang->executionCommon} à copier.";
 $lang->execution->copyTeamTitle       = "Choisissez une Equipe {$lang->executionCommon} à copier.";
-$lang->execution->copyNoExecution       = "Aucun {$lang->executionCommon} ne peut être copié.";
-$lang->execution->copyFromExecution     = "Copié du {$lang->executionCommon} <strong>%s</strong>";
+$lang->execution->copyNoExecution     = "Aucun {$lang->executionCommon} ne peut être copié.";
+$lang->execution->copyFromExecution   = "Copié du {$lang->executionCommon} <strong>%s</strong>";
 $lang->execution->cancelCopy          = 'Annuler la copie';
 $lang->execution->byPeriod            = 'Par Temps';
 $lang->execution->byUser              = 'Par Utilisateur';
-$lang->execution->noExecution           = "Aucun {$lang->executionCommon}. ";
+$lang->execution->noExecution         = "Aucun {$lang->executionCommon}. ";
+$lang->execution->noExecutions        = "Aucun {$lang->execution->common}.";
 $lang->execution->noMembers           = "Actuellement il n'y a aucun membre dans l'équipe. On ne va pas aller loin... ";
 $lang->execution->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
 $lang->execution->linkPRJStoryTip     = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the project)";
diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php
index da7273e33c..cdd7cb6076 100644
--- a/module/execution/lang/vi.php
+++ b/module/execution/lang/vi.php
@@ -277,7 +277,7 @@ $lang->execution->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php
 $lang->execution->whyNoStories        = "Không có câu chuyện có thể liên kết. Vui lòng kiểm tra có câu chuyện trong {$lang->executionCommon} cái liên kết tới {$lang->productCommon} và chắc chắn nó đã được duyệt.";
 $lang->execution->productStories      = "Câu chuyện liên kết tới {$lang->executionCommon} là tập hợp con của câu chuyện liên kết tới {$lang->productCommon}. Các câu chuyện chỉ có thể liên kết sau khi chúng đã được duyệt. <a href='%s'> Liên kết câu chuyện</a> now.";
 $lang->execution->haveDraft           = "%s câu chuyện đang nháp, bởi vậy chúng không thể liên kết.";
-$lang->execution->doneExecutions        = 'Kết thúc';
+$lang->execution->doneExecutions      = 'Kết thúc';
 $lang->execution->selectDept          = 'Chọn phòng/ban';
 $lang->execution->selectDeptTitle     = 'Chọn người dùng';
 $lang->execution->copyTeam            = 'Copy đội nhóm';
@@ -285,12 +285,13 @@ $lang->execution->copyFromTeam        = "Sao chép từ {$lang->executionCommon}
 $lang->execution->noMatched           = "Không có $lang->executionCommon bao gồm '%s' có thể được tìm thấy.";
 $lang->execution->copyTitle           = "Chọn một {$lang->executionCommon} để sao chép.";
 $lang->execution->copyTeamTitle       = "Chọn một {$lang->executionCommon} đội nhóm để sao chép.";
-$lang->execution->copyNoExecution       = "Không có {$lang->executionCommon} có thể sao chép.";
-$lang->execution->copyFromExecution     = "Sao chép từ {$lang->executionCommon} <strong>%s</strong>";
+$lang->execution->copyNoExecution     = "Không có {$lang->executionCommon} có thể sao chép.";
+$lang->execution->copyFromExecution   = "Sao chép từ {$lang->executionCommon} <strong>%s</strong>";
 $lang->execution->cancelCopy          = 'Hủy sao chép';
 $lang->execution->byPeriod            = 'Theo thời gian';
 $lang->execution->byUser              = 'Theo người dùng';
-$lang->execution->noExecution           = "Không có {$lang->executionCommon} nào";
+$lang->execution->noExecution         = "Không có {$lang->executionCommon} nào";
+$lang->execution->noExecutions        = "Không có {$lang->execution->common} nào";
 $lang->execution->noMembers           = 'Không có thành viên đội nhóm nào';
 $lang->execution->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
 $lang->execution->linkPRJStoryTip     = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the project)";
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index b35489f57c..503582f9aa 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -291,6 +291,7 @@ $lang->execution->cancelCopy          = '取消复制';
 $lang->execution->byPeriod            = '按时间段';
 $lang->execution->byUser              = '按用户';
 $lang->execution->noExecution         = "暂时没有{$lang->executionCommon}。";
+$lang->execution->noExecutions        = "暂时没有{$lang->execution->common}。";
 $lang->execution->noMembers           = '暂时没有团队成员。';
 $lang->execution->workloadTotal       = "工作量占比累计不应当超过100, 当前产品下的工作量之和为%s";
 // $lang->execution->linkProjectStoryTip = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})";
diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php
index a41f945e45..09c12bc18b 100644
--- a/module/execution/lang/zh-tw.php
+++ b/module/execution/lang/zh-tw.php
@@ -291,6 +291,7 @@ $lang->execution->cancelCopy          = '取消複製';
 $lang->execution->byPeriod            = '按時間段';
 $lang->execution->byUser              = '按用戶';
 $lang->execution->noExecution         = "暫時沒有{$lang->executionCommon}。";
+$lang->execution->noExecutions        = "暫時沒有{$lang->execution->common}。";
 $lang->execution->noMembers           = '暫時沒有團隊成員。';
 $lang->execution->workloadTotal       = "工作量占比累計不應當超過100, 當前產品下的工作量之和為%s";
 // $lang->execution->linkProjectStoryTip = "(關聯{$lang->SRCommon}來源於項目下所關聯的{$lang->SRCommon})";
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 1aefbfff89..eab25a40f5 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -38,6 +38,16 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp
   </div>
 </div>
 <div id='mainContent' class="main-row fade">
+  <?php if(empty($executionStats)):?>
+  <div class="table-empty-tip">
+    <p>
+      <span class="text-muted"><?php echo $from == 'execution' ? $lang->execution->noExecutions : $lang->execution->noExecution;?></span>
+      <?php if(common::hasPriv('execution', 'create')):?>
+      <?php echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-plus'></i> " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-info' data-app='$from'");?>
+      <?php endif;?>
+    </p>
+  </div>
+  <?php else:?>
   <?php $canBatchEdit = common::hasPriv('execution', 'batchEdit'); ?>
   <form class='main-table' id='executionsForm' method='post' action='<?php echo inLink('batchEdit');?>' data-ride='table'>
     <table class='table has-sort-head table-fixed' id='executionList'>
@@ -154,6 +164,7 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp
     </div>
     <?php endif;?>
   </form>
+  <?php endif;?>
 </div>
 <script>
 $("#<?php echo $status;?>Tab").addClass('btn-active-text');