'commit'

WebRoot/view/tb/org/task_list.html

@@ -290,7 +290,7 @@
                     maxmin: false,
                     move: false,
                     area: ['100%', '100%'],
-                    content: "./task_view.html?job_id=" + job_id + "&job_type=" + job_type
+                    content: "./task_view.html?job_id=" + job_id + "&job_type=" + job_type + "&target_type_id=" + target_type_id
                 });
                 // if (target_type_id == 1) {
                 //     layer.open({
@@ -514,7 +514,7 @@
                 window.location = "./upload_excel.html";
             }
 
-            window.openFormCreatePage = function () {                
+            window.openFormCreatePage = function () {
                 window.location = "../form/designer.html";
             }
 

WebRoot/view/tb/org/task_view.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="1110,1111,2130,2131,1210,1211,2230,2231">全部</option>
-                            <option value="1111,2131,12112231,">已填报</option>
-                            <option value="1110,2130,1210,2230">未填报</option>
+                            <option value="1110,1111,2130,2131,2132,1210,1211,2230,2231">全部</option>
+                            <option value="1111,2131,1211,2232">已填报</option>
+                            <option value="1110,2130,1210,2230,2131">未填报</option>
                         </select>
                     </div>
                 </div>
@@ -88,6 +88,9 @@
 
             var jobId = GetQueryString("job_id");
             var jobType = GetQueryString("job_type");
+            var targetTypeId = GetQueryString("target_type_id");
+
+
 
             tableRender();
 
@@ -130,14 +133,17 @@
                     defaultToolbar: [],
                     parseData: function (res) { // res 即为原始返回的数据
                         for (var i = 0; i < res.data.length; i++) {
-                            if (res.data[i].status_code.toString().slice(-1) == "0") {
-
-                                res.data[i].is_finish = 0;
+                            res.data[i].job_type = parseInt(jobType);
+                            res.data[i].is_finish = 0;
+                            if (res.data[i].target_type_id == 1) {
+                                if (res.data[i].status_code.toString().slice(-1) == "1") {
+                                    res.data[i].is_finish = 1;
+                                }
                             } else {
-                                console.log("1")
-                                res.data[i].is_finish = 1;
+                                if (res.data[i].status_code.toString().slice(-1) == "2") {
+                                    res.data[i].is_finish = 1;
+                                }
                             }
-                            res.data[i].job_type = parseInt(jobType);
                         }
                         return res;
                     }