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

---
 WebRoot/view/tb/org/task_view_forward.html | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/WebRoot/view/tb/org/task_view_forward.html b/WebRoot/view/tb/org/task_view_forward.html
index c5906dcf..1229428b 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="1120,1121,2120,2121">全部</option>
-                            <option value="1121,2121">已完成</option>
-                            <option value="1120,2120">未完成</option>
+                            <option value="1120,1121,2120,2121,1122,2122">全部</option>
+                            <option value="1122,2122">已完成</option>
+                            <option value="1120,1121,2120,2121">未完成</option>
                         </select>
                     </div>
                 </div>
@@ -47,7 +47,7 @@
         <div class="layui-card-body">
             <table id="data-table"></table>
             <script type="text/html" id="status-Templet">
-                {{#  if(d.forward_progress_xiaji === 2){ }}
+                {{#  if(d.is_finish === 1){ }}
                     <span style="color: #16BAAA;">已完成</span>                    
                 {{# } else { }}
                     未完成
@@ -93,7 +93,7 @@
             var common = layui.common;
             var laytpl = layui.laytpl;
 
-            var jobId = GetQueryString("job_id");            
+            var jobId = GetQueryString("job_id");
 
             tableRender();
 
@@ -137,9 +137,11 @@
                     defaultToolbar: [],
                     parseData: function (res) { // res 即为原始返回的数据
                         for (var i = 0; i < res.data.length; i++) {
-                            if (res.data[i].forward_progress_xiaji === 0 || res.data[i].forward_progress_xiaji === 1) {
-                                res.data[i].forward_finish_time = "--";
-                            }                            
+                            if (res.data[i].status_code.toString().slice(-1) == "2") {
+                                res.data[i].is_finish = 1;
+                            } else {                                
+                                res.data[i].is_finish = 0;
+                            }
                         }
                         return res;
                     }