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

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

@@ -1,7 +1,7 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
 	
-	   	 <form class="form-horizontal" id="jyrInfoform" method="post" >
+	   	 <form class="form-horizontal" id="jyrInfoform" method="post"  enctype="multipart/form-data" >
 		    <input type="hidden" id="id" name="id">
 			<input type="hidden" id="recordCode" name="recordCode">
 	    	<div class="form-group">
@@ -81,8 +81,12 @@
 			<div class="form-group">
 				 <label class="col-sm-1 control-label" for="gkjyxkzh">港口经营许可证</label>
 				<div class="col-sm-3">
-					<input class="form-control" id="gkjyxkzh" name="gkjyxkzh" 
-						type="file" placeholder="" />
+				<input class="form-control" id="gkjyxkzh" name="gkjyxkzh" 
+						type="text" placeholder="" />
+				<input type = "button" id = "addFile" onclick="clickfile();" value = "添加附件">
+						
+					<!-- <input class="form-control" id="gkjyxkzh" name="gkjyxkzh" 
+						type="file" placeholder="" /> -->
 				</div>
 				<label class="col-sm-1 control-label" for="fzrq">发证日期</label>
 				<div class="col-sm-3">
@@ -299,7 +303,7 @@
 			<div class="form-group">
 				 <label class="col-sm-1 control-label" for="zywxhwpm">作业危险货物品名</label>
 				<div class="col-sm-9">
-					<textarea class="form-control" id = "zywxhwpm" name = "zywxhwpm" readonly="readonly"></textarea>
+					<textarea class="form-control" id = "zywxhwpm" name = "zywxhwpm"></textarea>
 					
 				</div>
 				<input type="button" id="choosePerson" onclick="selectWxhw();"  value="选择"/>
@@ -312,5 +316,30 @@
 				</div>
 			</div>
 	  	 </form>
-	  	 
+	  	 <div id="wh" class="easyui-window" title="选择" style="width:50%;height: 60%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true"> 
+					<%@ include file="../jyr/WxhwName.jsp"%>
+					
+		</div>
+		
+		<%-- <div id="fileUp" class="easyui-window" title="文件上传" style="width:30%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+       		 <form name="form2" id ="fileform" enctype="multipart/form-data" method="post" action="<%=basePath%>/jyr/UploadFile"> 
+				<table border="0" cellpadding="0" cellspacing="0">
+			    <tr> 
+			          <td><b>请选择上传的文件：</b>
+			            <input id="file" name="file" type="file" size="35"><input type="button" value="添加" onclick="addRow()">
+			          </td>
+			        </tr>
+			        <tr style="display: none;" id="myTr">
+			         <td><b>请选择上传的文件：</b>
+			            <input id="file" name="file" type="file" size="35"><input type="button" value="删除" onclick="delRow(this)">
+			          </td>
+			        </tr>
+				</table>
+				<input name="Submit" type="submit"class="btn_grey" value="确认">
+				<input name="Submit2" type="button" class="btn_grey" onClick="$('#fileUp').window('close')" value="关闭">
+			</form>
+		</div>  --%>
+		
 <script src="<%=base%>/static/js/jyr/JyrInfo.js"></script>	

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

@@ -1,5 +1,50 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
+	
+	<div class="p_searchdiv" style = "width:100%;display:block;">
+			<table class="tabsearch" style = "margin-top: 10px;width:100%;">
+				<tr class="trsearch">
+					<td class="tdname">所在地</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="tjszd" name = "szd">
+						
+						</select>	
+					</td>
+					<td class="tdname">地区</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="tjqylx" name = "qylx">
+							<option value = "">--请选择--</option>
+							<option value = "1">沿江企业</option>
+							<option value = "2">沿海企业</option>
+							<option value = "3">内河企业</option>
+						</select>
+					</td>
+					<td class="tdname">统计时间：起</td>
+					<td class="tdcontent">
+						<input id="tjqstime" class="easyui-datetimebox" 
+							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
+							 style="width:60%;height: 34px;" type="text"/>
+					</td>
+					<td class="tdname">统计时间：止</td>
+					<td class="tdcontent">
+						<input id="tjjstime" class="easyui-datetimebox" 
+							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
+							 style="width:60%;height: 34px;" type="text"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="tdname"></td>
+					<td class="tdcontent" colspan="6" style="text-align: right;">
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
+							onclick="jyrTjSearch()"/>
+					</td>
+					<td class="tdcontent">
+							<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png"  style="margin-left: 40px;"
+								onclick="printJyrTjInfo()" title="打印"/>
+					</td>
+				</tr>
+			</table>
+		</div>
 	<table id="tj-grid-table" style = "width:100%;"></table>
 		<div id="tj-grid-pager" style = "width:100%;"></div>
 <script src="<%=base%>/static/js/jyr/JyrTjcxInfo.js"></script>	

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

@@ -1,5 +1,55 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
+	<div class="p_searchdiv" style = "width:100%;display:block;">
+			<table class="tabsearch" style = "width:100%; margin-top: 10px;">
+				<tr class="trsearch">
+					<td class="tdname">所在地</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="wxszd" name = "szd">
+						
+						</select>	
+					</td>
+					<td class="tdname">地区</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="wxqylx" name = "qylx">
+							<option value = "">--请选择--</option>
+							<option value = "1">沿江企业</option>
+							<option value = "2">沿海企业</option>
+							<option value = "3">内河企业</option>
+						</select>
+					</td>
+					<td class="tdname">统计时间：起</td>
+					<td class="tdcontent">
+						<input id="kssj" class="easyui-datetimebox" 
+							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
+							 style="width:80%;height: 34px;" type="text"/>
+					</td>
+					<td class="tdname">统计时间：止</td>
+					<td class="tdcontent">
+						<input id="jssj" class="easyui-datetimebox" 
+							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
+							 style="width:80%;height: 34px;" type="text"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="tdname">类别</td>
+					<td class="tdcontent" id = "wxbyzd" colspan="3">
+						<input id="wxbyzd1" name = "wxbyzd" type="checkbox" value = "、危险货物集装箱码头" onchange="getjyrbyzd()" />危险货物集装箱码头
+						<input id="wxbyzd2" name = "wxbyzd" type="checkbox" value = "、石油化工码头" onchange="getjyrbyzd()"/>石油化工码头
+						<input id="wxbyzd3" name = "wxbyzd" type="checkbox" value = "、危险货物非石油化工码头" onchange="getjyrbyzd()"/>危险货物非石油化工码头
+					</td>
+					<td class="tdname"></td>
+					<td class="tdcontent" colspan="2"style="text-align: right;">
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
+							onclick="jyrWxTjsearch()"/>
+					</td>
+					<td class="tdcontent">
+							<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png"  style="margin-left: 40px;"
+								onclick="printJyrWxhuTjInfo()" title="打印"/>
+					</td>
+				</tr>
+			</table>
+		</div>
 	<table id="whtj-grid-table" style = "width:100%;"></table>
 		<div id="whtj-grid-pager" style = "width:100%;"></div>
 <script src="<%=base%>/static/js/jyr/JyrWxhwtjcxInfo.js"></script>	

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

@@ -0,0 +1,38 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	<div class="p_searchdiv" style = "width:100%;display:block;">
+			<table class="tabsearch" style = "width:100%;margin-top: 10px;">
+				<tr class="trsearch">
+					<td class="tdname">所在地</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="wcszd" name = "szd">
+						
+						</select>	
+					</td>
+					<td class="tdname">地区</td>
+					<td class="tdcontent">
+						<select class="form-control" id ="wcqylx" name = "qylx">
+							<option value = "">--请选择--</option>
+							<option value = "1">沿江企业</option>
+							<option value = "2">沿海企业</option>
+							<option value = "3">内河企业</option>
+						</select>
+					</td>
+					<td class="tdname"></td>
+					<td class="tdcontent" colspan="2">
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
+							onclick="jyrWxcgSearch()"/>
+					</td>
+					<td class="tdcontent">
+							<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png"  style="margin-left: 40px;"
+								onclick="printJyrWxcgTjInfo()" title="打印"/>
+					</td>
+				</tr>
+				<tr>
+					
+				</tr>
+			</table>
+		</div>
+	<table id="wxcgtj-grid-table" style = "width:100%;"></table>
+		<div id="wxcgtj-grid-pager" style = "width:100%;"></div>
+<script src="<%=base%>/static/js/jyr/WxcgtjcxInfo.js"></script>	

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

@@ -44,7 +44,7 @@
 					<td class="tdname"></td>
 					<td class="tdcontent" colspan="5">
 						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="²éѯ"
-							onclick="searchRecord()"/>
+							onclick="wxhwSearch()"/>
 					</td>
 				</tr>
 			</table>

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

@@ -156,7 +156,7 @@
 									</button>
 							   </div>
 						</div> 
-				        <%@ include file="../jyr/AddOrEditInfo.jsp"%>    
+				        <%@ include file="../jyr/JyrInfo.jsp"%>    
 				    </div>   
 				    <div title="泊位信息" data-options="iconCls:'icon-reload',closable:true" style="overflow:auto;padding:20px;display:none;">   
 				        <%@ include file="../jyr/BwInfo.jsp"%>   
