Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

WebRoot/view/tb/dis/task_view_p.html

@@ -18,9 +18,9 @@
                     <label class="layui-form-label" style="width: auto;">填报状态：</label>
                     <div class="layui-input-inline">
                         <select id="status" lay-filter="status">
-                            <option value="-1">全部</option>
-                            <option value="1">已填报</option>
-                            <option value="0">未填报</option>
+                            <option value="1110,1111,1210,1211,2210,2211,2310,2311">全部</option>
+                            <option value="1111,1211,2211,2311">已填报</option>
+                            <option value="1110,1210,2210,2310">未填报</option>
                         </select>
                     </div>
                 </div>
@@ -105,7 +105,7 @@
                     where: {
                         job_id: jobId,
                         keyword: $("#org_name").val(),
-                        status_codes: "1110,1111,1210,1211,2210,2211,2310,2311"
+                        status_codes: $("#status").val()
                     },
                     height: 'full-155',
                     page: {
@@ -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;
                     }
@@ -157,7 +165,7 @@
                         area: ['750px', '100%'],
                         shade: 0.1,
                         shadeClose: true,
-                        content: "../form/view_bureau.html?job_id=" + obj.data.job_id + "&target_id=" + obj.data.target_id
+                        content: "../form/view_bureau.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 + '&bureau_id=' + obj.data.target_id + '&type_id=2');

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/save_form.html

@@ -99,7 +99,6 @@
                                     } else {
                                         parent.window.location = "/QingLong/view/tb/org/task_list.html";
                                     }
-
                                 });
                             } else {
                                 layer.msg(result.message, {
@@ -118,7 +117,6 @@
                 return false;
             });
 
-
             function GetQueryString(name, istop) {
                 var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
                 var r = window.location.search.substr(1).match(reg);

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');