git-svn-id: https://192.168.57.71/svn/jsgkj@1643 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/JyrInfo.jsp

@@ -299,8 +299,8 @@
 					<input name="shenpi" type="checkbox" placeholder="" onchange="getshenpi()"/> 
 				</div>
 			</div>
+			<%@ include file="../../pop/pop_WxhwName.jsp"%>
 	  	 </form>
-	  	 <%@ include file="../../pop/pop_WxhwName.jsp"%>
 	  	 <%-- <div class="modal fade" id="wh" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 			<div class="modal-dialog" style="width:80%;height:100%;">
 				<div class="modal-content">

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/WxhwName.jsp

@@ -12,45 +12,54 @@
 		width:100%;
 	}
 </style>
-	<div class="p_block" style = "min-width:100%;width:100%;">
-		<div class="p_buttondiv" style = "min-width:100%;width:100%;">
-		
-				<button id="btnSave" class="btn btn-success btn-round btn-sm"
-				onclick="checked()">
-				<i class="glyphicon glyphicon-ok"></i> 确定
-				</button>
-				<button type="button" class="btn btn-grey btn-round btn-sm"
-					onclick="closeWh()">
-					<i class="glyphicon glyphicon-remove"></i> 取消
-				</button>
-		</div>
-		<div style = "min-width:100%;width:100%;">
-			<table class="tabsearch" style = "min-width:100%;width:100%;">
-				<tr class="trsearch">
-					<td class="tdname">编号</td>
-					<td class="tdcontent">
-						<input type="text" id="bh" name="bh" class="p_txt"/>
-					</td>
-					<td class="tdname">名称和说明</td>
-					<td class="tdcontent">
-						<input type="text" id="mchsm" name="mchsm" class="p_txt"/>
-					</td>
-					<td class="tdname">类别和项别 </td>
-					<td class="tdcontent">
-						<input type="text" id="lbhxb" name="lbhxb" class="p_txt"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="tdname"></td>
-					<td class="tdcontent" colspan="5">
-						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
-							onclick="wxhwSearch()"/>
-					</td>
-				</tr>
-			</table>
-		</div>
-		<div class="gridmanager">
-				<table grid-manager="wxhw-grid-table" id="wxhw-grid-table"></table>
+ 	<div class="modal fade" id="wh" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+			<div class="modal-dialog" style="width:80%;height:100%;">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h6 class="modal-title" id="myModalLabel"></h6>
+					</div>
+				<div class="p_block" style = "min-width:100%;width:100%;">
+					<div class="p_buttondiv" style = "min-width:100%;width:100%;">
+					
+							<button id="btnSave" class="btn btn-success btn-round btn-sm"
+							onclick="checked()">
+							<i class="glyphicon glyphicon-ok"></i> 确定
+							</button>
+							<button type="button" class="btn btn-grey btn-round btn-sm"
+								onclick="closeWh()">
+								<i class="glyphicon glyphicon-remove"></i> 取消
+							</button>
+					</div>
+					<div style = "min-width:100%;width:100%;">
+						<table class="tabsearch" style = "min-width:100%;width:100%;">
+							<tr class="trsearch">
+								<td class="tdname">编号</td>
+								<td class="tdcontent">
+									<input type="text" id="bh" name="bh" class="p_txt"/>
+								</td>
+								<td class="tdname">名称和说明</td>
+								<td class="tdcontent">
+									<input type="text" id="mchsm" name="mchsm" class="p_txt"/>
+								</td>
+								<td class="tdname">类别和项别 </td>
+								<td class="tdcontent">
+									<input type="text" id="lbhxb" name="lbhxb" class="p_txt"/>
+								</td>
+							</tr>
+							<tr>
+								<td class="tdname"></td>
+								<td class="tdcontent" colspan="5">
+									<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
+										onclick="wxhwSearch()"/>
+								</td>
+							</tr>
+						</table>
+					</div>
+					<div class="gridmanager">
+							<table grid-manager="wxhw-grid-table" id="wxhw-grid-table"></table>
+						</div>
+				</div>
 			</div>
