Merge branch 'dev2.1' into dev3.0

* dev2.1:
  xg

# Conflicts:
#	src/web/templates/project/task_user_list.html

src/web/templates/project/task_user_list.html

@@ -265,10 +265,9 @@
             showTip("操作不允许")
         }
     }
-
-    function StatsTask(id, status) {
+    function StatsTask(id, status, sourceinfo) {
         if (status === "已完成") {
-            window.location.href = "/front/project/task/statsdata?tid="+id+"&stype=user"
+            window.location.href = "/front/project/task/statsdata?tid="+id+"&s_sourceinfo="+sourceinfo+"&stype=user"
         } else {
             showTip("项目未完成")
         }