@@ -172,10 +172,18 @@
 					
 		</div>
 		
-		<div id="jyrinfo" class="easyui-window" title="编辑" style="width:100%;height: 100%;"    
+		<div id="jyrTjxxinfo" class="easyui-window" title="统计信息" style="width:100%;height: 100%;"    
        		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
        		  <%@ include file="../jyr/JyrTjcxInfo.jsp"%>
        	</div>
+       	<div id="jyrWhTjxxinfo" class="easyui-window" title="危货企业统计信息" style="width:100%;height: 100%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+       		  <%@ include file="../jyr/JyrWxhwtjcxInfo.jsp"%>
+       	</div>
+       	<div id="jyrWhcgTjxxinfo" class="easyui-window" title="危货存储设施统计信息" style="width:100%;height: 100%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+       		  <%@ include file="../jyr/WxcgtjcxInfo.jsp"%>
+       	</div>
 </div>
 <!-- 头部 -->
 <div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">

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

@@ -0,0 +1,103 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	
+	   	 <form class="form-horizontal" id="jyrUserInfoform" method="post"  enctype="multipart/form-data" >
+		    <input type="hidden" id="id" name="id">
+			
+	    	<div class="form-group">
+		        <label class="col-sm-2 control-label" for="szd2">姓名</label>
+				<div class="col-sm-4">
+					<input id="userxm" name="xm" type="text" class="form-control"/>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-2 control-label" for="gkjyr2">证件类型</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="zjlx" name = "zjlx">
+						
+					</select>
+				</div>
+				<label class="col-sm-1 control-label" for="yzbm">证件号码</label>
+				<div class="col-sm-4">
+					<input class="form-control" id="userzjhm" name="sfzh"
+						type="text" placeholder="" />
+				</div>
+			</div> 
+			<div class="form-group">
+				 <label class="col-sm-2 control-label">所在地</label>
+				<div class="col-sm-4" id="lb">
+					<select class="form-control" id ="jyrszd" name = "szd">
+						
+					</select>
+				</div>
+				<label class="col-sm-1 control-label">所在港区</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="userssgq" name = "ssgq">
+						
+					</select>
+				</div>
+			</div>
+			
+			<div class="form-group">
+				 <label class="col-sm-2 control-label" for="bgdz">港口经营人名称</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="ssjyr" name = "ssjyr">
+						
+					</select>
+				</div>
+				<label class="col-sm-1 control-label" for="gkjyxkzh">人员类型</label>
+				<div class="col-sm-4">
+					<select class="form-control" id ="userrylx" name = "rylx">
+						
+					</select>
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-2 control-label" for="gkjyxkzh">职务</label>
+				<div class="col-sm-4">
+					<input type="text" id = "userzwhzc" name = "zwhzc" class="form-control"/>
+				</div>
+				<label class="col-sm-1 control-label" for="fzrq">联系电话</label>
+				<div class="col-sm-4">
+					<input type="text" id = "lxdh" name = "lxdh" class="form-control"/>
+				</div>
+			</div>
+			<div class="form-group">
+				 <label class="col-sm-2 control-label" for="fzjg">备注</label>
+				<div class="col-sm-9">
+					<textarea id = "bz" name = "bz" class="form-control"></textarea>
+				</div>
+				
+			</div>
+			<div style="padding-left: 20px;">
+					<table class="easyui-datagrid" style="width:97%;height: 80%; padpadding:10px;" id="zstbl"
+					        data-options="fitColumns:true,singleSelect:true,striped:true">   
+					    <thead>   
+					        <tr>   
+					        	<th data-options="field:'id',width:20,align:'center',hidden:true">id</th>
+					            <th data-options="field:'zsmc',width:20,align:'center'">证书名称</th>   
+					            <th data-options="field:'zszl',width:15,align:'center'">证书种类</th>   
+					            <th data-options="field:'zsbh',width:20,align:'center'">证书编号</th>   
+					            <th data-options="field:'yxq',width:20,align:'center'">有效期</th>
+					            <th data-options="field:'zs',width:20,align:'center'">证书</th>
+					            <th data-options="field:'manage',width:20,align:'center'">操作</th>
+					        </tr>   
+					    </thead>   
+					</table>  
+					<div id="tab-tools" style="margin-top:10px;">
+				    	<div class="center-block" style="width:160px; margin-left: 0px;" >
+						      	<button type="button" class="btn btn-success btn-round btn-sm"
+								onclick="addJyrUserZS()" >新增
+						</button>
+						 </div>
+					</div>
+				</div>
+	  	 </form>
+				
+				
+			<div id="jyrUserZsinfo" class="easyui-window" title="人员证书信息新增" style="width:30%;height: 40%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+       		  	<%@ include file="../jyrUser/JyrUserZsInfo.jsp" %>
+       		</div>
+
+<script src="<%=request.getContextPath()%>/static/js/jyrUser/JyrUserInfo.js"></script>

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

@@ -0,0 +1,68 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+	   	 <form class="form-horizontal" id="jyrUserZsInfoform" method="post"  enctype="multipart/form-data" action="<%=request.getContextPath()%>"/jyrUser/saveBlob"" >
+		    <input type="hidden" id="id" name="id">
+			<input type="hidden" id="index" name="index">
+	    	<div class="form-group">
+		        <label class="col-sm-2 control-label" for="szd2">证书名称</label>
+				<div class="col-sm-9">
+					<input id="zsmc" name="zsmc" type="text" class="form-control"/>
+				</div>
+			</div>
+			<div class="form-group">
+				<label class="col-sm-2 control-label" for="gkjyr2">证书种类</label>
+				<div class="col-sm-9">
+					<input id="zszl" name="zszl" type="text" class="form-control"/>
+				</div>
+				
+			</div> 
+			<div class="form-group">
+				<label class="col-sm-2 control-label" for="gkjyr2">证书编号</label>
+				<div class="col-sm-9">
+					<input id="zsbh" name="zsbh" type="text" class="form-control"/>
+				</div>
+				
+			</div>
+			<div class="form-group">
+				<label class="col-sm-2 control-label" for="gkjyr2">有效期</label>
+				<div class="col-sm-9">
+					<input id="yxq" name="yxq" type="text" class="easyui-datetimebox form-control" 
+							 data-options="showSeconds:false,formatter:formatterDateNotsfm" style="width:100%;height: 34px;"/>
+				</div>
+				
+			</div>
+			<div class="form-group">
+				<label class="col-sm-2 control-label" for="gkjyr2">附件上传</label>
+				<div class="col-sm-5">
+					<input id="lefile" name = "file" type="file" style="display:none">
+					<div class="input-append">
+						<input id="zsfile" name = "file"  class="input-large form-control" type="text" >
+					</div>
+				</div>
+				<div class="col-sm-5">
+						<button type="button" class="btn btn-success btn-round btn-sm"
+								onclick="$('input[id=lefile]').click();">
+								<i class="glyphicon glyphicon-ok" ></i> 浏览
+						</button>
+						<button type="button" class="btn btn-grey btn-round btn-sm"
+								onclick="deletFile()">
+								<i class="glyphicon glyphicon-remove"></i> 删除
+						</button>
+				</div>
+			</div>
+			<div id="tab-tools" style="margin-bottom:10px;">
+			    	<div class="center-block" style="width:160px; margin-left: auto;" >
+					      	<button type="button" class="btn btn-success btn-round btn-sm"
+								onclick="saveUserZs();">
+								<i class="glyphicon glyphicon-ok"></i> 保存
+							</button>
+							<button type="button" class="btn btn-grey btn-round btn-sm"
+								onclick="closeUserZsWin()">
+								<i class="glyphicon glyphicon-remove"></i> 关闭
+							</button>
+					 </div>
+			</div>
+	  	 </form>
+			
+
+<script src="<%=request.getContextPath()%>/static/js/jyrUser/JyrUserZsInfo.js"></script>

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

