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

WebRoot/view/tb/org/task_list.html

@@ -241,16 +241,9 @@
             }
 
             window.forward_progress = function (job_id, total_count, finish_count, job_type) {
-                layer.open({
-                    type: 2,
-                    title: '完成进度（ <span style="color: #16BAAA;font-weight: bolder;">已完成 ' + finish_count + '</span> / 应完成 ' + total_count + ' ）',
-                    shadeClose: true,
-                    shade: false,
-                    maxmin: false,
-                    move: false,
-                    area: ['100%', '100%'],
-                    content: "./task_view_forward.html?job_id=" + job_id + "&job_type=" + job_type
-                });
+                var id = "9001"
+                parent.layui.admin.closeTab(id); 
+                parent.layui.admin.addTab(id, "转发进度", "/QingLong/view/tb/org/task_view_forward.html?job_id=" + job_id + "&job_type=" + job_type);
             }
 
 

WebRoot/view/tb/org/task_view_forward.html

@@ -19,8 +19,8 @@
                     <div class="layui-input-inline">
                         <select id="status" lay-filter="status">
                             <option value="-1">全部</option>
-                            <option value="0">已完成</option>
-                            <option value="1">未完成</option>
+                            <option value="1">已完成</option>
+                            <option value="0">未完成</option>
                         </select>
                     </div>
                 </div>
@@ -114,7 +114,8 @@
                     where: {
                         job_id: jobId,
                         fill_type_id: 2,
-                        is_finish: $("#status").val(),
+                        is_finish: -1,
+                        forward_is_finish: $("#status").val(),
                         keyword: $("#org_name").val()
                     },
                     height: 'full-155',