'commit'

WebRoot/view/tb/dis/task_list_y.html

@@ -59,7 +59,7 @@
             </script>
 
             <script type="text/html" id="fill-progress">
-                <span style="cursor: pointer;" onclick='fill_progress("{{= d.child_job_id }}","{{= d.forward_count }}","{{= d.forward_fill_count }}","{{= d.job_type }}")'>{{= d.forward_fill_count }} / {{= d.forward_count }}</span>               
+                <span style="cursor: pointer;" onclick='fill_progress("{{= d.child_job_id }}","{{= d.child_count }}","{{= d.child_reply_count }}","{{= d.job_type }}")'>{{= d.child_reply_count }} / {{= d.child_count }}</span>               
             </script>
 
             <script type="text/html" id="status-Templet">
@@ -101,6 +101,7 @@
             var element = layui.element;
 
             var statusCodes = GetQueryString("status_codes");
+            var flagType = GetQueryString("flag_type");
 
             tableRender();
 
@@ -209,7 +210,8 @@
             }
 
             window.fill_progress = function (job_id, total_count, finish_count, job_type) {
-                if (xiaji == -1) {
+                if (flagType == "1") {
+
                     layer.open({
                         type: 2,
                         title: '填报进度（ <span style="color: #16BAAA;font-weight: bolder;">已填报 ' + finish_count + '</span> / 应填报 ' + total_count + ' ）',
@@ -218,7 +220,7 @@
                         maxmin: false,
                         move: false,
                         area: ['100%', '100%'],
-                        content: "./task_view_p.html?job_id=" + job_id + "&job_type=" + job_type
+                        content: "./task_view.html?job_id=" + job_id + "&job_type=" + job_type
                     });
                 } else {
                     layer.open({
@@ -229,7 +231,7 @@
                         maxmin: false,
                         move: false,
                         area: ['100%', '100%'],
-                        content: "./task_view.html?job_id=" + job_id + "&job_type=" + job_type
+                        content: "./task_view_p.html?job_id=" + job_id + "&job_type=" + job_type
                     });
                 }