@@ -0,0 +1,155 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+<!DOCTYPE html>
+<html>
+<head>
+<title>经营人人员管理</title>
+<%@ include file="../../layouts/header.jsp"%>
+<link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/bootstrap-select/css/bootstrap-select.min.css" />
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+
+<script src="<%=base%>/static/js/jyrUser/index.js"></script>
+	<style type="text/css">
+		.tdname{font-weight: bolder;}
+		
+	</style>
+</head>
+
+<body class="p_body">
+<div class="easyui-layout" data-options="fit:true">
+<!-- 内容部分 -->
+<div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
+	<div class="p_all">
+	<div class="p_block">
+		<div class="p_headdiv">
+			<div class="p_headblock">
+				<div class="p_headleft">经营人人员管理</div>
+			</div>
+		</div>
+		<div class="p_buttondiv">
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" 
+					onclick="addJyrUserInfo()" title="新增"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" 
+					onclick="delInfo()" title="删除"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" 
+					onclick="editInfo()" title="编辑"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" 
+					onclick="showSearch()" title="查询"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png" 
+					onclick="printInfo()" title="打印"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
+					onclick="" title="统计信息"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
+					onclick="" title="复制"/>
+			</div>
+			<div class="p_buttonbg">
+				<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
+					onclick="" title="导入模板"/>
+					
+			</div>
+		</div>
+		<div class="p_searchdiv">
+			<table class="tabsearch">
+				<tr class="trsearch">
+					<td class="tdname">所在地</td>
+					<td class="tdcontent">
+						<select class="p_txt" id ="szd" name = "szd" onchange="getgq()">
+							<option value = "">--请选择--</option>
+							<c:forEach items="${code }" var="code">
+								<option value = "${code.optVal }">${code.optName}</option>
+							</c:forEach>	
+						</select>
+					</td>
+					<td class="tdname">所在港区 </td>
+					<td class="tdcontent">
+						<select class="p_txt" id ="ssgq" name = "ssgq">
+							<option value = "">--请选择--</option>
+						</select>
+					</td>
+					<td class="tdname">港口经营人名称</td>
+					<td class="tdcontent">
+						<select id="gkjyr" name = "gkjyr" class="p_txt" >
+							<option value= "">--请选择--</option>
+						</select>	
+					</td>
+				</tr>
+				<tr class="trsearch">
+					<td class="tdname">人员类型</td>
+					<td class="tdcontent">
+						<select id="rylx" name = "rylx" class="p_txt" >
+							<option value = "">--请选择--</option>
+							<c:forEach items="${rylx }" var="rylx">
+								<option value = "${rylx.optVal }">${rylx.optName}</option>
+							</c:forEach>	
+						</select>	
+						
+					</td>
+					<td class="tdname">姓名</td>
+					<td class="tdcontent">
+						<input type="text" id="xm" name="xm" class="p_txt"/>
+					</td>
+					<td class="tdname">职务 </td>
+					<td class="tdcontent">
+						<input type="text" id="zwhzc" name="zwhzc" class="p_txt"/>
+					</td>
+					<td class="tdname">
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
+							onclick="searchRecord()"/>
+					</td>
+				</tr>
+				
+			</table>
+		</div>
+		<div class="page-content">
+			<!--列表部分-->
+			<table id="grid-table"></table>
+			<div id="grid-pager"></div>
+		</div>
+	</div>
+	</div>
+		<div id="jyrUserwin" class="easyui-window" title="编辑" style="width:40%;height: 60%;"    
+       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+       		  <div id="tab-tools" style="margin-bottom:10px;">
+			    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
+					      	<button class="btn btn-success btn-round btn-sm"
+								onclick="eidit()">
+								<i class="glyphicon glyphicon-ok"></i> 保存
+							</button>
+							<button type="button" class="btn btn-grey btn-round btn-sm"
+								onclick="closeWin()">
+								<i class="glyphicon glyphicon-remove"></i> 关闭
+							</button>
+					 </div>
+			</div>
+			<%@ include file="../jyrUser/JyrUserInfo.jsp" %>
+		</div>
+</div>
+<!-- 头部 -->
+<div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
+	<%@ include file="../../layouts/navbar.jsp"%>
+</div>
+<!-- 左边部分 -->
+<div id="regionWest" data-options="region:'west'" class="regionWestStyle">
+	<%@ include file="../../layouts/sidebar.jsp"%>
+</div>
+<!-- 底部 -->
+<div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
+	<%@ include file="../../layouts/footer.jsp"%>
+</div>
+</div>
+</body>
+</html>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/sidebar.jsp

@@ -4,6 +4,7 @@
 &emsp;&emsp;<a href="#" onclick="linkUrl('user')">用户管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('menu')">菜单管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('jyr')">经营人管理</a><br>
+&emsp;&emsp;<a href="#" onclick="linkUrl('jyrUser')">经营人人员管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('dict')">字典管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('xzqh')">行政区划管理</a><br>
 &emsp;&emsp;<a href="#" onclick="linkUrl('param')">参数管理</a><br>

gkaqv2/trunk/modules/web/src/main/webapp/static/js/index.js

@@ -14,7 +14,7 @@ function linkUrl(url) {
  * 移入事件
  * @param obj
  */
-function showBorder(obj){
+function showBorder(obj){
 	closeFlag();
 	openFlag(obj);
 }
@@ -22,7 +22,7 @@ function showBorder(obj){
  * 移出事件
  * @param obj
  */
-function hideBorder(obj){
+function hideBorder(obj){
 	closeFlag();
 	//$("#"+obj).css("display","none");
 	setTimeout(function() {$("#"+obj).css("display","none");}, 200);

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/JyrInfo.js

@@ -327,9 +327,10 @@ function getqylb () {
 function selectWxhw () {
 	//获得先已有的危险物品
 	zywxhwpm = $("#zywxhwpm").text();
+	
+	$("#wh").window('open');//打开弹窗
 	wxhw_initGrid($("#szd2").val());//加载弹窗中的数据表格
 	showSearch();//显示弹窗中的条件查询的元素
-	$("#wh").window('open');//打开弹窗
 }
 /**
  * 是否自动审批的checked
@@ -380,6 +381,24 @@ function editJyr () {
 	
 }
 
+function clickfile() {
+	$("#fileUp").window('open');//打开弹窗
+}
+
+function addRow()
+{
+ var tr = document.getElementById("myTr");
+ var con = tr.cloneNode(true);  
+ con.removeAttribute("style"); 
+ tr.parentNode.insertAdjacentElement("beforeEnd",con);  
+}
+function delRow(obj)
+{
+ var tr=obj.parentNode.parentNode;    
+ tr.parentNode.removeChild(tr); 
+}
+
+
 formatterDate = function (date) {
 	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
 	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/JyrTjcxInfo.js

@@ -128,26 +128,26 @@ function tj_initGrid() {
 				return row.sl;
 			}
 		},{
-			name : 'wxsj',
-			index : 'wxsj',
+			name : 'wxsl',
+			index : 'wxsl',
 			editable : false,
 			sortable : false,
 			formatter : function (cel,opt,row) {
-				if (row.wxsj == null || row.wxsj == '' ) {
+				if (row.wxsl == null || row.wxsl == '' ) {
 					return 0;
 				}
-				return row.wxsj;
+				return row.wxsl;
 			}
 		},{
-			name : 'rl',
-			index : 'rl',
+			name : 'rj',
+			index : 'rj',
 			editable : false,
 			sortable : false,
 			formatter : function (cel,opt,row) {
-				if (row.rl == null || row.rl == '' ) {
+				if (row.rj == null || row.rj == '' ) {
 					return 0;
 				}
-				return row.rl;
+				return row.rj;
 			}
 		}],
 		rowNum : _rowNum, //每页显示记录数
@@ -157,9 +157,9 @@ function tj_initGrid() {
 		rownumbers : true,
 		pagerpos : 'center', //指定分页栏的位置
 		altRows : true, //设置为交替行表格,默认为false
-		multiselect : true, //可以多选://控制是否有chechbox选择框
-		multiboxonly : true, //只有选择checkbox才会起作用 
-		multiselect :true, //是否可以多选
+		multiselect : false, //可以多选://控制是否有chechbox选择框
+		multiboxonly : false, //只有选择checkbox才会起作用 
+		multiselect :false, //是否可以多选
 		loadComplete : function() {
 			var table = this;
 			setTimeout(function() {
@@ -198,8 +198,22 @@ function tj_initGrid() {
 	ajustJqGrid(tj_grid_selector, tj_pager_selector);
 	 
 };
+//查询
+function jyrTjSearch () {
+	var szd = $("#tjszd").val();
+	var qylx = $("#tjqylx").val();
+	var qstime = $("#tjqstime").datetimebox("getValue");
+	var jstime = $("#tjjstime").datetimebox("getValue");
+	jQuery(tj_grid_selector).jqGrid(
+								'setGridParam',
+								{postData :{"szd":szd,"qylx":qylx,"qstime":qstime,"jstime":jstime}}
+	).trigger("reloadGrid", [{ page: 1 }]);
+}
 
 
+function printJyrTjInfo () {
+	location.href = basePath + '/tjcx/printJyrTjInfo';
+}
 /**
  * 关闭当前窗口
  */

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/JyrWxhwtjcxInfo.js

@@ -32,13 +32,7 @@ function whtj_initGrid() {
 			name : 'gkjyr',
 			index : 'gkjyr',
 			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.syhgmt == null || row.syhgmt == '' ) {
-					return 0;
-				}
-				return row.syhgmt;
-			}
+			sortable : false
 		},{
 			name : 'byzd1',
 			index : 'byzd1',
@@ -53,12 +47,24 @@ function whtj_initGrid() {
 			name : 'wd',
 			index : 'wd',
 			editable : false,
-			sortable : false
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.wd == null || row.wd == '' ) {
+					return 0;
+				}
+				return row.wd;
+			}
 		},{
 			name : 'qd',
 			index : 'qd',
 			editable : false,
-			sortable : false
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.qd == null || row.qd == '' ) {
+					return 0;
+				}
+				return row.qd;
+			}
 		},{
 			name : 'jzxttl',
 			index : 'jzxttl',
@@ -83,7 +89,13 @@ function whtj_initGrid() {
 			name : 'sffz',
 			index : 'sffz',
 			editable : false,
-			sortable : false
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.sffz == null || row.syhgmt == '' ) {
+					return "否";
+				}
+				return "是";
+			}
 		},{
 			name : 'hz',
 			index : 'hz',
@@ -93,7 +105,18 @@ function whtj_initGrid() {
 			name : 'qylx',
 			index : 'qylx',
 			editable : false,
-			sortable : false
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.qylx == '1') {
+					return "沿江";
+				}
+				if (row.qylx == '2') {
+					return "沿海";
+				}
+				if (row.qylx == '3') {
+					return "内河";
+				}
+			}
 		}],
 		rowNum : _rowNum, //每页显示记录数
 		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
