'commit'

WebRoot/view/tb/dis/task_list_w.html

@@ -138,15 +138,15 @@
 
 
             window.publish = function (obj) {
-                if (obj.data.self_or_next == 2) {
+                if (obj.data.status_code.toString()[2] == "3") {
                     layer.open({
                         type: 2,
                         title: '发布任务',
                         offset: 'r',
                         anim: 'slideLeft',
-                        area: ['860px', '100%'],
+                        area: ['1000px', '100%'],
                         shade: 0.1,
-                        content: './publish_forward.html?job_id=' + obj.data.job_id + "&status_code=" + obj.data.status_code + "&target_id=" + obj.data.target_id
+                        content: './publish_person.html?job_id=' + obj.data.job_id + "&status_code=" + obj.data.status_code + "&target_id=" + obj.data.target_id
                     });
                 } else {
                     layer.open({
@@ -154,12 +154,14 @@
                         title: '发布任务',
                         offset: 'r',
                         anim: 'slideLeft',
-                        area: ['1000px', '100%'],
+                        area: ['860px', '100%'],
                         shade: 0.1,
-                        content: './publish_person.html?job_id=' + obj.data.job_id + "&status_code=" + obj.data.status_code + "&target_id=" + obj.data.target_id
+                        content: './publish_forward.html?job_id=' + obj.data.job_id + "&status_code=" + obj.data.status_code + "&target_id=" + obj.data.target_id
                     });
                 }
 
+
+
                 // if (obj.data.target_type_id === 1) {
                 //     layer.open({
                 //         type: 2,

WebRoot/view/tb/dis/task_list_y.html

@@ -56,7 +56,7 @@
             </script>
 
             <script type="text/html" id="fill-progress">
-                <span style="cursor: pointer;" onclick='fill_progress("{{= d.target_type_id }}","{{= d.job_id }}","{{= d.child_count }}","{{= d.child_reply_count }}","{{= d.job_type }}")'>{{= d.child_reply_count }} / {{= d.child_count }}</span>               
+                <span style="cursor: pointer;" onclick='fill_progress("{{= d.status_code }}","{{= d.self_or_next }}","{{= d.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">
@@ -204,9 +204,8 @@
                 });
             }
 
-            window.fill_progress = function (target_type_id, job_id, total_count, finish_count, job_type) {
-                if (target_type_id == 1) {
-
+            window.fill_progress = function (status_code, self_or_next, job_id, total_count, finish_count, job_type) {
+                if (status_code[2] == "3") {
                     layer.open({
                         type: 2,
                         title: '填报进度（ <span style="color: #16BAAA;font-weight: bolder;">已填报 ' + finish_count + '</span> / 应填报 ' + total_count + ' ）',
@@ -215,7 +214,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 + "&self_or_next=1"
                     });
                 } else {
                     layer.open({
@@ -226,7 +225,7 @@
                         maxmin: false,
                         move: false,
                         area: ['100%', '100%'],
-                        content: "./task_view_p.html?job_id=" + job_id + "&job_type=" + job_type + "&self_or_next=1"
+                        content: "./task_view.html?job_id=" + job_id + "&job_type=" + job_type
                     });
                 }
 

WebRoot/view/tb/dis/task_view.html

@@ -135,7 +135,7 @@
                                     res.data[i].is_finish = 1;
                                 }
                             } else {
-                                if (res.data[i].status_code.toString().slice(-1) == "3") {
+                                if (res.data[i].status_code.toString().slice(-1) == "2") {
                                     res.data[i].is_finish = 1;
                                 }
                             }