Merge branch 'master' of http://gitlab.yqdchina.com/huyi/warehouse into zlt

src/main/webapp/WEB-INF/tags/sys/gridselect.tag

@@ -37,11 +37,13 @@ $(document).ready(function(){
 		if ($("#${id}Button").hasClass("disabled")){
 			return true;
 		}
-
+		var url = '${url}';
 		if('${validate}' && '${validateSelector}'){
 			if(!$("${validateSelector}").val()){
 				jp.warning('${validateMsg}');
 				return;
+			}else{
+				url+="?office.id="+$("${validateSelector}").val()
 			}
 		}
 		top.layer.open({
@@ -50,7 +52,7 @@ $(document).ready(function(){
 		    title:"${title}",
 		    auto:true,
 		    name:'friend',
-		    content: "${ctx}/tag/gridselect?url="+encodeURIComponent("${url}")+"&fieldLabels="+encodeURIComponent("${fieldLabels}")+"&fieldKeys="+encodeURIComponent("${fieldKeys}")+"&searchLabels="+encodeURIComponent("${searchLabels}")+"&searchKeys="+encodeURIComponent("${searchKeys}")+"&isMultiSelected=${isMultiSelected? true:false}",
+		    content: "${ctx}/tag/gridselect?url="+encodeURIComponent(url)+"&fieldLabels="+encodeURIComponent("${fieldLabels}")+"&fieldKeys="+encodeURIComponent("${fieldKeys}")+"&searchLabels="+encodeURIComponent("${searchLabels}")+"&searchKeys="+encodeURIComponent("${searchKeys}")+"&isMultiSelected=${isMultiSelected? true:false}",
 		    btn: ['确定', '关闭'],
 		    yes: function(index, layero){
 		    	 var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();