2019-09-18 09:23

src/main/webapp/webpage/modules/sg/free/individualForm.jsp

@@ -43,12 +43,13 @@
         <div class="" style="margin-left: 10px;">
             <input type="radio" name="mydiv" value="1" title="增加" checked="">
             <input type="radio" name="mydiv" value="2" title="减少">
-            &nbsp;&nbsp;
-            <input id="edt-search" type="text" placeholder="输入关键字" style="width: 120px;"/>&nbsp;&nbsp;
-            <button class="layui-btn" id="btn-search">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
         </div>
     </div>
 </form>
+&nbsp;&nbsp;
+<input id="edt-search" type="text" placeholder="输入关键字" style="width: 120px;"/>&nbsp;&nbsp;
+<%--<button class="layui-btn" id="btn-search">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>--%>
+<button class="layui-btn" onclick="solr();">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
 <div style="margin-left: 7px;margin-right: 7px">
 <table class="layui-table" id="longtable" lay-filter="longtable"></table>
 </div>
@@ -95,38 +96,6 @@
                     },
                     </c:forEach>
                     </c:if>
-                    // {
-                    //     "id":"1",
-                    //     "wbsys": "12",
-                    //     "wbsCode": "32",
-                    //     "bl":'',
-                    //     "fee":'',
-                    //     "pid": -1
-                    // },
-                    // {
-                    //     "id":"2",
-                    //     "wbsys": "121212131231",
-                    //     "wbsCode": "32",
-                    //     "bl":'',
-                    //     "fee":'',
-                    //     "pid": 1
-                    // },
-                    // {
-                    //     "id":"3",
-                    //     "wbsys": "12123123",
-                    //     "wbsCode": "32",
-                    //     "bl":'',
-                    //     "fee":'',
-                    //     "pid": -1
-                    // },
-                    // {
-                    //     "id":"4",
-                    //     "wbsys": "12123123",
-                    //     "wbsCode": "32",
-                    //     "bl":'',
-                    //     "fee":'',
-                    //     "pid": 3
-                    // }
                 ],
                 done: function (res, curr, count) {
                     layer.closeAll('loading');
@@ -222,7 +191,7 @@
     });
 </script>
 <script>
-    $('#btn-search').click(function () {
+    function solr(){
         var keyword = $('#edt-search').val();
         var searchCount = 0;
         $('#longtable').next('.treeTable').find('.layui-table-body tbody tr td').each(function () {
@@ -243,6 +212,6 @@
         } else if (searchCount == 0) {
             layer.msg("没有匹配结果", {icon: 5});
         }
-    });
+    }
 </script>
 </html>

src/main/webapp/webpage/modules/sg/free/wbslist.js

@@ -307,7 +307,7 @@ table.on('tool(settle)', function(obj){
             type: 1,
             title:data.setname,
             // skin: 'layui-layer-rim',
-            area: ['50%', '70%'],
+            area: ['60%', '70%'],
             content: "<div style='padding: 16px'>"+data.reason+"</div>"
         });
     }