'commit'

WebRoot/view/tb/org/publish.html

@@ -71,8 +71,27 @@
                                         </div>
                                     </div>
                                     <div id="tableDiv" style="width: 650px;">
+                                        <div class="layui-table-tool" style="min-height: 38px !important">
+                                            <div class="layui-input-inline"
+                                                style="margin-left: -16px;width: 150px !important;">
+                                                <select id="orgTypeId" lay-filter="orgTypeId">
+                                                    <option value="-1">全部</option>
+                                                    <option value="5">市直教辅单位</option>
+                                                    <option value="9">市直学校</option>
+                                                    <option value="11">区县教育局</option>
+                                                </select>
+                                            </div>
+                                            <div class="layui-input-group" style="margin-left: -16px;">
+                                                <input type="text" id="org_name" placeholder="请输入单位名称"
+                                                    class="layui-input" lay-affix="clear" lay-filter="clear">
+                                                <div class="layui-input-split layui-input-suffix"
+                                                    style="cursor: pointer;" lay-on="confirm">
+                                                    <i class="layui-icon layui-icon-search"></i>
+                                                </div>
+                                            </div>
+                                        </div>
                                         <table id="data-table"></table>
-                                        <script type="text/html" id="table-toolbar">
+                                        <!-- <script type="text/html" id="table-toolbar">
                                             <div class="layui-input-inline"  style="margin-left: -16px;width: 150px !important;">
                                                 <select id="orgTypeId" lay-filter="orgTypeId">
                                                   <option value="-1">全部</option>
@@ -87,7 +106,7 @@
                                                   <i class="layui-icon layui-icon-search"></i>
                                                 </div>
                                               </div>                                    
-                                        </script>
+                                        </script> -->
                                         <script type="text/html" id="select-enable">
                                             <input type="checkbox" id="{{d.org_id}}" lay-skin="switch" lay-text="已选|未选" lay-filter="switchEnable" 
                                             {{ d.sw == true ? "checked" : "" }}>
@@ -146,12 +165,15 @@
                 min: 0
             });
 
+            renderBureauTable();
+
+            function renderBureauTable() {
                 table.render({
                     elem: '#data-table',
                     id: 'myTable',
                     url: '/QingLong/collect/getBureauList',
                     where: {
-                    org_type_id: "-1",
+                        org_type_id: $("#orgTypeId").val(),
                         org_name: $("#org_name").val(),
                         query_type_id: 1,
                         exclude_self: 1
@@ -170,7 +192,7 @@
                         { title: '操作', align: 'center', width: "25%", templet: '#select-enable' }
                     ]],
                     skin: 'line',
-                toolbar: '#table-toolbar',
+                    // toolbar: '#table-toolbar',
                     defaultToolbar: [],
                     parseData: function (res) {
                         var data = res.data;
@@ -218,6 +240,7 @@
                         });
                     }
                 });
+            }
 
             table.render({
                 elem: '#group-table',
@@ -304,16 +327,7 @@
             });
 
             function tableReload() {
-                table.reloadData('myTable', {
+                renderBureauTable();
-                    where: {
-                        org_type_id: $("#orgTypeId").val(),
-                        org_name: $("#org_name").val(),
-                        query_type_id: 1,
-                        exclude_self: 1,
-                        page:1
-                    },
-                    scrollPos: false
-                });
             }
 
             function groupTableReload() {