Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

WebRoot/view/tb/dis/task_list_y.html

@@ -133,10 +133,10 @@
                         { title: '序号', unresize: true, align: 'center', width: "5%", type: 'numbers' },
                         { title: '任务名称', unresize: true, align: 'left', templet: '#jobName-Templet' },
                         { title: '状态', unresize: true, align: 'center', width: "10%", templet: '#status-Templet' },
-                        { title: '填报进度', unresize: true, align: 'center', width: "10%", templet: '#fill-progress' },
-                        { title: '发布对象', unresize: true,  align: 'center', width: "8%" , templet: '#targetType'},
+                        { title: '填报进度', unresize: true, align: 'center', width: "10%", templet: '#fill-progress' },                       
                         { title: '发布时间', unresize: true, field: 'publish_time', align: 'center', width: "10%" },
                         { title: '截止时间', unresize: true, field: 'deadline_time', align: 'center', width: "10%" },
+                        { title: '发布对象', unresize: true,  align: 'center', width: "8%" , templet: '#targetType'},
                         { title: '操作', unresize: true, align: 'left', width: "15%", toolbar: '#table-bar' }
                     ]],
                     skin: 'line',