Merge branch 'leiyong_adjust_feishu' into 'master'

* Fix bug#24192.

See merge request easycorp/zentaopms!4136

module/execution/view/storyestimate.html.php

@@ -14,7 +14,7 @@
 #showAverage {margin: 0;}
 .chosen-container-single .chosen-single div b {top: 8px !important;}
 .chosen-container .chosen-drop {bottom: auto !important;}
-.pull-left {margin: 24px 0px;}
+.pull-left {margin: 12px 0px;}
 </style>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('executionID', $executionID);?>

module/webhook/view/choosedept.html.php

@@ -69,8 +69,9 @@ $(function()
             {
                 beforeClick: ztreeBeforeClick,
                 beforeAsync: ztreeBeforeAsync,
-                onClick: ztreeOnAsyncSuccess,
-                onAsyncSuccess: zTreeOnAsyncSuccess
+                onClick: ztreeOnClick,
+                onAsyncSuccess: zTreeOnAsyncSuccess,
+                onAsyncError: zTreeOnAsyncError
             }
         };
 
@@ -101,8 +102,12 @@ $(function()
             return true;
         }
 
-        function ztreeOnAsyncSuccess(event, treeId, treeNode)
+        function ztreeOnClick(event, treeId, treeNode)
         {
+            var treeID = treeNode.tId;
+            if($('#' + treeID).hasClass('loading')) return false;
+            $('#' + treeID).addClass('loading');
+
             if(treeNode == undefined)
             {
                 departmentID = "0";
@@ -151,6 +156,12 @@ $(function()
             $("#loadPrompt").remove();
         }
 
+        function zTreeOnAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown)
+        {
+            var errorMsg = XMLHttpRequest.responseText;
+            alert(errorMsg);
+        }
+
         var ztreeObj = $.fn.zTree.init($("#deptList"), setting);
     }
     else