Merge branch 'dev2.0' of http://192.168.3.207:8080/data_processing/data_validation into dev2.0

src/web/templates/project/project_clear.html

@@ -343,50 +343,60 @@
 
     // 收回
     function retrieveTask(row) {
-        $.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,
-                "s_sourcetaskinfo": row.s_sourcetaskinfo},
-            success: function (r) {
-                if (r.success) {
-                    ttable.api().ajax.reload()
-                } else {
-                    showTip(r.msg);
+        if (row.s_status === "未开始" || row.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},
+                success: function (r) {
+                    if (r.success) {
+                        ttable.api().ajax.reload()
+                    } else {
+                        showTip(r.msg);
+                    }
                 }
-            }
-        })
+            })
+        }else {
+            showTip("操作不允许")
+        }
     }
 
     // 打回
     function repulseTask(row) {
-        $.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,
-                "s_sourcetaskinfo": row.s_sourcetaskinfo},
-            success: function (r) {
-                if (r.success) {
-                    ttable.api().ajax.reload()
-                } else {
-                    showTip(r.msg);
+        if (row.s_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},
+                success: function (r) {
+                    if (r.success) {
+                        ttable.api().ajax.reload()
+                    } else {
+                        showTip(r.msg);
+                    }
                 }
-            }
-        })
+            })
+        }else {
+            showTip("操作不允许")
+        }
     }
 
     function closeTask(val, status) {
-        $.ajax({
-            url: "/front/project/task/close",
-            type: 'POST',
-            data: {"s_status": status, "id": val},
-            success: function (r) {
-                if (r.success) {
-                    ttable.api().ajax.reload()
-                } else {
-                    showTip(r.msg);
+        showConfirm("确认要关闭当前任务吗？", function () {
+            $.ajax({
+                url: "/front/project/task/close",
+                type: 'POST',
+                data: {"s_status": status, "id": val},
+                success: function (r) {
+                    if (r.success) {
+                        ttable.api().ajax.reload()
+                    } else {
+                        showTip(r.msg);
+                    }
                 }
-            }
+            })
         })
     }
 </script>

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="editPro(\'' + pos.row + '\')">收回</a>&nbsp;&nbsp;' +
+                            '<a class="btn btn-sm btn-primary" onclick="retrieveTask(' + row + ')">收回</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-warning" href="/front/project/clear?pid=' + val + '">质检</a>&nbsp;&nbsp;' +
                             '<a class="btn btn-sm btn-info" onclick="">关闭</a>&nbsp;&nbsp;' +
                             '</div>';
@@ -286,7 +286,6 @@
     }
 
     function saveTask() {
-
         let arr = []
         if (stype === "man") {
             $('.group-item').each(function () {
@@ -309,7 +308,7 @@
             let userNum = parseInt($('#modal-user-num').val())
             let dataNum = parseInt($('#modal-data-num').val())
             console.log(userNum, dataNum, dataNum > userNum)
-            if (userNum > 0 && dataNum > 0 && dataNum > userNum) {
+            if (userNum > 0 && dataNum > 0 && dataNum >= userNum) {
                 if (dataNum%userNum === 0) {
                     // 整除
                     let avg = dataNum/userNum
@@ -359,4 +358,24 @@
             }
         })
     }
+
+    // 收回
+    function retrieveTask(row) {
+        if (row.s_status === "未开始" || row.status === "进行中") {
+            $.ajax({
+                url: "/front/user/task/retrieve",
+                type: 'POST',
+                data: {"s_sourceinfo": row.s_sourceinfo, "taskid": row._id},
+                success: function (r) {
+                    if (r.success) {
+                        ttable.api().ajax.reload()
+                    } else {
+                        showTip(r.msg);
+                    }
+                }
+            })
+        }else {
+            showTip("操作不允许")
+        }
+    }
 </script>