diff --git a/module/stakeholder/config/action.php b/module/stakeholder/config/action.php
index 7fecbf1bdb..3cf2bc28f5 100644
--- a/module/stakeholder/config/action.php
+++ b/module/stakeholder/config/action.php
@@ -14,7 +14,7 @@ $config->stakeholder->actionList['communicate']['data-toggle'] = 'modal';
 $config->stakeholder->actionList['expect']['icon']        = 'flag';
 $config->stakeholder->actionList['expect']['text']        = $lang->stakeholder->expect;
 $config->stakeholder->actionList['expect']['hint']        = $lang->stakeholder->expect;
-$config->stakeholder->actionList['expect']['url']         = array('module' => 'stakeholder', 'method' => 'communicate', 'params' => 'id={id}');
+$config->stakeholder->actionList['expect']['url']         = array('module' => 'stakeholder', 'method' => 'expect', 'params' => 'id={id}');
 $config->stakeholder->actionList['expect']['data-toggle'] = 'modal';
 
 $config->stakeholder->actionList['edit']['icon'] = 'edit';
diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php
index c02bd11df1..48793f8d2f 100644
--- a/module/stakeholder/control.php
+++ b/module/stakeholder/control.php
@@ -372,8 +372,9 @@ class stakeholder extends control
         $this->commonAction($userID, 'stakeholder');
         if(!empty($_POST))
         {
-            if(dao::isError()) return print(js::error(dao::getError()));
-            if(isonlybody()) return print(js::closeModal('parent.parent', 'this'));
+            $this->stakeholder->communicate($userID);
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            return $this->send(array('result' => 'success', 'closeModal' => true));
         }
 
         $this->view->title      = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate;
@@ -395,10 +396,9 @@ class stakeholder extends control
 
         if(!empty($_POST))
         {
-            $expectID = $this->stakeholder->expect($user->id);
-            if(dao::isError()) return print(js::error(dao::getError()));
-
-            return print(js::closeModal('parent.parent', 'this'));
+            $this->stakeholder->expect($user->id);
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            return $this->send(array('result' => 'success', 'closeModal' => true));
         }
 
         $this->view->title      = $this->lang->stakeholder->common . $this->lang->colon . $this->lang->stakeholder->communicate;
diff --git a/module/stakeholder/ui/communicate.html.php b/module/stakeholder/ui/communicate.html.php
new file mode 100644
index 0000000000..0e0db00a66
--- /dev/null
+++ b/module/stakeholder/ui/communicate.html.php
@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+/**
+ * The communicate file of stakeholder module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Wangy Yidong <yidong@cnezsoft.com>
+ * @package     stakeholder
+ * @link        http://www.zentao.net
+ */
+namespace zin;
+
+modalHeader(set::entityID($user->id), set::entityText($user->name));
+formPanel
+(
+    formGroup
+    (
+        set::label($lang->stakeholder->communicate),
+        set::name('comment'),
+        set::control('editor'),
+    ),
+);
+hr();
+history();
diff --git a/module/stakeholder/ui/edit.html.php b/module/stakeholder/ui/edit.html.php
index a15ecee3b0..b70b2a600f 100644
--- a/module/stakeholder/ui/edit.html.php
+++ b/module/stakeholder/ui/edit.html.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 /**
- * The create view file of stakeholder module of ZenTaoPMS.
+ * The edit view file of stakeholder module of ZenTaoPMS.
  * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
  * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
  * @author      stakeholder <stakeholder@easycorp.ltd>
diff --git a/module/stakeholder/ui/expect.html.php b/module/stakeholder/ui/expect.html.php
new file mode 100644
index 0000000000..f8c47530df
--- /dev/null
+++ b/module/stakeholder/ui/expect.html.php
@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+/**
+ * The expect file of stakeholder module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Wang Yidong <yidong@cnezsoft.com>
+ * @package     stakeholder
+ * @link        http://www.zentao.net
+ */
+namespace zin;
+
+modalHeader(set::entityID($user->id), set::entityText($user->name));
+formPanel
+(
+    formGroup
+    (
+        set::label($lang->stakeholder->expect),
+        set::name('expect'),
+        set::control('editor'),
+    ),
+    formGroup
+    (
+        set::label($lang->stakeholder->progress),
+        set::name('progress'),
+        set::control('editor'),
+    ),
+);