@@ -102,9 +125,9 @@ function whtj_initGrid() {
 		rownumbers : true,
 		pagerpos : 'center', //指定分页栏的位置
 		altRows : true, //设置为交替行表格,默认为false
-		multiselect : true, //可以多选://控制是否有chechbox选择框
-		multiboxonly : true, //只有选择checkbox才会起作用 
-		multiselect :true, //是否可以多选
+		multiselect : false, //可以多选://控制是否有chechbox选择框
+		multiboxonly : false, //只有选择checkbox才会起作用 
+		multiselect :false, //是否可以多选
 		loadComplete : function() {
 			var table = this;
 			setTimeout(function() {
@@ -142,8 +165,51 @@ function whtj_initGrid() {
 	// 调整jqgrid
 	ajustJqGrid(whtj_grid_selector, whtj_pager_selector);
 	 
-};
+}; 
 
+/**
+ * 获取查询选中的类别
+ */
+function getjyrbyzd () {
+	var byzd1="";
+	var a = $("#wxbyzd").find("input");
+	for (var i = 0; i<a.length; i++) {
+		if (a[i].checked) {
+			byzd1 += a[i].value + ",";
+		} else {
+			byzd1=byzd1.replace(a[i].value + ",",""); 
+			
+		}
+	}
+	return byzd1;
+}
+//查询
+function jyrWxTjsearch () {
+	var szd = $("#wxszd").val();
+	var qylx = $("#wxqylx").val();
+	var qstime = $("#kssj").datetimebox("getValue");
+	var jstime = $("#jssj").datetimebox("getValue");
+	var wxbyzd1 ="";
+	var wxbyzd2 ="";
+	var wxbyzd3 ="";
+	var str = getjyrbyzd();
+	str = str.split(",");
+	for ( var i = 0; i < str.length; i++) {
+		if (i == 0) {
+			wxbyzd1 = str[i];
+		}
+		if (i == 1) {
+			wxbyzd2 = str[i];
+		}
+		if (i == 2) {
+			wxbyzd3 = str[i];
+		}
+	}
+	jQuery(whtj_grid_selector).jqGrid(
+								'setGridParam',
+								{postData : {"szd":szd,"qylx":qylx,"kssj":qstime,"jssj":jstime,"byzd1":wxbyzd1,"byzd2":wxbyzd2,"byzd3":wxbyzd3}}
+	).trigger("reloadGrid", [{ page: 1 }]);
+}
 
 /**
  * 关闭当前窗口
@@ -152,6 +218,9 @@ function closeWh() {
 	$("#wh").window('close');
 }
 
+function printJyrWxhuTjInfo () {
+	location.href = basePath + '/jyrwxhw/printJyrWxhuTjInfo';
+}
 formatterDate = function (date) {
 	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
 	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/WxcgtjcxInfo.js

@@ -0,0 +1,171 @@
+/**
+ * js
+ */
+var wxcgtj_grid_selector = "#wxcgtj-grid-table";
+var wxcgtj_pager_selector = "#wxcgtj-grid-pager";
+jQuery(function($) {
+	// 初始化Grid
+});
+
+
+/**
+ * 初始化Grid
+ */
+function wxcgtj_initGrid() {
+	// 数据表格初始化
+	jQuery(wxcgtj_grid_selector).jqGrid({
+		url : basePath + '/wxcg/list',
+		mtype : "POST", //提交方式
+		datatype : "json",
+		autowidth: false,
+		height :"auto",
+	    shrinkToFit: true,
+		sortname : "", //默认的排序列
+		sortorder : "", //默认的排序列
+		colNames : ['所在地','企业名称','类别','个数','容积(万立方)','型号个数(万立方*个)','主要作业货种','重大危险源储罐(个)','所在区域'],
+		colModel : [ {
+			name : 'bz',
+			index : 'bz',
+			editable : false,
+			sortable : false
+		},{
+			name : 'gkjyr',
+			index : 'gkjyr',
+			editable : false,
+			sortable : false
+		},{
+			name : 'byzd1',
+			index : 'byzd1',
+			editable : false,
+			sortable : false
+		},{
+			name : 'sl',
+			index : 'sl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'rj',
+			index : 'rj',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.rj == null || row.rj == '' ) {
+					return 0;
+				}
+				return row.rj;
+			}
+		},{
+			name : 'xhgs',
+			index : 'xhgs',
+			editable : false,
+			sortable : false
+		},{
+			name : 'hz',
+			index : 'hz',
+			editable : false,
+			sortable : false
+		},{
+			name : 'wxsl',
+			index : 'wxsl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'qylx',
+			index : 'qylx',
+			editable : false,
+			sortable : false,
+			formatter : function (cel,opt,row) {
+				if (row.qylx == '1') {
+					return "沿江";
+				}
+				if (row.qylx == '2') {
+					return "沿海";
+				}
+				if (row.qylx == '3') {
+					return "内河";
+				}
+			}
+		}],
+		rowNum : _rowNum, //每页显示记录数
+		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
+		pager : wxcgtj_pager_selector, //定义翻页用的导航栏
+		page : 1, //设置初始的页码,初始为1
+		rownumbers : true,
+		pagerpos : 'center', //指定分页栏的位置
+		altRows : true, //设置为交替行表格,默认为false
+		multiselect : false, //可以多选://控制是否有chechbox选择框
+		multiboxonly : false, //只有选择checkbox才会起作用 
+		multiselect :false, //是否可以多选
+		loadComplete : function() {
+			var table = this;
+			setTimeout(function() {
+				updatePagerIcons(table);
+				enableTooltips(table);
+				
+			}, 0);
+		},
+		prmNames : {
+             oper : "oper",
+             page : "page",
+             rows : "rows",
+             sort : "sidx",
+             order : "sord"
+        },
+		jsonReader : {
+			root : "list", // json中代表实际模型数据的入口
+			page : "page", // json中代表当前页码的数据
+			total : "pages", // json中代表页码总数的数据
+			records : "total", // json中代表数据行总数的数据
+			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
+		},
+        gridComplete: function () {
+        	$("#gbox_wxcgtj-grid-table").attr("style","width:100%;");
+            $("#gbox_wxcgtj-grid-table").find("div").attr("style","width:100%;");
+            $("#gview_wxcgtj-grid-table").children("div:first").attr("hidden","true");
+            $("#gbox_wxcgtj-grid-table").find("table").attr("style","width:100%;");
+            comGridComplete("wxcgtj-grid-table", "editRecord");
+            
+        },
+		onPaging: function(){
+			comGridPage("wxcgtj-grid-table");
+		}
+	});
+	// 调整jqgrid
+	ajustJqGrid(wxcgtj_grid_selector, wxcgtj_pager_selector);
+	 
+};
+function jyrWxcgSearch () {
+	alert(1);
+	var szd = $("#wcszd").val();
+	var qylx = $("#wcqylx").val();
+	jQuery(wxcgtj_grid_selector).jqGrid('setGridParam',{postData : {"szd":szd,"qylx":qylx}}).trigger("reloadGrid", [{ page: 1 }]);
+	
+}
+
+/**
+ * 关闭当前窗口
+ */
+function closeWh() {
+	$("#wh").window('close');
+}
+
+function printJyrWxcgTjInfo () {
+	location.href = basePath + '/wxcg/printJyrWxcgTjInfo';
+}
+
+formatterDate = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	var hor = date.getHours();
+	var min = date.getMinutes();
+	var sec = date.getSeconds();
+	return date.getFullYear() + '-' + month + '-' + day+" "+hor+":"+min+":"+sec;
+};
+
+formatterDateNotsfm = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	return date.getFullYear() + '-' + month + '-' + day;
+};

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/WxhwName.js

@@ -6,15 +6,13 @@ var wxhw_pager_selector = "#wxhw-grid-pager";
 jQuery(function($) {
 	// 初始化Grid
 });
