diff --git a/WebRoot/Excel/b20cd8b0-933b-4d45-aad7-2e8f14f09aa0.pdf b/WebRoot/Excel/b20cd8b0-933b-4d45-aad7-2e8f14f09aa0.pdf
new file mode 100644
index 00000000..cc821217
Binary files /dev/null and b/WebRoot/Excel/b20cd8b0-933b-4d45-aad7-2e8f14f09aa0.pdf differ
diff --git a/WebRoot/Excel/b20cd8b0-933b-4d45-aad7-2e8f14f09aa0.xlsx b/WebRoot/Excel/b20cd8b0-933b-4d45-aad7-2e8f14f09aa0.xlsx
new file mode 100644
index 00000000..86875b88
Binary files /dev/null and b/WebRoot/Excel/b20cd8b0-933b-4d45-aad7-2e8f14f09aa0.xlsx differ
diff --git a/WebRoot/view/tb/dis/task_list_w.html b/WebRoot/view/tb/dis/task_list_w.html
index 3d3cfd32..385f1378 100644
--- a/WebRoot/view/tb/dis/task_list_w.html
+++ b/WebRoot/view/tb/dis/task_list_w.html
@@ -43,11 +43,11 @@
 
 
     <script type="text/html" id="table-bar">
-        <button type="button" class="layui-btn layui-btn-sm" title="转发" lay-event="publish">
-            <i class="iconfont icon-fabu"></i>
+        <button type="button" class="layui-btn layui-btn-sm" title="转发" lay-event="publish" style="font-size: 12px !important;">
+            <i class="iconfont icon-fabu"></i> 转发
         </button>
-        <button type="button" class="layui-btn layui-btn-sm" title="查看" lay-event="view">
-            <i class="iconfont icon-chakan"></i>
+        <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>
            
         
@@ -101,7 +101,7 @@
                         { title: '任务名称', field: 'job_name', align: 'left', },
                         { title: '发布时间', field: 'publish_time', align: 'center', width: "15%" },
                         { title: '截止时间', field: 'deadline_time', align: 'center', width: "15%" },
-                        { title: '操作', align: 'left', width: "10%", toolbar: '#table-bar' }
+                        { title: '操作', align: 'left', width: "15%", toolbar: '#table-bar' }
                     ]],
                     skin: 'line',
                     defaultToolbar: []
diff --git a/WebRoot/view/tb/dis/task_list_y.html b/WebRoot/view/tb/dis/task_list_y.html
index 8d252aef..0bfb308f 100644
--- a/WebRoot/view/tb/dis/task_list_y.html
+++ b/WebRoot/view/tb/dis/task_list_y.html
@@ -54,12 +54,12 @@
 
     <script type="text/html" id="table-bar">
         {{#  if(d.forward_progress == 1){ }}
-        <button type="button" class="layui-btn layui-btn-sm" title="提交给上级" lay-event="submitUpLevel">
-            <i class="iconfont icon-tijiao"></i>
+        <button type="button" class="layui-btn layui-btn-sm" title="提交给上级" lay-event="submitUpLevel" style="font-size: 12px !important;">
+            <i class="iconfont icon-tijiao"></i> 提交给上级
         </button>
         {{#  } }}  
-        <button type="button" class="layui-btn layui-btn-sm" title="查看" lay-event="view">
-            <i class="iconfont icon-chakan"></i>
+        <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>
            
         
diff --git a/WebRoot/view/tb/school/task_list.html b/WebRoot/view/tb/school/task_list.html
index 03c96406..86b3835f 100644
--- a/WebRoot/view/tb/school/task_list.html
+++ b/WebRoot/view/tb/school/task_list.html
@@ -50,10 +50,10 @@
                 <i class="iconfont icon-tianbao"></i> 填报
             </button>
         {{#  } }}
-        {{#  if(d.is_finish === 1){ }}
-            <button type="button" class="layui-btn layui-btn-sm" lay-event="view" style="font-size: 12px !important;">
-                <i class="iconfont icon-chakan"></i> 查看
-            </button>
+        <button type="button" class="layui-btn layui-btn-sm" lay-event="view" style="font-size: 12px !important;">
+            <i class="iconfont icon-chakan"></i> 查看
+        </button>
+        {{#  if(d.is_finish === 1){ }}            
             {{#  if(d.job_type === 2){ }}
                 <button type="button" class="layui-btn layui-btn-sm" lay-event="download" style="font-size: 12px !important;">
                     <i class="iconfont icon-xiazai"></i> 下载
@@ -153,20 +153,30 @@
             }
 
             window.view = function (obj) {
-                if (obj.data.job_type === 1) {
+                if (obj.data.is_finish === 0) {
                     layer.open({
                         type: 2,
                         title: '查看',
-                        offset: 'r',
-                        anim: 'slideLeft',
-                        area: ['750px', '100%'],
                         shade: 0.1,
-                        shadeClose: true,
-                        content: "../form/view.html?job_id=" + obj.data.job_id
+                        area: ['800px', '400px'],
+                        content: '../dis/job_view.html?job_id=' + obj.data.job_id
                     });
                 } else {
-                    var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&type_id=2');
-                    window.open('../exportPdf.html?url=' + base64Url, '_blank');
+                    if (obj.data.job_type === 1) {
+                        layer.open({
+                            type: 2,
+                            title: '查看',
+                            offset: 'r',
+                            anim: 'slideLeft',
+                            area: ['750px', '100%'],
+                            shade: 0.1,
+                            shadeClose: true,
+                            content: "../form/view.html?job_id=" + obj.data.job_id
+                        });
+                    } else {
+                        var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&type_id=2');
+                        window.open('../exportPdf.html?url=' + base64Url, '_blank');
+                    }
                 }
 
             }