'commit'

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: []

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>
            
         

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>
+        {{#  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,6 +153,15 @@
             }
 
             window.view = function (obj) {
+                if (obj.data.is_finish === 0) {
+                    layer.open({
+                        type: 2,
+                        title: '查看',
+                        shade: 0.1,
+                        area: ['800px', '400px'],
+                        content: '../dis/job_view.html?job_id=' + obj.data.job_id
+                    });
+                } else {
                     if (obj.data.job_type === 1) {
                         layer.open({
                             type: 2,
@@ -168,6 +177,7 @@
                         var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&type_id=2');
                         window.open('../exportPdf.html?url=' + base64Url, '_blank');
                     }
+                }
 
             }