-
+var mchsm = "";
 
 /**
  * 初始化Grid
  */
 function wxhw_initGrid(szd) {
-//	resizePageGrid(grid_selector);
 	// 数据表格初始化
-//	jQuery(wxhw_grid_selector).jqGrid("clearGridData");
 	jQuery(wxhw_grid_selector).jqGrid({
 		url : basePath + '/wxhw/list',
 		mtype : "POST", //提交方式
@@ -56,7 +54,7 @@ function wxhw_initGrid(szd) {
 		pagerpos : 'center', //指定分页栏的位置
 		altRows : true, //设置为交替行表格,默认为false
 		multiselect : true, //可以多选://控制是否有chechbox选择框
-		multiboxonly : true, //只有选择checkbox才会起作用 
+		multiboxonly : false, //只有选择checkbox才会起作用 
 		multiselect :true, //是否可以多选
 		loadComplete : function() {
 			var table = this;
@@ -91,6 +89,17 @@ function wxhw_initGrid(szd) {
             comGridComplete("wxhw-grid-table", "editRecord");
             
         },
+        onSelectRow: function (rowid,status) {
+        	if (status) {
+        		var data = jQuery("#wxhw-grid-table").jqGrid('getRowData', rowid);
+        		mchsm += data.mchsm + ";";
+        	} else {
+        		var data = jQuery("#wxhw-grid-table").jqGrid('getRowData', rowid);
+        		mchsm = mchsm.replace(data.mchsm+";", "");
+        	}
+        	
+        	
+        },
 		onPaging: function(){
 			comGridPage("wxhw-grid-table");
 		}
@@ -100,25 +109,21 @@ function wxhw_initGrid(szd) {
 	ajustJqGrid(wxhw_grid_selector, wxhw_pager_selector);
 	 
 };
+//危险物品名称查询
+function wxhwSearch () {
+	jQuery(wxhw_grid_selector).jqGrid(
+			'setGridParam',
+			{postData :{"bh":$("#bh").val(),"mchsm":$("#mchsm").val(),"lbhxb":$("#lbhxb").val()}}
+	).trigger("reloadGrid", [{ page: 1 }]);
+}
+
 /**
  * 将选中的危险物品放入到上层window的页面元素中
  */
 function checked () {
-	var mchsm="";
-	//获取选择行的id
-	var row = jQuery("#wxhw-grid-table").jqGrid('getGridParam','selarrrow');
-	if (row.length >= 1) {
-		for (var i = 0; i < row.length; i++) {
-			//获取选择的行的数据，只要传入rowId即可
-			var data = jQuery("#wxhw-grid-table").jqGrid('getRowData', row[i]);
-			if (i == row.length-1 ){
-				mchsm += data.mchsm;
-			} else {
-				mchsm += data.mchsm + "；";
-			}
-		}
-	}
-	$("#win").find("#zywxhwpm").val(mchsm);
+	var data = mchsm.substring(0, mchsm.length-1);
+	$("#jyrwin").find("#zywxhwpm").val(data);
+	mchsm="";
 	$("#wh").window('close');
 }
 

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/index.js

@@ -170,11 +170,13 @@ function initGrid() {
 				data : {"id":id},
 				url : basePath + '/jyr/initEdit',//请求的路径				
 				success : function(data) {
-//					$("#win").window("open");
-//					jyrmanageInfo(data);
 					$("#jyrwin").window({title:"查看"});
 					$("#jyrwin").window("open");
 					$("#jyrInfoform").form("reset");//重置表单数据
+					$("#jyrInfoform").find("input").attr("disabled","true");//禁用表单元素input
+					$("#jyrInfoform").find("select").attr("disabled","true");//禁用表单元素select
+					$("#jyrInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
+					$("#jyrInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
 					
 					$("#tab-tools").attr("hidden",true);
 					manageInfo(data);
@@ -340,10 +342,12 @@ function editInfo() {
  * 增加信息
  */
 function addJyrInfo() {
-	alert(1);
+	$("#jyrwin").window({title:"新增"});
 	$("#jyrwin").window("open");
 	$("#szd2").removeAttr("disabled");
-	$("#jyrwin").window({title:"新增"});
+	$("#tt").tabs("disableTab","泊位信息");
+	$("#tt").tabs("disableTab","堆场信息");
+	$("#tt").tabs("disableTab","仓库信息");
 	// 清空表单信息
 	comClearFormData("#jyrInfoform");
 	//加载数据
@@ -387,14 +391,40 @@ function delInfo() {
 		layer.alert("请选择记录");
 	}
 };
+/**
+ * 统计查询中，加载所在地的信息
+ */
+function initszd (select) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyr/getszd",
+		success : function (data) {
+			$(select).empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $(select).append(optionStr);
+		}
+	});
+}
 //统计信息查询
 function tjxx () {
-	$("#jyrinfo").window("open");
+	$("#jyrTjxxinfo").window("open");
+	initszd("#tjszd");
 	tj_initGrid();
 }
-
+//危险货物企业统计
 function whqy () {
-	alert($("#jyrinfo").html());
+	$("#jyrWhTjxxinfo").window("open");
+	initszd("#wxszd");
+	whtj_initGrid();
+}
+//危险储罐统计
+function ccss (){
+	$("#jyrWhcgTjxxinfo").window("open");
+	initszd("#wcszd");
+	wxcgtj_initGrid();
 }
 
 //加载行政区划下拉框选项
@@ -408,6 +438,12 @@ function xzqhSelect() {
      }
  });
 }
+
+function printInfo () {
+	location.href = basePath + '/jyr/printJyrInfo';
+}
+
+
 function closeWin () {
 	$("#jyrwin").window("close");
 }

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyrUser/JyrUserInfo.js

@@ -0,0 +1,290 @@
+
+/**
+ * 初始化
+ */
+jQuery(function($) {
+	// 初始化Grid
+});
+var gridData="";
+/**
+ * 数据处理
+ * @param data
+ */
+function JyrUserInfoInit (data) {
+	//加载所在地数据信息
+	getSzd(data.szd);
+	getInfo(data.szd,data.ssgq);
+	getzjlxInfo(data.zjlx);
+	getrylxInfo(data.rylx);
+	getJyrSelect(data.ssjyr);
+	
+	$("#id").val(data.id);
+	$("#userxm").val(data.xm);
+	$("#userzjhm").val(data.sfzh);
+	$("#userzwhzc").val(data.zwhzc);
+	$("#lxdh").val(data.lxdh);
+	$("#bz").val(data.bz);
+	loadZsData();
+}
+/**
+ * 下拉框绑定
+ */
+function getselectedInfo (souce,url,parama,select) {
+	$.ajax({
+		type : "post",
+		url : basePath + url,
+		data : parama,
+		success : function (data) {
+			$(select).empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (this.optVal == souce) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		        
+		    });
+		    $(select).append(optionStr);
+		}
+	});
+}
+/**
+ * 加载所在地信息
+ */
+function getSzd (scouse) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyrUser/getszd",
+		success : function (data) {
+			$("#jyrszd").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (scouse == this.optVal) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		        
+		    });
+		    $("#jyrszd").append(optionStr);
+		}
+	});
+	
+}
+
+
+/**
+ * 加载港口数据
+ * @param val
+ */
+function getInfo (val,souce) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyrUser/getGq",
+		data : {"szd": val},
+		success : function (data) {
+			$("#userssgq").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (souce == this.optVal) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		    });
+		    $("#userssgq").append(optionStr);
+		}
+	});
+}
+
+
+/**
+ * 加载证件类型
+ * @param val
+ */
+function getzjlxInfo (val) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyrUser/getzjlx",
+		success : function (data) {
+			$("#zjlx").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (val == this.optVal) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		    });
+		    $("#zjlx").append(optionStr);
+		}
+	});
+}
+/**
+ * 加载人员类型
+ * @param val
+ */
+function getrylxInfo (val) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyrUser/getRylx",
+		success : function (data) {
+			$("#userrylx").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (val == this.optVal) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		    });
+		    $("#userrylx").append(optionStr);
+		}
+	});
+}
+/**
+ * 加载港口经营人信息
+ * @param val
+ */
+function getJyrSelect (val) {
+	$.ajax({
+		type:"POST",
+		url:basePath+"/jyrUser/getJyr",
+		success:function (data) {
+			$("#ssjyr").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (val == this.optVal) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		    });
+		    $("#ssjyr").append(optionStr);
+		}
+	});
+}
+
+/**
+ * 保存修改
+ */
+function eidit () {
+	/*$.ajax({
+		type:"POST",
+		url:basePath+"/jyrUser/save",
+		data:$('#jyrUserInfoform').serialize(),
+		success:function (data){
+			// 成功删除后刷新页面
+            if (data && data.success == true) {
+                layer.alert("数据已成功保存！");
+                $("#jyrUserwin").window("close");
+                searchRecord();
+            } else {
+                layer.alert("数据保存失败！");
+            }
+		}
+	});*/
+	eiditRyzs ();
+}
+function eiditRyzs () {
+	var rows = $("#zstbl").datagrid("getRows");//获取当前所有行，返回对象数组
+	if (rows != null && rows.length>0) {
+		for ( var i = 0; i < rows.length; i++) {
+			$.ajax({
+				type:"POST",
+				url:basePath+"/jyrUser/save",
+				data:$('#jyrUserInfoform').serialize(),
+				success:function (data){
+					// 成功删除后刷新页面
+		            if (data && data.success == true) {
+		                layer.alert("数据已成功保存！");
+		                $("#jyrUserwin").window("close");
+		                searchRecord();
+		            } else {
+		                layer.alert("数据保存失败！");
+		            }
+				}
+			});
+		}
+		alert(rows);
+		console.log(rows);
+	}
+	
+}
+/**
+ * 加载经营人人员证书
+ */
+function loadZsData () {
+	if (gridData != "" && gridData != null) {
+		$("#zstbl").datagrid({
+			data:gridData
+		});
+	}
+}
+/**
+ * 添加证书
+ */
+function addJyrUserZS () {
+	$("#jyrUserZsinfo").window("open");
+	$("#jyrUserZsInfoform").form("reset");
+}
+/**
+ * 增加经营人证书
+ */
+function insertJyrUserZs () {
+	if (gridData != "" && gridData != null) {
+		$("#zstbl").datagrid('insertRow',{
+			row:gridData
+		});
+	}
+}
+/**
+ * 编辑证书
+ */
+function eiditUserFile () {
+	var row = $('#zstbl').datagrid('getSelected');
+	var index = $("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected'));
+	alert(index);
+	if (row != null) {
+		$("#jyrUserZsinfo").window("open");
+		$("#jyrUserZsInfoform").form("reset");
+		$("#zsmc").val(row.zsmc);
+		$("#zszl").val(row.zszl);
+		$("#zsbh").val(row.zsbh);
+		$("#yxq").datetimebox("setValue",row.yxq);
+		$("#zsfile").val(row.zs);
+		$("#index").val(index);
+	}
+}
+function eiditJyrUserZs () {
+	if (gridData != "" && gridData != null) {
+		$("#zstbl").datagrid('updateRow',{
+			index:gridData.index,
+			row:gridData
+		});
+	}
+}
+/**
+ * 删除证书
+ */
+function deleteUserFile () {
+	$("#zstbl").datagrid('deleteRow',$("#zstbl").datagrid("getRowIndex", $('#zstbl').datagrid('getSelected')));
+}
+
+formatterDate = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	var hor = date.getHours();
+	var min = date.getMinutes();
+	var sec = date.getSeconds();
+	return date.getFullYear() + '-' + month + '-' + day+" "+hor+":"+min+":"+sec;
+};
+
+formatterDateNotsfm = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	return date.getFullYear() + '-' + month + '-' + day;
+};

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyrUser/JyrUserZsInfo.js

