解决多余滚动条问题

master
lixin 6 years ago
parent 8f7c11a2bb
commit 0d75747344

@ -19,19 +19,8 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.left{
float:left;
}
.right{
float:right;
}
.mainDiv{ .mainDiv{
background-color: #fff; background-color: #fff;
height:100%;
} }
/**搜索区*/ /**搜索区*/
.searchDiv{ .searchDiv{

@ -19,16 +19,8 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.left{
float:left;
}
.mainDiv{ .mainDiv{
background-color: #fff; background-color: #fff;
height:100%;
} }
/**搜索区*/ /**搜索区*/
.searchDiv{ .searchDiv{
@ -41,7 +33,6 @@
} }
.tableDiv{ .tableDiv{
width: 100%; width: 100%;
height: 90%;
background-color: #fff; background-color: #fff;
margin-left: 1%; margin-left: 1%;
padding-top:5px; padding-top:5px;

@ -18,18 +18,8 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.left {
float: left;
}
.mainDiv { .mainDiv {
background-color: #fff; background-color: #fff;
height: 100%;
} }
/**搜索区*/ /**搜索区*/
@ -45,7 +35,6 @@
.tableDiv { .tableDiv {
width: 100%; width: 100%;
height: 100%;
background-color: #fff; background-color: #fff;
margin-left: 1%; margin-left: 1%;
} }

@ -20,20 +20,9 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.left{
float:left;
}
.right{
float:right;
}
/**搜索区*/ /**搜索区*/
.mainDiv{ .mainDiv{
background-color: #fff; background-color: #fff;
height:100%;
} }
.searchDiv{ .searchDiv{
padding-top:5px; padding-top:5px;

@ -21,18 +21,15 @@
</script> </script>
<style type="text/css"> <style type="text/css">
.leftDiv{ .leftDiv{
width:25%; border-right: 10px solid #c1d7e3;
background-color:#fff background-color:#fff
} }
.rightDiv{ .rightDiv{
width:74%;
margin-left:1%;
background-color:#fff background-color:#fff
} }
/**搜索框去div*/ /**搜索框去div*/
.searcDiv{ .searcDiv{
padding-left: 2%; margin: 10px 20px;
padding-top:2%;
} }
.form-control{ .form-control{
margin: 0 auto; margin: 0 auto;
@ -56,8 +53,7 @@
} }
/**表格div*/ /**表格div*/
.tableDiv{ .tableDiv{
margin-top:1%; margin: 10px 20px;
margin-left: 1%;
} }
/*模态框头*/ /*模态框头*/
.modal-header{ .modal-header{
@ -67,6 +63,13 @@
.col-sm-2,col-sm-5{ .col-sm-2,col-sm-5{
padding:0!important; padding:0!important;
} }
.zTreeDemo {
height: calc(100% - 70px) !important;
min-height: 394px !important;
}
.main-content {
height: calc(100vh - 43px);
}
</style> </style>
</head> </head>
<body style="background-color:#c1d7e3"> <body style="background-color:#c1d7e3">
@ -80,8 +83,9 @@
</span> </span>
</div> </div>
</div> </div>
<div class="row main-content">
<!--左侧树--> <!--左侧树-->
<div class="leftDiv left"> <div class="col-md-3 leftDiv">
<div class="searcDiv"> <div class="searcDiv">
<input type="text" id="key" value="" class="form-control input-sm" <input type="text" id="key" value="" class="form-control input-sm"
placeholder="角色名" maxlength="16"/><br/> placeholder="角色名" maxlength="16"/><br/>
@ -91,7 +95,7 @@
</div> </div>
</div> </div>
<!--搜索区--> <!--搜索区-->
<div class="rightDiv left"> <div class="col-md-9 rightDiv">
<div class="row searcDiv"> <div class="row searcDiv">
<div class="col-sm-5"> <div class="col-sm-5">
<div class="form-group"> <div class="form-group">
@ -134,7 +138,8 @@
<table id="mytab" class="table text-nowrap table-bordered"> <table id="mytab" class="table text-nowrap table-bordered">
</table> </table>
</div> </div>
<iframe style="width:100%;height:100%" frameborder="no" border="0" name="iframe" id="iframe"></iframe> <iframe style="width:100%;height:calc(100% - 395px)" frameborder="no" border="0" name="iframe" id="iframe"></iframe>
</div>
</div> </div>
<!-- 模态框1Modal添加、编辑 --> <!-- 模态框1Modal添加、编辑 -->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">

@ -21,18 +21,15 @@
</script> </script>
<style type="text/css"> <style type="text/css">
.leftDiv{ .leftDiv{
width:25%; border-right: 10px solid #c1d7e3;
background-color:#fff background-color:#fff
} }
.rightDiv{ .rightDiv{
width:74%;
margin-left:1%;
background-color:#fff background-color:#fff
} }
/**搜索框去div*/ /**搜索框去div*/
.searcDiv{ .searcDiv{
padding-left: 2%; margin: 10px 20px;
padding-top:2%;
} }
.form-control{ .form-control{
margin: 0 auto; margin: 0 auto;
@ -56,8 +53,7 @@
} }
/**表格div*/ /**表格div*/
.tableDiv{ .tableDiv{
margin-top:1%; margin: 10px 20px;
margin-left: 1%;
} }
/*模态框头*/ /*模态框头*/
.modal-header{ .modal-header{
@ -67,6 +63,13 @@
.col-sm-2,col-sm-5{ .col-sm-2,col-sm-5{
padding:0!important; padding:0!important;
} }
.zTreeDemo {
height: calc(100% - 70px) !important;
min-height: 394px !important;
}
.main-content {
height: calc(100vh - 43px);
}
</style> </style>
</head> </head>
<body style="background-color:#c1d7e3"> <body style="background-color:#c1d7e3">
@ -81,8 +84,9 @@
</span> </span>
</div> </div>
</div> </div>
<div class="row main-content">
<!--左侧树--> <!--左侧树-->
<div class="leftDiv left"> <div class="col-md-3 leftDiv">
<div class="searcDiv"> <div class="searcDiv">
<input type="text" id="key" value="" class="form-control input-sm" <input type="text" id="key" value="" class="form-control input-sm"
placeholder="工号/用户名" maxlength="16"/><br/> placeholder="工号/用户名" maxlength="16"/><br/>
@ -92,7 +96,7 @@
</div> </div>
</div> </div>
<!--搜索区--> <!--搜索区-->
<div class="rightDiv left"> <div class="col-md-9 rightDiv">
<div class="row searcDiv"> <div class="row searcDiv">
<div class="col-sm-5"> <div class="col-sm-5">
<div class="form-group"> <div class="form-group">
@ -135,7 +139,8 @@
<table id="mytab" class="table text-nowrap table-bordered"> <table id="mytab" class="table text-nowrap table-bordered">
</table> </table>
</div> </div>
<iframe style="width:100%;height:100%" frameborder="no" border="0" name="iframe" id="iframe"></iframe> <iframe style="width:100%;height:calc(100% - 395px)" frameborder="no" border="0" name="iframe" id="iframe"></iframe>
</div>
</div> </div>
<!-- 模态框1Modal添加、编辑 --> <!-- 模态框1Modal添加、编辑 -->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">

@ -19,10 +19,6 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.mainDiv{ .mainDiv{
background-color: #fff; background-color: #fff;
} }

@ -19,10 +19,6 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.mainDiv{ .mainDiv{
background-color: #fff; background-color: #fff;
} }

@ -19,19 +19,13 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.leftDiv{ .leftDiv{
width:25%;
height: 100%; height: 100%;
border-right: 10px solid #c1d7e3;
background-color:#fff background-color:#fff
} }
.rightDiv{ .rightDiv{
width:74%; height: 100%;
height:90%;
margin-left:1%;
background-color:#fff background-color:#fff
} }
.searchDiv{ .searchDiv{
@ -81,6 +75,7 @@
/**页头**/ /**页头**/
.headDiv{ .headDiv{
height:30px; height:30px;
width: 100%;
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 18px;
} }
@ -119,6 +114,13 @@
border-radius: 20px; border-radius: 20px;
filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70); filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
} }
.col-md-3,.col-md-9 {
padding: 0;
}
.zTreeDemo {
height: calc(100vh - 200px) !important;
min-height: 394px !important;
}
</style> </style>
</head> </head>
<body style="background-color: #c1d7e3"> <body style="background-color: #c1d7e3">
@ -128,9 +130,9 @@
<input type="hidden" id="treeTypeName"> <input type="hidden" id="treeTypeName">
<input type="hidden" id="treeCode"> <input type="hidden" id="treeCode">
<input type="hidden" id="treeName"> <input type="hidden" id="treeName">
<div class="main"> <div class="row main">
<!--树--> <!--树-->
<div class="leftDiv left"> <div class="col-md-3 leftDiv">
<div class="headDiv"> <div class="headDiv">
<div class="headSpanDiv"> <div class="headSpanDiv">
</div> </div>
@ -160,7 +162,7 @@
</div> </div>
</div> </div>
<!--内容--> <!--内容-->
<div class="rightDiv left"> <div class="rightDiv col-md-9">
<div class="headDiv"> <div class="headDiv">
<div class="headSpanDiv"> <div class="headSpanDiv">
<span>字典信息</span> <span>字典信息</span>

@ -19,10 +19,6 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.mainDiv{ .mainDiv{
background-color: #fff; background-color: #fff;
} }

@ -19,10 +19,6 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.mainDiv{ .mainDiv{
background-color: #fff; background-color: #fff;
} }

@ -21,10 +21,6 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.labelDiv{ .labelDiv{
text-align: right; text-align: right;
padding-top:5px; padding-top:5px;

@ -19,10 +19,6 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.mainDiv{ .mainDiv{
background-color: #fff; background-color: #fff;
} }

@ -31,11 +31,6 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
/* .collapse{ /* .collapse{
overflow-y:scroll; overflow-y:scroll;
}*/ }*/

@ -21,56 +21,69 @@
</script> </script>
<style type="text/css"> <style type="text/css">
.leftDiv { .leftDiv {
width:25%; border-right: 10px solid #c1d7e3;
height: 100%;
background-color: #fff background-color: #fff
} }
.rightDiv { .rightDiv {
width:74%;
height:100%;
margin-left:1%;
background-color: #fff background-color: #fff
} }
.addbtn { .addbtn {
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
.insertbtn { .insertbtn {
width: 60%; width: 60%;
} }
.searcDiv { .searcDiv {
height: 36px; margin: 10px 20px;
margin-left: 2%;
margin-top:2%;
} }
.form-control { .form-control {
margin: 0 auto; margin: 0 auto;
width: 80%; width: 80%;
} }
.input { .input {
width: 90%; width: 90%;
} }
.control-label { .control-label {
padding-left: 12% !important; padding-left: 12% !important;
padding-top: 1%; padding-top: 1%;
} }
.btn { .btn {
margin-left: 8%; margin-left: 8%;
} }
.btns { .btns {
height: 2% !important; height: 2% !important;
} }
th td { th td {
text-align: center !important; text-align: center !important;
} }
table { table {
margin-left: 1%; margin-left: 1%;
} }
/*模态框头*/ /*模态框头*/
.modal-header { .modal-header {
background-color: #199ED8; background-color: #199ED8;
text-align: center; text-align: center;
} }
.zTreeDemo {
height: calc(100% - 80px) !important;
min-height: 394px !important;
}
.main-content {
height: calc(100vh - 43px);
}
</style> </style>
</head> </head>
<body style="background-color:#c1d7e3"> <body style="background-color:#c1d7e3">
@ -83,20 +96,30 @@
</span> </span>
</div> </div>
</div> </div>
<div class="leftDiv left"> <div class="row main-content">
<!--树--> <!--树-->
<div class="col-md-3 leftDiv">
<div class="searcDiv"> <div class="searcDiv">
<input type="text" id="key" value="" class="form-control input-sm" <input type="text" id="key" value="" class="form-control input-sm"
placeholder="类别名称" maxlength="25"/><br/> placeholder="类别名称" maxlength="25"/>
</div> </div>
<shiro:hasPermission name="/printing/addEmrType"> <shiro:hasPermission name="/printing/addEmrType">
<div class="row addbtn"> <div class="row addbtn">
<button type="button" class="btn btn-sm btn-info insertbtn" id="addModle" onclick="addEmrType()">添加</button> <button type="button" class="btn btn-sm btn-info insertbtn" id="addModle" onclick="addEmrType()">
添加
</button>
</div> </div>
</shiro:hasPermission> </shiro:hasPermission>
<div class="zTreeDemo"> <div class="zTreeDemo">
<ul id="ztree" class="ztree"></ul> <ul id="ztree" class="ztree"></ul>
</div> </div>
</div>
<!--明细选项-->
<div class="col-md-9 rightDiv">
<iframe style="width:100%;height:100%" frameborder="no" border="0" name="iframe" id="iframe" scrolling="yes"
src="${path}/printing/printManageIframe?id=${emrType.id}"></iframe>
</div>
</div>
<!-- 模态框1Modal添加 --> <!-- 模态框1Modal添加 -->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
@ -116,7 +139,8 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">类别标志:</label> <label class="col-sm-4 control-label">类别标志:</label>
<div class="col-sm-7"> <div class="col-sm-7">
<input type="text" class="form-control input-sm input" name="typeFlag" id="typeFlag" maxlength="25"> <input type="text" class="form-control input-sm input" name="typeFlag" id="typeFlag"
maxlength="25">
</div> </div>
<div class="col-sm-1"></div> <div class="col-sm-1"></div>
</div> </div>
@ -125,7 +149,8 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">类别名称:</label> <label class="col-sm-4 control-label">类别名称:</label>
<div class="col-sm-7"> <div class="col-sm-7">
<input type="text" class="form-control input-sm input" name="typeName" id="typeName2" maxlength="25"> <input type="text" class="form-control input-sm input" name="typeName"
id="typeName2" maxlength="25">
</div> </div>
<div class="col-sm-1"></div> <div class="col-sm-1"></div>
</div> </div>
@ -134,7 +159,8 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">排序:</label> <label class="col-sm-4 control-label">排序:</label>
<div class="col-sm-7"> <div class="col-sm-7">
<input type="number" class="form-control input-sm input" name="typeSort" oninput="if(value.length>4)value=value.slice(0,4)"> <input type="number" class="form-control input-sm input" name="typeSort"
oninput="if(value.length>4)value=value.slice(0,4)">
</div> </div>
<div class="col-sm-1"></div> <div class="col-sm-1"></div>
</div> </div>
@ -172,11 +198,6 @@
</div> </div>
</div> </div>
</div> </div>
<!--明细选项-->
<div class="rightDiv left">
<iframe style="width:100%;height:100%" frameborder="no" border="0" name="iframe" id="iframe" scrolling="yes" src="${path}/printing/printManageIframe?id=${emrType.id}"></iframe>
</div>
</div>
<script> <script>
$(function () { $(function () {
$(".modal-dialog").draggable();//为模态对话框添加拖拽 $(".modal-dialog").draggable();//为模态对话框添加拖拽

@ -28,12 +28,8 @@
</c:forEach> </c:forEach>
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.collapse{ .collapse{
overflow-y:scroll; overflow-y:auto;
} }
.divClass{ .divClass{
padding-top:0.5%; padding-top:0.5%;
@ -45,7 +41,6 @@
text-align: right; text-align: right;
} }
.blockDiv{ .blockDiv{
margin-top:1%;
background-color: #fff background-color: #fff
} }
.hrDiv{ .hrDiv{
@ -116,10 +111,11 @@
.tableDiv{ .tableDiv{
/*margin-top: 1%;*/ /*margin-top: 1%;*/
width:100%; width:100%;
height: 100%; height: auto;
min-height: 400px;
background-color: #fff; background-color: #fff;
padding-top: 1px; padding-top: 1px;
overflow: scroll; overflow: auto;
} }
.fixed-table-body{ .fixed-table-body{
overflow: scroll; overflow: scroll;
@ -139,7 +135,7 @@
</style> </style>
</head> </head>
<body style="background-color:#c1d7e3;"> <body style="background-color:#c1d7e3;">
<div class="panel-group" id="accordion"> <div class="panel-group" id="accordion" style="margin-bottom: 10px">
<div class="panel"> <div class="panel">
<div class="panel-heading" style="padding:0px 14px!important;"> <div class="panel-heading" style="padding:0px 14px!important;">
<h5> <h5>
@ -169,7 +165,7 @@
</div> </div>
</div> </div>
<div class="bottomDiv"> <div class="bottomDiv">
<div class="blockDiv" id="blockDiv"> <div class="blockDiv" id="blockDiv" style="display: none">
<form id="block"> <form id="block">
</form> </form>

@ -19,13 +19,13 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style> <style>
body {
margin-right: -15px;
margin-bottom: -15px;
}
.main-content{ .main-content{
height:calc(100% - 43px);
background-color:#fff; background-color:#fff;
} }
.iframeDiv{
height:calc(100% - 32px);
}
.selectDiv{ .selectDiv{
width:250px; width:250px;
} }
@ -35,7 +35,7 @@
} }
.selectSpan{ .selectSpan{
height:100%; height:100%;
margin:7px 15px; padding:7px 15px;
} }
</style> </style>
</head> </head>

@ -20,19 +20,11 @@
var path = "${path}"; var path = "${path}";
</script> </script>
<style type="text/css"> <style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.leftDiv{ .leftDiv{
width:25%; border-right: 10px solid #c1d7e3;
height: 100%;
background-color:#fff background-color:#fff
} }
.rightDiv{ .rightDiv{
width:74%;
height:100%;
margin-left:1%;
background-color:#fff background-color:#fff
} }
.addbtn{ .addbtn{
@ -44,15 +36,12 @@
margin-left:-2%!important; margin-left:-2%!important;
} }
.searcDiv{ .searcDiv{
margin-top:2%; margin: 10px 20px;
} }
.form-control{ .form-control{
margin: 0 auto; margin: 0 auto;
width:80%; width:80%;
} }
.input{
width:90%;
}
.control-label{ .control-label{
padding-left:12%!important; padding-left:12%!important;
padding-top:1%; padding-top:1%;
@ -71,6 +60,13 @@
background-color: #199ED8; background-color: #199ED8;
text-align: center; text-align: center;
} }
.main-content {
height: calc(100vh - 43px);
}
.zTreeDemo {
height: calc(100vh - 131px) !important;
min-height: 394px !important;
}
</style> </style>
</head> </head>
<body style="background-color: #c1d7e3"> <body style="background-color: #c1d7e3">
@ -80,11 +76,12 @@
<span class="headspan">自定义模板选择</span> <span class="headspan">自定义模板选择</span>
</div> </div>
</div> </div>
<div class="row main-content">
<!--树--> <!--树-->
<div class="leftDiv left"> <div class="col-md-3 leftDiv">
<div class="searcDiv"> <div class="searcDiv">
<input type="text" id="key" value="" class="form-control input-sm" <input type="text" id="key" value="" class="form-control input-sm"
placeholder="名称" maxlength="25"/><br/> placeholder="名称" maxlength="25"/>
</div> </div>
<div class="row addbtn"> <div class="row addbtn">
<shiro:hasPermission name="/template/addTemplateSelect"> <shiro:hasPermission name="/template/addTemplateSelect">
@ -95,6 +92,13 @@
<ul id="ztree" class="ztree"></ul> <ul id="ztree" class="ztree"></ul>
</div> </div>
</div> </div>
<!--明细选项-->
<div class="col-md-9 rightDiv">
<div class="rightContent">
<iframe style="width:100%;height:100%" id="iframe" name="iframe" frameborder="no" border="0" scrolling="yes" src="${path}/template/templateSelectIframe?id=${emrModle.id}"></iframe>
</div>
</div>
</div>
<!-- 模态框1Modal --> <!-- 模态框1Modal -->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<input type="hidden" id="currentTypeId"> <input type="hidden" id="currentTypeId">
@ -191,12 +195,6 @@
</div> </div>
</div> </div>
</div> </div>
<!--明细选项-->
<div class="rightDiv left">
<div class="rightContent">
<iframe style="width:100%;height:100%" id="iframe" name="iframe" frameborder="no" border="0" scrolling="yes" src="${path}/template/templateSelectIframe?id=${emrModle.id}"></iframe>
</div>
</div>
</div> </div>
<script> <script>
$(function () { $(function () {

@ -10,7 +10,7 @@ $('#mytab').bootstrapTable({
pageNumber: 1, //初始化加载第一页,默认第一页 pageNumber: 1, //初始化加载第一页,默认第一页
pageSize: 10, //每页的记录行数(* pageSize: 10, //每页的记录行数(*
pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(* pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(*
height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度 _height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
columns:[ columns:[
{ {
title:'全选', title:'全选',

@ -33,7 +33,7 @@ $('#mytab').bootstrapTable({
pageNumber: 1, //初始化加载第一页,默认第一页 pageNumber: 1, //初始化加载第一页,默认第一页
pageSize: 10, //每页的记录行数(* pageSize: 10, //每页的记录行数(*
pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(* pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(*
height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度 _height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
columns:[ columns:[
{ {
title:'全选', title:'全选',

@ -15,7 +15,7 @@ $('#mytab').bootstrapTable({
pageNumber: 1, //初始化加载第一页,默认第一页 pageNumber: 1, //初始化加载第一页,默认第一页
pageSize: 10, //每页的记录行数(* pageSize: 10, //每页的记录行数(*
pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(* pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(*
height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度 _height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
columns:[ columns:[
{ {
title:'全选', title:'全选',

@ -460,6 +460,9 @@ function dynamicCheck(checked,idVal,val,name,options,inputs){
$("#div"+idVal).prev("div").children("div:last-child").remove(); $("#div"+idVal).prev("div").children("div:last-child").remove();
} }
$("#div"+idVal).remove(); $("#div"+idVal).remove();
if(!$("#block").html().trim().length){
$("#blockDiv").hide();
}
}else{ }else{
//拼接 //拼接
var html = '<div id="div'+idVal+'" style="clear:both;" class="divClass">' var html = '<div id="div'+idVal+'" style="clear:both;" class="divClass">'
@ -476,6 +479,7 @@ function dynamicCheck(checked,idVal,val,name,options,inputs){
var whereHtml = '<div class="whereDiv"><select class="select3"><option value="and">并且</option><option value="or">或</option></select></div>' var whereHtml = '<div class="whereDiv"><select class="select3"><option value="and">并且</option><option value="or">或</option></select></div>'
$("div[class=divClass]:last").append(whereHtml); $("div[class=divClass]:last").append(whereHtml);
$("#block").append(html); $("#block").append(html);
$("#blockDiv").show();
//加载时间控件 //加载时间控件
initDateInput(idVal) initDateInput(idVal)
} }

Loading…
Cancel
Save