'commit'

WebRoot/login.html

@@ -48,7 +48,7 @@
                 <div class="vcode">
                     <div class="vcode-li">
                         <img src="./img/v-code.png">
-                        <input type="text" placeholder="验证码" autocomplete="off" name="captcha" id="captchaTxt">
+                        <input type="text" placeholder="验证码" autocomplete="off" name="captcha" id="captchaTxt" value="dsideal">
                         <img class="vcode-img" id="userCaptchaImage" src="/QingLong/loginPerson/getCaptcha"
                              alt="点击图片刷新校验码" style="cursor:pointer" onclick="javascript:refreshCaptcha()"/>
                     </div>

WebRoot/view/tb/dis/publish.html

@@ -75,6 +75,7 @@
                                                 style="margin-left: -16px;width: 150px !important;">
                                                 <select id="orgTypeId" lay-filter="orgTypeId">
                                                     <option value="1,2,3">全部</option>
+                                                    <option value="1">教育局</option>                                                    
                                                     <option value="2">学校</option>
                                                     <option value="3">教辅单位</option>
                                                 </select>
@@ -180,6 +181,9 @@
                         var data = res.data;
                         for (var i = 0; i < data.length; i++) {
                             switch (data[i].org_type_id) {
+                                case 11:
+                                    res.data[i].org_type_name = '教育局';
+                                    break;
                                 case 14:
                                     res.data[i].org_type_name = '教辅单位';
                                     break;

WebRoot/view/tb/org/task_view.html

@@ -60,9 +60,11 @@
     <script type="text/html" id="table-bar">
 
         {{#  if(d.is_finish === 1){ }}
-            <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>
+            {{#  if(d.target_type_id === 1){ }}
+                <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>
+            {{#  } }} 
             {{#  if(d.job_type === 2){ }}
             <button type="button" class="layui-btn layui-btn-sm" title="填报" lay-event="download" style="font-size: 12px !important;">
                 <i class="iconfont icon-xiazai"></i> 下载
@@ -123,7 +125,7 @@
                         { title: '联系人', field: 'person_name', align: 'center', width: "15%" },
                         { title: '电话', field: 'telephone', align: 'center', width: "10%" },
                         { title: '邮箱', field: 'email', align: 'center', width: "10%" },
-                        // { title: '操作', align: 'center', width: "15%", toolbar: '#table-bar' }
+                        { title: '操作', align: 'center', width: "15%", toolbar: '#table-bar' }
                     ]],
                     skin: 'line',
                     defaultToolbar: [],
@@ -155,7 +157,7 @@
                         title: '查看',
                         offset: 'r',
                         anim: 'slideLeft',
-                        area: ['1000px', '100%'],
+                        area: ['860px', '100%'],
                         shade: 0.1,
                         shadeClose: true,
                         content: "../form/view_bureau.html?job_id=" + obj.data.job_id + "&target_id=" + obj.data.target_id