diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp
index 8b58168b..63086d77 100644
--- a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp
+++ b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-add.jsp
@@ -298,7 +298,23 @@
 	var dailogForm = $("#dailogForm").Validform({
 		tiptype:function(msg,o,cssctl){
 			if(o.type==3){
-				validationMessage(o.obj,msg);
+				var oopanel = $(o.obj).closest(".el-tab-pane");
+				var a = 0;
+				if(oopanel.length>0){
+					var panelID = oopanel.attr("id");
+					if(!!panelID){
+						var waitActive = $("#tab-"+panelID.substring(panelID.indexOf("-")+1));
+						if(!waitActive.attr(".aria-selected")){
+							waitActive.click();
+							a = 1;
+						}
+					}
+				}
+				if(a==1){
+					setTimeout(function(){validationMessage(o.obj,msg);},366);
+				}else{
+					validationMessage(o.obj,msg);
+				}
 			}else{
 				removeMessage(o.obj);
 			}
diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp
index c8895076..5e801fed 100644
--- a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp
+++ b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}-update.jsp
@@ -299,7 +299,23 @@
 	var dailogForm = $("#dailogForm").Validform({
 		tiptype:function(msg,o,cssctl){
 			if(o.type==3){
-				validationMessage(o.obj,msg);
+				var oopanel = $(o.obj).closest(".el-tab-pane");
+				var a = 0;
+				if(oopanel.length>0){
+					var panelID = oopanel.attr("id");
+					if(!!panelID){
+						var waitActive = $("#tab-"+panelID.substring(panelID.indexOf("-")+1));
+						if(!waitActive.attr(".aria-selected")){
+							waitActive.click();
+							a = 1;
+						}
+					}
+				}
+				if(a==1){
+					setTimeout(function(){validationMessage(o.obj,msg);},366);
+				}else{
+					validationMessage(o.obj,msg);
+				}
 			}else{
 				removeMessage(o.obj);
 			}
diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp
index 151bf92b..9461f2c5 100644
--- a/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp
+++ b/src/main/resources/jeecg/ext-common-template/naturebt/onetomany/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp
@@ -14,7 +14,7 @@
 		<table id="${entityName?uncap_first}List"></table>  
 	</div>
 	<div id = "${entityName?uncap_first}ListToolbar">
-		<div class="easyui-panel toolbar-search" style="display:none">
+		<div class="easyui-panel toolbar-search" style="display:none" data-options="doSize:false">
 			<form id="${entityName?uncap_first}Form" onkeydown="if(event.keyCode==13){doSearch();return false;}">
 			<#list columns as po>
 				<#if po.isQuery =='Y'>
diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/single/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.java b/src/main/resources/jeecg/ext-common-template/naturebt/single/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.java
index b4ba1943..818c87e3 100644
--- a/src/main/resources/jeecg/ext-common-template/naturebt/single/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.java
+++ b/src/main/resources/jeecg/ext-common-template/naturebt/single/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.java
@@ -81,7 +81,8 @@ public class ${entityName}ServiceImpl extends CommonServiceImpl implements ${ent
 	 * @return
 	 */
 	private void doAddBus(${entityName}Entity t) throws Exception{
-		<#list buttonSqlMap['add'] as sql>
+		//-----------------sql增强 start----------------------------
+ 		<#list buttonSqlMap['add'] as sql>
 	 	//sql增强第${sql_index+1}条
 	 	String sqlEnhance_${sql_index+1} ="${sql}";
 	 	<#-- update--begin--author:zhoujf date:20180413 for:TASK #2623 【bug】生成代码sql 不支持表达式-->
@@ -95,14 +96,16 @@ public class ${entityName}ServiceImpl extends CommonServiceImpl implements ${ent
 	 		Map<String,Object> data = populationMap(t);
 	 		executeJavaExtend("${buttonJavaMap['add'].cgJavaType}","${buttonJavaMap['add'].cgJavaValue}",data);
 	 	</#if>
-	}
+	 	//-----------------java增强 end-----------------------------
+ 	}
  	/**
 	 * 更新操作增强业务
 	 * @param t
 	 * @return
 	 */
 	private void doUpdateBus(${entityName}Entity t) throws Exception{
-		<#list buttonSqlMap['update'] as sql>
+		//-----------------sql增强 start----------------------------
+ 		<#list buttonSqlMap['update'] as sql>
 	 	//sql增强第${sql_index+1}条
 	 	String sqlEnhance_${sql_index+1} ="${sql}";
 	 	<#-- update--begin--author:zhoujf date:20180413 for:TASK #2623 【bug】生成代码sql 不支持表达式-->
@@ -116,14 +119,16 @@ public class ${entityName}ServiceImpl extends CommonServiceImpl implements ${ent
 	 		Map<String,Object> data = populationMap(t);
 	 		executeJavaExtend("${buttonJavaMap['update'].cgJavaType}","${buttonJavaMap['update'].cgJavaValue}",data);
 	 	</#if>
-	}
+	 	//-----------------java增强 end-----------------------------
+ 	}
  	/**
 	 * 删除操作增强业务
 	 * @param id
 	 * @return
 	 */
 	private void doDelBus(${entityName}Entity t) throws Exception{
-		<#list buttonSqlMap['delete'] as sql>
+	    //-----------------sql增强 start----------------------------
+ 		<#list buttonSqlMap['delete'] as sql>
 	 	//sql增强第${sql_index+1}条
 	 	String sqlEnhance_${sql_index+1} ="${sql}";
 	 	<#-- update--begin--author:zhoujf date:20180413 for:TASK #2623 【bug】生成代码sql 不支持表达式-->
@@ -137,7 +142,8 @@ public class ${entityName}ServiceImpl extends CommonServiceImpl implements ${ent
 	 		Map<String,Object> data = populationMap(t);
 	 		executeJavaExtend("${buttonJavaMap['delete'].cgJavaType}","${buttonJavaMap['delete'].cgJavaValue}",data);
 	 	</#if>
-	}
+	 	//-----------------java增强 end-----------------------------
+ 	}
  	
  	private Map<String,Object> populationMap(${entityName}Entity t){
 		Map<String,Object> map = new HashMap<String,Object>();
diff --git a/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp b/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp
index db7d46bd..e842f5b8 100644
--- a/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp
+++ b/src/main/resources/jeecg/ext-common-template/naturebt/single/webapp/webpage/${bussiPackage}/${entityPackage}/${entityNameUncapFirst}List.jsp
@@ -14,7 +14,7 @@
 		<table id="${entityName?uncap_first}List"></table>  
 	</div>
 	<div id = "${entityName?uncap_first}ListToolbar">
-		<div class="easyui-panel toolbar-search" style="display:none">
+		<div class="easyui-panel toolbar-search" style="display:none" data-options="doSize:false">
 			<form id="${entityName?uncap_first}Form" onkeydown="if(event.keyCode==13){doSearch();return false;}">
 			<#list columns as po>
 				<#if po.isQuery =='Y'>
diff --git a/src/main/webapp/plug-in/themes/naturebt/css/search-form.css b/src/main/webapp/plug-in/themes/naturebt/css/search-form.css
index bf714264..57522beb 100644
--- a/src/main/webapp/plug-in/themes/naturebt/css/search-form.css
+++ b/src/main/webapp/plug-in/themes/naturebt/css/search-form.css
@@ -1,7 +1,7 @@
 .search-span{display:-moz-inline-box;display:inline-block;margin-bottom:2px;text-align:justify;}
 .search-label{vertical-align:middle;display:-moz-inline-box;display:inline-block;width: 90px;text-align:right;text-overflow:ellipsis;-o-text-overflow:ellipsis; overflow: hidden;white-space:nowrap; }
 .date-input{background:url('plug-in/ace/images/datetime.png') no-repeat scroll right center transparent;}
-.toolbar-search{border-bottom: 1px solid #D7D7D7;padding:10px;}
+.toolbar-search{border-bottom: 1px solid #D7D7D7;padding: 10px 0 10px 10px;}
 .toolbar-btn{padding-top: 4px; padding-bottom: 1px;}
    
 
@@ -13,7 +13,7 @@
 .search-inp::-webkit-input-placeholder {color: #999}	
 
 .seerch-div label{display: inline-block;max-width: 100%;margin-bottom: 5px;font-weight: 700;}
-.search-control{float: none;width:80%;padding-right: 0; padding-left: 0;position: relative;display: table;border-collapse: separate;}
+.search-control{float: none;width:90%;padding-right: 0; padding-left: 0;position: relative;display: table;border-collapse: separate;}
 .search-control .search-inp{font-size: 12px;border-radius: 3px;} 
 .search-group-inp{width:100%;background-image:none}
 .search-group-span{padding: 5px 5px 5px 10px;font-size: 12px;font-weight: 400;line-height: 10px;color: #555; text-align: center; background-color: #eee;border: 1px solid #ccc; white-space: nowrap;vertical-align: middle;}
@@ -79,4 +79,8 @@ a.l-btn:hover span.l-btn-left{background-color: #f7f5f5 !important;}
 }
 @media screen and (max-width: 700px) {
     .seerch-div{width:100%;float:left;}
+}
+@media screen and (max-width: 900px) {
+    .datagrid .panel-body {overflow: auto !important;}
+    .search-control {width: 98%;}
 }
\ No newline at end of file