'commit'

WebRoot/view/tb/org/task_view_forward.html

@@ -47,10 +47,10 @@
         <div class="layui-card-body">
             <table id="data-table"></table>
             <script type="text/html" id="status-Templet">
-                {{#  if(d.forward_is_finish === 0){ }}
-                    未完成
+                {{#  if(d.forward_progress === 2){ }}
+                    <span style="color: #16BAAA;">已完成</span>                    
                 {{# } else { }}
-                    <span style="color: #16BAAA;">已完成</span>
+                    未完成
                 {{#  } }}                
             </script>
 
@@ -135,7 +135,7 @@
                     defaultToolbar: [],
                     parseData: function (res) { // res 即为原始返回的数据
                         for (var i = 0; i < res.data.length; i++) {
-                            if (res.data[i].forward_is_finish === 0) {
+                            if (res.data[i].forward_progress === 0 || res.data[i].forward_progress === 1) {
                                 res.data[i].forward_finish_time = "--";
                             }
                             res.data[i].job_type = parseInt(jobType);