@@ -0,0 +1,82 @@
+
+/**
+ * 初始化
+ */
+jQuery(function($) {
+	// 初始化Grid
+	
+	$('input[id=lefile]').change(function() {
+		 var file = document.getElementById('lefile').files[0];
+		$('#zsfile').val(file.name);
+	});
+	
+});
+/**
+ * 删除要上传的文件
+ */
+function deletFile () {
+	$('#zsfile').val("");
+	document.getElementById('lefile').value=null;
+}
+/**
+ * 保存要上传的文件
+ */
+function saveUserZs () {
+	$.ajax({
+		type:"POST",
+		url:basePath+"/jyrUser/saveBlob",
+		data:$('#jyrUserZsInfoform').serialize(),
+		success:function (data){
+			// 成功删除后刷新页面
+            if (data && data.success == true) {
+                layer.alert("数据已成功保存！");
+            } else {
+                layer.alert("数据保存失败！");
+            }
+		}
+	});
+	
+//	var file = document.getElementById('lefile').value;
+//	console.log(file);
+//	var manage = '<a onclick="eiditUserFile()">编辑</a>&nbsp;&nbsp;<a onclick="deleteUserFile()">删除</a>';
+//	var index = $("#index").val();
+//	gridData = {id:$("#id").val(),
+//				zsmc:$("#zsmc").val(),
+//				zszl:$("#zszl").val(),
+//				zsbh:$("#zsbh").val(),
+//				yxq:$("#yxq").datetimebox("getValue"),
+//				zs:$("#zsfile").val(),
+//				manage:manage,
+//				index:$("#index").val()
+//				};
+//	if (index != "" && index != null) {
+//		window.parent.eiditJyrUserZs();
+//	} else {
+//		window.parent.insertJyrUserZs();
+//	}
+//	$("#jyrUserZsinfo").window("close");
+}
+
+/**
+ * 关闭
+ */
+function closeUserZsWin () {
+	$("#jyrUserZsinfo").window("close");
+}
+
+formatterDate = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	var hor = date.getHours();
+	var min = date.getMinutes();
+	var sec = date.getSeconds();
+	return date.getFullYear() + '-' + month + '-' + day+" "+hor+":"+min+":"+sec;
+};
+
+formatterDateNotsfm = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	return date.getFullYear() + '-' + month + '-' + day;
+};

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyrUser/index.js

@@ -0,0 +1,308 @@
+/**
+ * 
+ */
+var grid_selector = "#grid-table";
+var pager_selector = "#grid-pager";
+var scouce;
+var jyrInfo;
+jQuery(function($) {
+	// 初始化Grid
+	initGrid();
+	getgq();
+	getJyrInfoSelect ();
+
+	
+});
+/**
+ * 初始化Grid
+ */
+function initGrid() {
+	//resize to fit page size
+	resizePageGrid(grid_selector);
+	// 数据表格初始化
+	jQuery(grid_selector).jqGrid({
+		url : basePath + '/jyrUser/list',
+		mtype : "POST", //提交方式
+		datatype : "json",
+		autowidth: false,
+		height :"auto",
+	    shrinkToFit: true,
+		sortname : "", //默认的排序列
+		sortorder : "", //默认的排序列
+		colNames : [ 'id','姓名','港口经营人名称','人员类型','职务','证书名称','证书种类','证书编号','有效期','所在地','所在港区','备注'],
+		colModel : [ {
+			name : 'id',
+			index : 'id',
+			key : true,
+			hidden:true,
+			editable : false,
+			sortable : false
+		},{
+			name : 'xm',
+			index : 'xm',
+			editable : false,
+			sortable : false
+		},{
+			name : 'jyrmc',
+			index : 'jyrmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'rylxmc',
+			index : 'rylxmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'zwhzc',
+			index : 'zwhzc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'zsmc',
+			index : 'zsmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'zszl',
+			index : 'zszl',
+			editable : false,
+			sortable : false
+		},{
+			name : 'zsbh',
+			index : 'zsbh',
+			editable : false,
+			sortable : false
+		},{
+			name : 'yxq',
+			index : 'yxq',
+			editable : false,
+			sortable : false
+		},{
+			name : 'szdmc',
+			index : 'szdmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'gqmc',
+			index : 'gqmc',
+			editable : false,
+			sortable : false
+		},{
+			name : 'bz',
+			index : 'bz',
+			editable : false,
+			sortable : false
+		}],
+		rowNum : _rowNum, //每页显示记录数
+		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
+		pager : pager_selector, //定义翻页用的导航栏
+		page : 1, //设置初始的页码,初始为1
+		rownumbers : true,
+		pagerpos : 'center', //指定分页栏的位置
+		altRows : true, //设置为交替行表格,默认为false
+		multiselect : true, //可以多选://控制是否有chechbox选择框
+		multiboxonly : true, //只有选择checkbox才会起作用 
+		loadComplete : function() {
+			var table = this;
+			setTimeout(function() {
+				updatePagerIcons(table);
+				enableTooltips(table);
+			}, 0);
+		},
+		prmNames : {
+             oper : "oper",
+             page : "page",
+             rows : "rows",
+             sort : "sidx",
+             order : "sord"
+        },
+		jsonReader : {
+			root : "list", // json中代表实际模型数据的入口
+			page : "page", // json中代表当前页码的数据
+			total : "pages", // json中代表页码总数的数据
+			records : "total", // json中代表数据行总数的数据
+			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
+		},
+        gridComplete: function () {
+            comGridComplete("grid-table", "editRecord");
+        },
+		onPaging: function(){
+			comGridPage("grid-table");
+		},
+		ondblClickRow : function (id,row,cel,eve) {
+			
+//			$.ajax({
+//				type : 'POST',
+//				dataType : "json",
+//				data : {"id":id},
+//				url : basePath + '/jyr/initEdit',//请求的路径				
+//				success : function(data) {
+//					$("#jyrwin").window({title:"查看"});
+//					$("#jyrwin").window("open");
+//					$("#jyrInfoform").form("reset");//重置表单数据
+//					$("#jyrInfoform").find("input").attr("disabled","true");//禁用表单元素input
+//					$("#jyrInfoform").find("select").attr("disabled","true");//禁用表单元素select
+//					$("#jyrInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
+//					$("#jyrInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
+//					
+//					$("#tab-tools").attr("hidden",true);
+//					manageInfo(data);
+//					$("#tt").tabs('enableTab',1);
+//					$("#tt").tabs('enableTab',2);
+//					$("#tt").tabs('enableTab',3);
+//					bw_initGrid(data[0].id);
+//					ck_initGrid(data[0].id);
+//					dc_initGrid(data[0].id);
+//				},
+//				error: function (XMLHttpRequest, textStatus, errorThrown) {
+//					alert("error");
+//		        }
+//			});
+			
+		}
+	});
+	// 调整jqgrid
+	ajustJqGrid(grid_selector, pager_selector);
+};
+
+/**
+ * 下拉框绑定
+ */
+function getselectedInfo (souce,url,parama,select) {
+	$.ajax({
+		type : "post",
+		url : basePath + url,
+		data : parama,
+		success : function (data) {
+			$(select).empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		    	if (this.optVal == souce) {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "' selected='selected'>" + this.optName + "</option>";
+		    	} else {
+		    		optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    	}
+		        
+		    });
+		    $(select).append(optionStr);
+		}
+	});
+}
+/**
+ * 选择所在地时联动港口信息
+ */
+function getgq () {
+	var val = $("#szd").val();
+	getgqInfo(val);
+	
+}
+
+/**
+ * 请求港口数据
+ * @param val
+ */
+function getgqInfo (val) {
+	$.ajax({
+		type : "post",
+		url : basePath + "/jyrUser/getGq",
+		data : {"szd": val},
+		success : function (data) {
+			$("#ssgq").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		        optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $("#ssgq").append(optionStr);
+		}
+	});
+}
+
+function getJyrInfoSelect () {
+	$.ajax({
+		type:"POST",
+		url:basePath+"/jyrUser/getJyr",
+		success:function (data) {
+			$("#gkjyr").empty();
+			var optionStr = "<option value = ''>--请选择--</option>";
+		    $.each(data, function() {
+		        optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";
+		    });
+		    $("#gkjyr").append(optionStr);
+		}
+	});
+}
+/**
+ * 查询
+ */
+function searchRecord () {
+	var szd = $("#szd").val();
+	var ssgq = $("#ssgq").val();
+	var jyr = $("#gkjyr").val();
+	var rylx = $("#rylx").val();
+	var xm = $("#xm").val();
+	var zwhzc = $("#zwhzc").val();
+	
+	jQuery(grid_selector).jqGrid('setGridParam',{postData :{"szd":szd,"ssgq":ssgq,"ssjyr":jyr,"rylx":rylx,"xm":xm,"zwhzc":zwhzc
+														}}).trigger("reloadGrid", [{ page: 1 }]);
+}
+
+
+/**
+ * 编辑信息
+ */
+function editInfo() {
+	// 获取选择行
+	var ids = getMultiData(grid_selector);
+	if(isNull(ids) || ids.indexOf(",")!=-1) {
+		layer.alert("请选择且只选择一条记录");
+	} else {
+	    $.ajax({
+			type : 'POST',
+			dataType : "json",
+			data : {"id":ids},
+			url : basePath + '/jyrUser/initEdit',//请求的路径				
+			success : function(data) {
+				$("#jyrUserwin").window({title:"编辑"});
+				$("#jyrUserwin").window("open");
+				$("#jyrUserInfoform").form("reset");//重置表单数据
+				JyrUserInfoInit(data);
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+	        }
+		});
+	}
+}; 
+/**
+ * 添加经营人人员信息
+ */
+function addJyrUserInfo () {
+	$("#jyrUserwin").window({title:"新增"});
+	$("#jyrUserwin").window("open");
+	comClearFormData("#jyrUserInfoform");
+}
+/**
+ * 删除经营人人员信息
+ */
+function delInfo () {
+	// 获取选择行
+	var ids = getMultiData(grid_selector);//此ids是多个id组成的字符串
+	if(!isNull(ids)) {
+		layer.confirm('确定删除吗?', {icon: 3, title:'提示'}, function(index){
+			$.ajax({
+				type : 'POST',
+				dataType : "json",
+				data : {"ids":ids},
+				url : basePath + '/jyrUser/delJyrUserInfo',//请求的路径				
+				success : function(data) {
+					layer.close(index);
+					searchRecord();
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+					layer.close(index);
+		        }
+			});
+		});
+	} else {
+		layer.alert("请选择记录");
+	}
+}

