'commit'

WebRoot/view/tb/dis/task_view.html

@@ -105,7 +105,7 @@
                     where: {
                         job_id: jobId,                        
                         keyword: $("#org_name").val(),
-                        status_codes: "1110,1111,1210, 1211,2210,2211,2310,2311"
+                        status_codes: "1110,1111,1210,1211,2210,2211,2310,2311"
                     },
                     height: 'full-155',
                     page: {

WebRoot/view/tb/dis/task_view_p.html

@@ -105,7 +105,7 @@
                     where: {
                         job_id: jobId,
                         keyword: $("#org_name").val(),
-                        status_codes: "1110,1111,1210, 1211,2210,2211,2310,2311"
+                        status_codes: "1110,1111,1210,1211,2210,2211,2310,2311"
                     },
                     height: 'full-155',
                     page: {

WebRoot/view/tb/org/task_view.html

@@ -47,7 +47,7 @@
         <div class="layui-card-body">
             <table id="data-table"></table>
             <script type="text/html" id="status-Templet">
-                {{#  if(d.is_finish === 0){ }}
+                {{#  if(d.is_finish == 0){ }}
                     未填报
                 {{# } else { }}
                     <span style="color: #16BAAA;">已填报</span>
@@ -61,12 +61,12 @@
 
         {{#  if(d.is_finish === 1){ }}
             {{#  if(d.target_type_id === 1){ }}
-                <button type="button" class="layui-btn layui-btn-sm" title="填报" lay-event="view" style="font-size: 12px !important;">
+                <button type="button" class="layui-btn layui-btn-sm" title="查看" lay-event="view" style="font-size: 12px !important;">
                     <i class="iconfont icon-chakan"></i> 查看
                 </button>
             {{#  } }} 
             {{#  if(d.job_type === 2){ }}
-            <button type="button" class="layui-btn layui-btn-sm" title="填报" lay-event="download" style="font-size: 12px !important;">
+            <button type="button" class="layui-btn layui-btn-sm" title="下载" lay-event="download" style="font-size: 12px !important;">
                 <i class="iconfont icon-xiazai"></i> 下载
             </button>
             {{#  } }} 
@@ -106,9 +106,8 @@
                     url: '/QingLong/collect/viewJob',
                     where: {
                         job_id: jobId,
-                        is_finish: $("#status").val(),
                         keyword: $("#org_name").val(),
-                        query_type_id: 1
+                        status_codes: "1110,1111,1210,1211,2210,2211,2310,2311"
                     },
                     height: 'full-155',
                     page: {
@@ -130,7 +129,14 @@
                     skin: 'line',
                     defaultToolbar: [],
                     parseData: function (res) { // res 即为原始返回的数据
-                        for (var i = 0; i < res.data.length; i++) {
+                        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;
+                            } else {
+                                console.log("1")
+                                res.data[i].is_finish = 1;
+                            }
                             res.data[i].job_type = parseInt(jobType);
                         }
                         return res;