'commit'

WebRoot/view/tb/dis/task_view_p.html

@@ -129,6 +129,14 @@
                     parseData: function (res) { // res 即为原始返回的数据
                         for (var i = 0; i < res.data.length; i++) {
                             res.data[i].job_type = parseInt(jobType);
+
+
+                            if (res.data[i].status_code.toString().slice(-1) == "0") {
+                                res.data[i].is_finish = 0;
+                            } else {
+                                res.data[i].is_finish = 1;
+                            }
+
                         }
                         return res;
                     }

WebRoot/view/tb/form/report_p.html

@@ -73,6 +73,8 @@
         var element = layui.element
 
         var jobId = GetQueryString("job_id");
+        var statusCode = GetQueryString("status_code");
+        var targetId = GetQueryString("target_id");
 
 
         function unique(x) {
@@ -91,7 +93,7 @@
 
 
         $.ajax({
-          url: "/QingLong/collect/getJob?job_id=" + jobId,
+          url: "/QingLong/collect/getJob?job_id=" + jobId + "&status_code=" + statusCode + "&target_id=" + targetId,
           async: false,
           type: 'GET',
           success: function (res) {
@@ -202,7 +204,7 @@
 
         //获取表单数据
         $.ajax({
-          url: "/QingLong/collect/getFormFillJob?job_id=" + jobId+"&target_id=-1",
+          url: "/QingLong/collect/getFormFillJob?job_id=" + jobId + "&target_id=" + targetId + "&status_code=" + statusCode,
           async: false,
           type: 'GET',
           dataType: "json",
@@ -281,7 +283,8 @@
             type: 'post',
             data: {
               "job_id": jobId,
-              "json": JSON.stringify(json)
+              "json": JSON.stringify(json),
+              "status_code": statusCode
             },
             success: function (result) {
               if (result.success) {

WebRoot/view/tb/form/view.html

@@ -195,7 +195,7 @@
 
         //获取表单数据
         $.ajax({
-          url: "/QingLong/collect/getFormFillJob?job_id=" + jobId + "&status_code=" + statusCode,
+          url: "/QingLong/collect/getFormFillJob?job_id=" + jobId + "&status_code=" + statusCode + "&target_id=" + targetId,
           async: false,
           type: 'GET',
           dataType: "json",

WebRoot/view/tb/school/task_list_p.html

@@ -147,7 +147,7 @@
                         anim: 'slideLeft',
                         area: ['1000px', '100%'],
                         shade: 0.1,
-                        content: "../form/report_p.html?job_id=" + obj.data.job_id
+                        content: "../form/report_p.html?job_id=" + obj.data.job_id + "&status_code=" + obj.data.status_code + "&target_id=" + obj.data.target_id
                     });
                 }
             }
@@ -175,7 +175,7 @@
                             area: ['1000px', '100%'],
                             shade: 0.1,
                             shadeClose: true,
-                            content: "../form/view.html?job_id=" + obj.data.job_id
+                            content: "../form/view.html?job_id=" + obj.data.job_id + "&target_id=" + obj.data.target_id + "&status_code=" + obj.data.status_code,
                         });
                     } else {
                         var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&type_id=2');