gkaqv2/trunk/modules/web/src/main/webapp/static/js/login.js

@@ -11,9 +11,9 @@ $(function () {
 	adjustBlock();
 });
 function keyLogin(){  
-    if (event.keyCode==13) {
-        login();
-    }
+//    if (event.keyCode==13) {
+//        login();
+//    }
 }
 /**
  * 窗口发生改变事件

gkaqv2/trunk/modules/web/src/main/webapp/static/js/user/index.js

@@ -1,7 +1,7 @@
 var grid_selector = "#grid-table";
 var pager_selector = "#grid-pager";
 var orgTree;
-//zTree鐨勫弬鏁伴厤缃�紝setting涓昏�鏄��缃�竴浜泃ree鐨勫睘鎬э紝鏄�湰鍦版暟鎹�簮锛岃繕鏄�繙绋嬶紝鍔ㄧ敾鏁堟灉锛屾槸鍚﹀惈鏈夊�閫夋�绛夌瓑
+//zTree的参数配置，setting主要是设置一些tree的属性，是本地数据源，还是远程，动画效果，是否含有复选框等等
 var setting = {
     view : {
         autoCancelSelected : false,
@@ -13,12 +13,12 @@ var setting = {
         url : basePath + "/org/tree"
     },
     data : {
-        // 绠€鍗曠殑鏁版嵁婧�
+        // 简单的数据源
         simpleData : {
             enable : true,
             idKey : "id",
             pIdKey : "pid",
-            rootPId : 0 // 鏍硅妭鐐�
+            rootPId : 0 // 根节点
         }
     },
     callback : {
@@ -105,9 +105,9 @@ jQuery(function($) {
         autoclose : true,
         minView : 2
     });
-    // 鍒濆�鍖朑rid
+    // 初始化Grid
     initGrid();
-    // 鍗曞嚮浜嬩欢
+    // 单击事件
     $('#ifAdminChk').click(ifAdminClick);
     $('#ifShipChk').click(ifShipClick);
     $('#ifJobChk').click(ifJobClick);
@@ -115,28 +115,28 @@ jQuery(function($) {
     $('#myModal').on('hide.bs.modal', function() {
         $('#myForm').bootstrapValidator('resetForm', false);
     });
-    // 鍒濆�鍖杬Tree瀵硅薄
+    // 初始化zTree对象
     orgTree = $.fn.zTree.init($("#orgTree"), setting);
 });
 
 /**
- * 鍒濆�鍖朑rid
+ * 初始化Grid
  */
 function initGrid() {
     // resize to fit page size
     resizeTreePageGrid(grid_selector);
-    // 鏁版嵁琛ㄦ牸鍒濆�鍖�
+    // 数据表格初始化
     jQuery(grid_selector).jqGrid({
         url : basePath + '/user/list',
-        mtype : "POST", // 鎻愪氦鏂瑰紡
+        mtype : "POST", // 提交方式
         datatype : "json",
         autowidth : false,
         height : "auto",
         shrinkToFit : true,
-        sortname : "", // 榛樿�鐨勬帓搴忓垪
-        sortorder : "", // 榛樿�鐨勬帓搴忓垪
+        sortname : "", // 默认的排序列
+        sortorder : "", // 默认的排序列
         colNames : [
-                'id', '鐢ㄦ埛鍚�', '鐧诲綍鍚�', '鎬у埆', '鑱旂郴鐢佃瘽'
+                'id', '用户名', '登录名', '性别', '联系电话'
         ],
         colModel : [
                 {
@@ -163,15 +163,15 @@ function initGrid() {
                     sortable : false
                 }
         ],
-        rowNum : _rowNum, // 姣忛〉鏄剧ず璁板綍鏁�
-        rowList : _rowList, // 鐢ㄤ簬鏀瑰彉鏄剧ず琛屾暟鐨勪笅鎷夊垪琛ㄦ�鐨勫厓绱犳暟缁勩€�
-        pager : pager_selector, // 瀹氫箟缈婚〉鐢ㄧ殑瀵艰埅鏍�
-        page : 1, // 璁剧疆鍒濆�鐨勯〉鐮�,鍒濆�涓�1
+        rowNum : _rowNum, // 每页显示记录数
+        rowList : _rowList, // 用于改变显示行数的下拉列表框的元素数组。
+        pager : pager_selector, // 定义翻页用的导航栏
+        page : 1, // 设置初始的页码,初始为1
         rownumbers : true,
-        pagerpos : 'center', // 鎸囧畾鍒嗛〉鏍忕殑浣嶇疆
-        altRows : true, // 璁剧疆涓轰氦鏇胯�琛ㄦ牸,榛樿�涓篺alse
-        multiselect : true, // 鍙�互澶氶€�
-        multiboxonly : true, // 鍙�湁閫夋嫨checkbox鎵嶄細璧蜂綔鐢�
+        pagerpos : 'center', // 指定分页栏的位置
+        altRows : true, // 设置为交替行表格,默认为false
+        multiselect : true, // 可以多选
+        multiboxonly : true, // 只有选择checkbox才会起作用
         loadComplete : function() {
             var table = this;
             setTimeout(function() {
@@ -187,12 +187,12 @@ function initGrid() {
             order : "sord"
         },
         jsonReader : {
-            root : "list", // json涓�唬琛ㄥ疄闄呮ā鍨嬫暟鎹�殑鍏ュ彛
-            page : "page", // json涓�唬琛ㄥ綋鍓嶉〉鐮佺殑鏁版嵁
-            total : "pages", // json涓�唬琛ㄩ〉鐮佹€绘暟鐨勬暟鎹�
-            records : "total", // json涓�唬琛ㄦ暟鎹��鎬绘暟鐨勬暟鎹�
+            root : "list", // json中代表实际模型数据的入口
+            page : "page", // json中代表当前页码的数据
+            total : "pages", // json中代表页码总数的数据
+            records : "total", // json中代表数据行总数的数据
             repeatitems : false
-        // 濡傛灉璁句负false锛屽垯jqGrid鍦ㄨВ鏋恓son鏃讹紝浼氭牴鎹畁ame鏉ユ悳绱㈠�搴旂殑鏁版嵁鍏冪礌
+        // 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
         },
         gridComplete : function() {
             comGridComplete("grid-table", "editRecord");
@@ -201,15 +201,15 @@ function initGrid() {
             comGridPage("grid-table");
         }
     });
-    // 璋冩暣jqgrid
+    // 调整jqgrid
     ajustJqGrid(grid_selector, pager_selector);
 };
 
 /**
- * 澧炲姞淇℃伅
+ * 增加信息
  */
 function addInfo() {
-    // 娓呯┖琛ㄥ崟淇℃伅
+    // 清空表单信息
     comClearFormData("#myForm");
     $("#realName").removeProp("readonly");
     $("#loginName").removeProp("readonly");
@@ -223,20 +223,20 @@ function addInfo() {
     $('#duty').selectpicker('refresh');
     $('#planning').selectpicker('refresh');
     $('#userState').selectpicker('refresh');
-    // 鏂板�鏃跺垵濮嬪寲
+    // 新增时初始化
     addInitInfo();
-    // 寮瑰嚭妯℃€佹�
-    showModelDialog("myModal", "鏂板�");
+    // 弹出模态框
+    showModelDialog("myModal", "新增");
 };
 
 /**
- * 缂栬緫淇℃伅
+ * 编辑信息
  */
 function editInfo() {
-    // 鑾峰彇閫夋嫨琛�
+    // 获取选择行
     var ids = getMultiData(grid_selector);
     if (isNull(ids) || ids.indexOf(",") != -1) {
-        layer.alert("璇烽€夋嫨涓斿彧閫夋嫨涓€鏉¤�褰曪紒");
+        layer.alert("请选择且只选择一条记录！");
     } else {
         $.ajax({
             type : 'POST',
@@ -244,7 +244,7 @@ function editInfo() {
             data : {
                 "id" : ids
             },
-            url : basePath + '/user/getRecord',// 璇锋眰鐨勮矾寰�
+            url : basePath + '/user/getRecord',// 请求的路径
             success : function(data) {
                 $("#id").val(data.id);
                 $("#realName").val(data.realName);
@@ -291,7 +291,7 @@ function editInfo() {
                 setChkVal('#ifShip');
                 setChkVal('#ifJob');
 
-                showModelDialog("myModal", "缂栬緫");
+                showModelDialog("myModal", "编辑");
             },
             error : function(XMLHttpRequest, textStatus, errorThrown) {
                 layer.alert("error:" + errorThrown);
@@ -301,15 +301,15 @@ function editInfo() {
 };
 
 /**
- * 鍒犻櫎淇℃伅
+ * 删除信息
  */
 function delInfo() {
-    // 鑾峰彇閫夋嫨琛�
+    // 获取选择行
     var ids = getMultiData(grid_selector);
     if (!isNull(ids)) {
-        layer.confirm('纭�畾鍒犻櫎鍚�?', {
+        layer.confirm('确定删除吗?', {
             icon : 3,
-            title : '鎻愮ず'
+            title : '提示'
         }, function(index) {
             $.ajax({
                 type : 'POST',
@@ -317,11 +317,11 @@ function delInfo() {
                 data : {
                     "ids" : ids
                 },
-                url : basePath + '/user/del',// 璇锋眰鐨勮矾寰�
+                url : basePath + '/user/del',// 请求的路径
                 success : function(data) {
                     layer.close(index);
                     if (!isNull(data.success) && data.success == false) {
-                        layer.alert("鏁版嵁鍒犻櫎寮傚父锛�");
+                        layer.alert("数据删除异常！");
                     } else {
                         searchRecord();
                     }
@@ -333,12 +333,12 @@ function delInfo() {
             });
         });
     } else {
-        layer.alert("璇烽€夋嫨璁板綍");
+        layer.alert("请选择记录");
     }
 };
 
 /**
- * 鏌ヨ�淇℃伅
+ * 查询信息
  */
 function searchRecord() {
     var realName = encodeURI(encodeURI($("#srh_realName").val()));
@@ -357,7 +357,7 @@ function searchRecord() {
 };
 
 /**
- * 淇濆瓨鏁版嵁
+ * 保存数据
  */
 function save() {
 
@@ -379,17 +379,18 @@ function save() {
         type : "post",
         url : basePath + '/user/save',
         dataType : 'json',
-        data : $('#myForm').serialize(), // 琛ㄥ崟搴忓垪鍖栵紝鑾峰彇鏁版嵁
+        data : $('#myForm').serialize(), // 表单序列化，获取数据
         success : function(data) {
-            // 鎴愬姛鍚庡埛鏂伴〉闈�
+            // 成功删除后刷新页面
+
             if (data && data.success) {
-                layer.alert("鏁版嵁宸叉垚鍔熶繚瀛橈紒");
+                layer.alert("数据已成功保存！");
                 closeWin();
                 searchRecord();
             } else {
-                layer.alert("鏁版嵁淇濆瓨澶辫触锛�");
+                layer.alert("数据保存失败！");
             }
-        }, // 鎿嶄綔鎴愬姛鍚庣殑鎿嶄綔锛乨ata鏄�悗鍙颁紶杩囨潵鐨勫€�
+        }, // 操作成功后的操作！data是后台传过来的值
         error : function(XMLHttpRequest, textStatus, errorThrown) {
             layer.alert("error:" + errorThrown);
         }
@@ -397,13 +398,13 @@ function save() {
 }
 
 /**
- * 鍏抽棴褰撳墠绐楀彛
+ * 关闭当前窗口
  */
 function closeWin() {
     hideModelDialog("myModal");
 }
 
-// 鏍规嵁checkbox鍕鹃€夎�瀹歨idden鍊�
+// 根据checkbox勾选设定hidden值
 function setChkHidVal(hidEle) {
     if ($(hidEle + 'Chk').prop('checked')) {
         $(hidEle).val('Y');
@@ -412,7 +413,7 @@ function setChkHidVal(hidEle) {
     }
 }
 
-//鏍规嵁hidden鍊艰�瀹歝heckbox鍕鹃€�
+//根据hidden值设定checkbox勾选
 function setChkVal(hidEle) {
     if ($(hidEle).val() == 'Y') {
         $(hidEle + 'Chk').prop('checked', true);
@@ -421,7 +422,7 @@ function setChkVal(hidEle) {
     }
 }
 
-// 鍔犺浇缁勭粐涓嬫媺妗嗛€夐」
+// 加载组织下拉框选项
 function orgSelect() {
     $.ajax({
         type : "post",
@@ -433,7 +434,7 @@ function orgSelect() {
     });
 }
 
-// 鏍规嵁缁勭粐鍙樻洿鎵€鍦ㄥ湴
+// 根据组织变更所在地
 function changeSzd() {
     var orgId = $('#orgid').selectpicker('val');
     $.ajax({
@@ -445,7 +446,7 @@ function changeSzd() {
     });
 }
 
-//鍔犺浇鍒嗙粍涓嬫媺妗嗛€夐」
+//加载分组下拉框选项
 function groupSelect() {
     $.ajax({
        type : "post",
@@ -457,7 +458,7 @@ function groupSelect() {
     });
 }
 
-//鍔犺浇瀹℃壒璁剧疆涓嬫媺妗嗛€夐」
+//加载审批设置下拉框选项
 function approveSetSelect() {
  $.ajax({
      type : "post",
@@ -469,7 +470,7 @@ function approveSetSelect() {
  });
 }
 
-// 鍔犺浇鎬у埆涓嬫媺妗嗛€夐」
+// 加载性别下拉框选项
 function sexSelect() {
     $.ajax({
         type : "post",
@@ -481,7 +482,7 @@ function sexSelect() {
     });
 }
 
-// 鍔犺浇鏀挎不闈㈣矊涓嬫媺妗嗛€夐」
+// 加载政治面貌下拉框选项
 function politicsStatusSelect() {
     $.ajax({
         type : "post",
@@ -493,7 +494,7 @@ function politicsStatusSelect() {
     });
 }
 
-// 鍔犺浇瀛﹀巻涓嬫媺妗嗛€夐」
+// 加载学历下拉框选项
 function educationBackgroundSelect() {
     $.ajax({
         type : "post",
@@ -505,7 +506,7 @@ function educationBackgroundSelect() {
     });
 }
 
-// 鍔犺浇鑱屽姟涓嬫媺妗嗛€夐」
+// 加载职务下拉框选项
 function dutySelect() {
     $.ajax({
         type : "post",
@@ -517,7 +518,7 @@ function dutySelect() {
     });
 }
 
-// 鍔犺浇缂栧埗涓嬫媺妗嗛€夐」
+// 加载编制下拉框选项
 function planningSelect() {
     $.ajax({
         type : "post",
@@ -529,7 +530,7 @@ function planningSelect() {
     });
 }
 
-// 鍔犺浇浜哄憳鐘舵€佷笅鎷夋�閫夐」
+// 加载人员状态下拉框选项
 function userStateSelect() {
     $.ajax({
         type : "post",