소스 검색

no message

Jianghan 3 년 전
부모
커밋
2a28a810d9
2개의 변경된 파일10개의 추가작업 그리고 13개의 파일을 삭제
  1. 8 10
      src/web/templates/project/project_clear.html
  2. 2 3
      src/web/templates/project/task_detail.html

+ 8 - 10
src/web/templates/project/project_clear.html

@@ -233,9 +233,9 @@
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
                             '<a class="btn btn-sm btn-primary" href="/front/user/task/list?grouptaskid=' + val + '&s_sourceinfo='+row.s_sourceinfo+'">查看</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-warning" onclick="retrieveTask(' + row + ')">收回</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-warning" onclick="retrieveTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\',\''+row.s_groupid+'\')">收回</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-info">质检</a>&nbsp;&nbsp;' +
-                            '<a class="btn btn-sm btn-info" onclick="repulseTask(' + row + ')">打回</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-info" onclick="repulseTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\',\''+row.s_groupid +'\')">打回</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-default" onclick="closeTask(\'' + val + '\',\'' + row.s_status + '\')">关闭</a>&nbsp;&nbsp;' +
                             '</div>';
                         return tmp
@@ -342,13 +342,12 @@
     }
 
     // 收回
-    function retrieveTask(row) {
-        if (row.s_status === "未开始" || row.status === "进行中") {
+    function retrieveTask(id, sourceinfo, status, groupid) {
+        if (status === "未开始" || status === "进行中") {
             $.ajax({
                 url: "/front/project/task/retrieve",
                 type: 'POST',
-                data: {"s_status": row.s_status, "id": row._id, "s_groupid": row.s_groupid, "s_sourceinfo": row.s_sourceinfo,
-                    "taskid": row._id},
+                data: {"s_groupid": groupid, "s_sourceinfo": sourceinfo, "taskid": id},
                 success: function (r) {
                     if (r.success) {
                         ttable.api().ajax.reload()
@@ -363,13 +362,12 @@
     }
 
     // 打回
-    function repulseTask(row) {
-        if (row.s_status === "已完成") {
+    function repulseTask(id, sourceinfo, status, groupid) {
+        if (status === "已完成") {
             $.ajax({
                 url: "/front/project/task/repulse",
                 type: 'POST',
-                data: {"s_status": row.s_status, "id": row._id, "s_groupid": row.s_groupid, "s_sourceinfo": row.s_sourceinfo,
-                    "taskid": row._id},
+                data: {"s_groupid": groupid, "s_sourceinfo": sourceinfo, "taskid": id},
                 success: function (r) {
                     if (r.success) {
                         ttable.api().ajax.reload()

+ 2 - 3
src/web/templates/project/task_detail.html

@@ -200,7 +200,7 @@
                 {
                     "data": "_id", width: "11%", render: function (val, a, row, pos) {
                         tmp = '<div>' +
-                            '<a class="btn btn-sm btn-primary" onclick="retrieveTask(\'' + val + '\',\'' + row.s_sourceinfo + '\',\'' + row.s_status + '\')">收回</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" onclick="retrieveTask(\''+val+'\',\''+row.s_sourceinfo+'\',\''+row.s_status+'\')">收回</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-warning">质检</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-info" onclick="">关闭</a>&nbsp;&nbsp;' +
                             '</div>';
@@ -361,7 +361,6 @@
 
     // 收回
     function retrieveTask(id, sourceinfo, status) {
-        console.log(status)
         if (status === "未开始" || status === "进行中") {
             $.ajax({
                 url: "/front/user/task/retrieve",
@@ -369,7 +368,7 @@
                 data: {"s_sourceinfo": sourceinfo, "taskid": id},
                 success: function (r) {
                     if (r.success) {
-                        ttable.api().ajax.reload()
+                        location.reload()
                     } else {
                         showTip(r.msg);
                     }