From 88f143f9cd58450fdeb4186fc73591778ee99a51 Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Thu, 25 Jan 2024 15:23:54 +0800
Subject: [PATCH] 'commit'

---
 WebRoot/view/tb/org/task_view.html         |  3 +--
 WebRoot/view/tb/org/task_view_forward.html | 14 +++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/WebRoot/view/tb/org/task_view.html b/WebRoot/view/tb/org/task_view.html
index 6a1c03e7..d856c2d9 100644
--- a/WebRoot/view/tb/org/task_view.html
+++ b/WebRoot/view/tb/org/task_view.html
@@ -107,8 +107,7 @@
                     where: {
                         job_id: jobId,
                         keyword: $("#org_name").val(),
-                        status_codes: $("#status").val(),
-                        direction: 1
+                        status_codes: $("#status").val()
                     },
                     height: 'full-155',
                     page: {
diff --git a/WebRoot/view/tb/org/task_view_forward.html b/WebRoot/view/tb/org/task_view_forward.html
index 57b9143c..4ea31e65 100644
--- a/WebRoot/view/tb/org/task_view_forward.html
+++ b/WebRoot/view/tb/org/task_view_forward.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="1120,1121,2120,2121">全部</option>
+                            <option value="1121,2121">已完成</option>
+                            <option value="1120,2120">未完成</option>
                         </select>
                     </div>
                 </div>
@@ -93,8 +93,7 @@
             var common = layui.common;
             var laytpl = layui.laytpl;
 
-            var jobId = GetQueryString("job_id");
-            var jobType = GetQueryString("job_type");
+            var jobId = GetQueryString("job_id");            
 
             tableRender();
 
@@ -113,11 +112,8 @@
                     url: '/QingLong/collect/viewJob',
                     where: {
                         job_id: jobId,
-                        fill_type_id: 2,
-                        is_finish: -1,
-                        forward_is_finish: $("#status").val(),
                         keyword: $("#org_name").val(),
-                        query_type_id: 1
+                        status_codes: $("#status").val()
                     },
                     height: 'full-155',
                     page: {