+		</div>					
 	</div>
 <script src="<%=base%>/static/js/jyr/WxhwName.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/main.jsp

@@ -12,6 +12,18 @@
 <script src="<%=base%>/static/js/jyr/index.js"></script>
 	<style type="text/css">
 		.tdname{font-weight: bolder;}
+		<!--重新设置tab的标签样式-->
+		.nav-tabs > li > a:hover,a:focus,a:active{
+		    border: 0px solid #FFF;
+			background-color:#FFF;
+		}
+		.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus{
+		    color: #555;
+		    cursor: default;
+		    background-color: #fff;
+		    border: 0px solid #ddd;
+		    border-bottom-color: transparent;
+    	}
 	</style>
 </head>
 <body class="p_body">
@@ -140,17 +152,53 @@
 			</div>
 		</div>
 		<%@ include file="../../layouts/footer.jsp"%>
-		<div class="modal fade" id="jyrwin" tabindex="99999999" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-			<div class="modal-dialog" style="width:80%;height:100%;">
+		<div class="modal fade" id="jyrwin" tabindex="99999999" role="dialog" aria-hidden="true" >
+			<div class="modal-dialog" style="width:1100px;height:600px;">
 				<div class="modal-content">
 					<div class="modal-header">
-						<button type="button" class="close" data-dismiss="modal">
+						<button type="button" class="close" onclick="closeModelJyr();" >
 							<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
 						</button>
 						<h6 class="modal-title" id="myModalLabel"></h6>
 					</div>
 					<div class="modal-body" style="padding:0px;">
-						<div id="tt" class="easyui-tabs" style="width:1300px;height:600px;"> 
+							<%-- <ul id="myTab" class="nav nav-tabs">
+								<li class="active">
+									<a href="#home" data-toggle="tab">经营人基本信息</a>
+								</li>
+								<li><a href="#bwInfotab" data-toggle="tab">泊位信息</a></li>
+								<li><a href="#dcInfotab" data-toggle="tab">堆场信息</a></li>
+								<li><a href="#ckInfotab" data-toggle="tab">仓库信息</a></li>
+							</ul>
+						<div class="tab-content">
+							<div class="tab-pane fade in active" id="home">
+									<div id="tab-tools" style="margin-bottom:10px;">
+								    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
+										      	<button id="btnEditOrSave" class="btn btn-custom btn-round btn-sm"
+													onclick="editJyr()">
+													<i class="glyphicon glyphicon-ok"></i> 保存
+												</button>
+												<button type="button" class="btn btn-custom btn-round btn-sm"
+													onclick="closeWin()">
+													<i class="glyphicon glyphicon-remove"></i> 关闭
+												</button>
+										   </div>
+									</div> 
+						        <%@ include file="../jyr/JyrInfo.jsp"%>    
+						    </div>
+						    <div class="tab-pane fade" id="bwInfotab">
+						    	<%@ include file="../jyr/BwInfo.jsp"%> 
+						    </div>
+						    <div class="tab-pane fade" id="dcInfotab">
+						    	<%@ include file="../jyr/DcInfo.jsp"%> 
+						    </div>
+						    <div class="tab-pane fade" id="ckInfotab">
+						    	<%@ include file="../jyr/CkInfo.jsp"%>
+						    </div>
+						</div> --%>
+					
+						<div id="tt" class="easyui-tabs" style=" width:1090px; height:600px;"> 
+						
 						    <div title="经营人基本信息" data-options="iconCls:'icon-reload'"  style="padding:20px;display:none;">   
 						    	<div id="tab-tools" style="margin-bottom:10px;">
 							    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
@@ -177,9 +225,6 @@
 						    </div>   
 						</div>
 					</div>
-				</div> 
-			</div>
-		</div>
 		<div class="modal fade" id="jyrTjxxinfo" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 			<div class="modal-dialog" style="width:100%;height:100%;">
 				<div class="modal-content">