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

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/dwxx/jyrjcxx/JyrUserCtl.java

@@ -1,46 +1,24 @@
 package com.xt.js.gkaq.web.ctl.dwxx.jyrjcxx;
 
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.sql.Blob;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.swing.text.StyledEditorKit.BoldAction;
 
-import oracle.sql.BLOB;
-
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Lookup;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import com.alibaba.fastjson.JSONArray;
 import com.xt.js.gkaq.common.BaseCtl;
 import com.xt.js.gkaq.common.BaseUUIDModel;
-import com.xt.js.gkaq.common.Constants;
 import com.xt.js.gkaq.common.util.FileUtil;
 import com.xt.js.gkaq.dwxx.model.JyrUserListModel;
 import com.xt.js.gkaq.dwxx.model.JyrUserModel;
@@ -48,10 +26,8 @@ import com.xt.js.gkaq.dwxx.model.JyrUserTJModel;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
 import com.xt.js.gkaq.dwxx.service.JyrUserService;
 import com.xt.js.gkaq.dwxx.service.JyrjcxxService;
-import com.xt.js.gkaq.frame.model.CodeModel;
 import com.xt.js.gkaq.frame.model.CodeModelDto;
 import com.xt.js.gkaq.frame.model.ComboBoxDto;
-import com.xt.js.gkaq.frame.model.UserModel;
 import com.xt.js.gkaq.frame.service.CodeService;
 import com.xt.js.gkaq.web.model.BloBModel;
 import com.xt.js.gkaq.web.model.FjbModel;

gkaqv2/trunk/modules/web/src/main/resources/spring/mvc.xml

@@ -19,6 +19,7 @@
 		<context:include-filter type="annotation"
 			expression="org.springframework.stereotype.Controller" />
 	</context:component-scan>
+	<!-- 文件上传配置 -->
 	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">    
         <property name="defaultEncoding" value="UTF-8"></property>     
         <property name="maxUploadSize" value="10485760000"></property>    

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

@@ -54,18 +54,13 @@
 							onclick="printInfo()" title="打印"/>
 					</div>
 					<div class="p_buttonbg">
-						<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
+						<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
 							onclick="gksssbTj()" title="统计信息"/>
 					</div>
 					<div class="p_buttonbg">
-						<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
+						<img class="p_buttonimg" src="<%=base%>/static/images/list/bgzy.png" 
 							onclick="" title="复制"/>
 					</div>
-					<div class="p_buttonbg">
-						<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
-							onclick="" title="导入模板"/>
-							
-					</div>
 				</div>
 			</div>
 			<div class="p_searchdiv">

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

@@ -53,15 +53,6 @@
 					<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/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>
 		<div class="p_searchdiv">
@@ -97,13 +88,11 @@
 					</td>
 					<td class="tdname">修订时间  起</td>
 					<td class="tdcontent">
-						<!-- <input type="text" id="xdrqk" name="xdrq" class="easyui-datetimebox p_txt" data-options="showSeconds:false,formatter:formatterDateNotsfm"/> -->
 						<input id="xdrqk" name="xdrq"  class="p_txt" type="text"/>
 					</td>
 					<td class="tdname">修订时间  止 </td>
 					<td class="tdcontent">
 						<input id="xdrqj" name="xdrq" class="p_txt" type="text"/>
-						<!-- <input type="text" id="xdrqj" name="xdrq" class="easyui-datetimebox p_txt" data-options="showSeconds:false,formatter:formatterDateNotsfm"/> -->
 					</td>
 					
 				</tr>

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

@@ -299,18 +299,10 @@
 					<input name="shenpi" type="checkbox" placeholder="" onchange="getshenpi()"/> 
 				</div>
 			</div>
-			<%@ include file="../../pop/pop_WxhwName.jsp"%>
+			
 	  	 </form>
-	  	 <%-- <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>
-					<%@ include file="../../pop/pop_WxhwName.jsp"%>
-				</div>
-			</div>					
-		</div> --%>
+	  	 <!-- 危险货物品名选择页面 -->
+		<%@ include file="../../pop/pop_WxhwName.jsp"%>
 		<div id="fileUp" class="easyui-window" title="文件上传" style="width:20%;height: 50%;"    
        		 data-options="modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
 					 <%@ include file="../jyr/JyrZsInfo.jsp"%>    

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

@@ -27,17 +27,13 @@
 					<td class="tdcontent">
 						<input id="tjjstime" class="form-control" type="text"/>
 					</td>
+					<td class="tdcontent" style="text-align:center;">
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="²éѯ" onclick="jyrTjSearch()"/>
+						<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png" onclick="printJyrTjInfo()" title="´òÓ¡"/>
+					</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>

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

@@ -57,14 +57,9 @@
 						onclick="jyrUserTj()" title="ͳ¼ÆÐÅÏ¢"/>
 				</div>
 				<div class="p_buttonbg">
-					<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/bgzy.png" 
 						onclick="" title="¸´ÖÆ"/>
 				</div>
-				<div class="p_buttonbg">
-					<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
-						onclick="" title="µ¼ÈëÄ£°å"/>
-						
-				</div>
 			</div>
 		</div>
 		<div class="p_searchdiv">

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

@@ -25,6 +25,7 @@
 <link type="text/css" rel="stylesheet" href="<%=request.getContextPath()%>/static/js/common/zTree_v3/css/zTreeStyle/zTreeStyle.css" />
 
 <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/static/jquery-easyui-1.5/themes/default/easyui.css">
+<%-- <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/static/jquery-easyui-1.5/themes/bootstrap/easyui.css"> --%>
 <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/static/jquery-easyui-1.5/themes/icon.css">
     
 <link rel="stylesheet" href="<%=request.getContextPath()%>/static/css/common/basic.css" />

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/pop/pop_WxhwName.jsp

@@ -20,7 +20,6 @@
 					</div>
 					<div class="p_block" style = "min-width:100%;width:100%;margin-left: 0px;">
 						<div class="p_buttondiv" style = "min-width:100%;width:100%;">
-						
 								<button id="btnSave" class="btn btn-success btn-round btn-sm"
 								onclick="checkWxhw()">
 								<i class="glyphicon glyphicon-ok"></i> È·¶¨

gkaqv2/trunk/modules/web/src/main/webapp/static/js/gksssb/GksssbInfo.js

@@ -62,7 +62,7 @@ function sssbZsInint (ssid,val) {
 				insertJyrZs(gridData);
 			}
 		}
-	})
+	});
 }
 
 /**
@@ -273,7 +273,7 @@ function eiditGksssbFile (ssid) {
 				success:function (data){
 					// 成功删除后刷新页面
 		            if (data && data.success == true) {
-		            	var wjnr = data.attrs.zsnr
+		            	var wjnr = data.attrs.zsnr;
 		            	//判断文件内容id是否有值，若没有值，说明filename为空，数据在库中，不用操作数据库，则关联的表数据也不用操作
 		            	if (wjnr !=null && wjnr != ""){
 			            	var value = {"wjm":wjm,
@@ -320,7 +320,7 @@ function editFJInfo (data) {
 function fileDow () {
 	var row = $('#zstbl').datagrid('getSelected');//当前row
 	if (row != null && row != "") {
-		location.href= basePath+"/fileUtil/fileDow?id="+row.zsnr+"&fjid="+row.fjid
+		location.href= basePath+"/fileUtil/fileDow?id="+row.zsnr+"&fjid="+row.fjid;
 	}
 	
 }
@@ -401,8 +401,6 @@ function eiditZdFile () {
 				}
 			});
 		}
-		alert(rows);
-		console.log(rows);
 	}
 	
 }
@@ -413,7 +411,9 @@ function eiditZdFile () {
 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"

gkaqv2/trunk/modules/web/src/main/webapp/static/js/gksssb/GksssbLook.js

@@ -118,6 +118,10 @@ function getCkJyrInfo (val) {
 		}
 	});
 }
+/**
+ * 加载附件列表
+ * @param id
+ */
 function getfile (id) {
 	$("#fileUp").window("open");
 	gkSsSbZsInint(id);
@@ -157,6 +161,9 @@ function fileDow () {
 	}
 	
 }
+/**
+ * 日期格式转换
+ */
 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/gksssb/GksssbTjInfo.js

@@ -131,6 +131,9 @@ function gettjgqInfo (val) {
 		}
 	});
 }
+/**
+ * 加载企业名称下拉框
+ */
 function getqymcInfo() {
 	$.ajax({
 		type:"POST",

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

@@ -263,6 +263,9 @@ function delInfo () {
 		layer.alert("请选择记录");
 	}
 }
+/**
+ * 港口设施设备统计
+ */
 function gksssbTj() {
 	$("#gksssbTjwin").window("open");
 	gettjyjfl();
@@ -271,6 +274,15 @@ function gksssbTj() {
 	gettjSzd();
 	tj_initGrid();
 }
+/**
+ * 关闭弹窗
+ */
+function closeWin() {
+	$("#gksssbwin").window("close");
+}
+/**
+ * 日期格式转换
+ */
 formatterDateNotsfm = 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/glzd/GlzdInfo.js

@@ -66,7 +66,7 @@ function glzdZsInint (ssid,val) {
 				insertJyrZs(gridData);
 			}
 		}
-	})
+	});
 }
 /**
  * 选择所在地时联动港口信息
@@ -360,6 +360,9 @@ function insertJyrZs (gridDate) {
 		});
 	}
 }
+/**
+ * 日期格式转换
+ */
 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/glzd/index.js

@@ -127,8 +127,8 @@ function getJyrGlzdLookInfo (id) {
 				$("#jyrGlzdInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
 				$("#tab-tools").attr("hidden",true);
 				$("#jyrGlzdInfoform").find("#tab-tools").attr("hidden",true);
-				JyrGlzdInfoInit(data);
-				glzdZsInint(data.id,"2");
+				JyrGlzdInfoInit(data);//加载数据
+				glzdZsInint(data.id,"2");//加载附件表信息
 			},
 			error: function (XMLHttpRequest, textStatus, errorThrown) {
 	        }
@@ -162,7 +162,9 @@ function getgqInfo (val) {
 		}
 	});
 }
-
+/**
+ * 加载制度分类下拉框
+ */
 function getzdfl () {
 	$.ajax({
 		type:"POST",
@@ -215,10 +217,10 @@ function editInfo() {
 				$("#jyrGlzdwin").window({title:"编辑"});
 				$("#jyrGlzdwin").window("open");
 				$("#jyrGlzdInfoform").form("reset");//重置表单数据
-				formQY();
+				formQY();//启用from表单中的元素
 				$('#zstbl').datagrid('loadData',{total:0,rows:[]}); //附件列表
-				JyrGlzdInfoInit(data);
-				glzdZsInint(data.id,"1");
+				JyrGlzdInfoInit(data);//加载数据
+				glzdZsInint(data.id,"1");//加载附件表信息
 			},
 			error: function (XMLHttpRequest, textStatus, errorThrown) {
 	        }
@@ -232,7 +234,7 @@ function addJyrUserInfo () {
 	$("#jyrGlzdwin").window({title:"新增"});
 	$("#jyrGlzdwin").window("open");
 	comClearFormData("#jyrGlzdInfoform");
-	formQY();
+	formQY();//启用from表单中的元素
 	$('#zstbl').datagrid('loadData',{total:0,rows:[]}); //附件列表
 	getSzd('');
 	getInfo('','');
@@ -265,6 +267,15 @@ function delInfo () {
 		layer.alert("请选择记录");
 	}
 }
+/**
+ * 关闭弹窗
+ */
+function closeWin() {
+	$("#jyrGlzdwin").window("close");
+}
+/**
+ * 启用from 表单中的元素
+ */
 function formQY () {
 	$("#jyrGlzdInfoform").find("input").removeAttr("disabled");//禁用表单元素input
 	$("#jyrGlzdInfoform").find("select").removeAttr("disabled");//禁用表单元素select
@@ -273,6 +284,9 @@ function formQY () {
 	$("#tab-tools").removeAttr("hidden");
 	$("#jyrGlzdInfoform").find("#tab-tools").removeAttr("hidden");
 }
+/**
+ * 日期格式转换
+ */
 formatterDateNotsfm = 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/jyrUser/JyrUserInfo.js

@@ -240,11 +240,8 @@ function eiditRyzs () {
 		            		zsnr = rows[i].zsnr;
 		            	}
 		            	//还差文件大小和后缀名
-		            	
 						var fjb = {"wjm":wjm,"id":fjid,"szd":$("#jyrszd").val(),"wjnr":zsnr,"wjdx":wjdx,"wjhzm":wjhzm,"ssid":id,"filename":fileName};
 						var ryzsData = {"ryid":$("#userzjhm").val(),"zsmc":zsmc,"zszl":zszl,"zsbh":zsbh,"yxq":yxq,"zsnr":zsnr,"szd":$("#jyrszd").val(),"id":id};
-						console.log(fjb);
-						console.log(ryzsData);
 						editRyzsInfo(ryzsData,fjb);
 		            } else {
 		            	zsnr = null;
@@ -379,7 +376,6 @@ function deleteUserFile () {
 				url:basePath+"/jyrUser/fileDel",
 				data:{"id":row.zsid,"fjid":row.fjid},
 				success:function (data){
-					console.log(data);
 					// 成功删除后刷新页面
 		            if (data && data.success == true) {
 		                //删除页面上的datagrid数据
@@ -396,7 +392,6 @@ function deleteUserFile () {
 				url:basePath+"/fileUtil/delFile",
 				data:{"filename":fileName},
 				success:function (data){
-					console.log(data);
 					// 成功删除后刷新页面
 		            if (data && data.success == true) {
 		                //删除页面上的datagrid数据
@@ -417,8 +412,11 @@ function deleteUserFile () {
  */
 function fileDow () {
 	var row = $('#zstbl').datagrid('getSelected');//当前row
-	location.href= basePath+"/fileUtil/fileDow?id="+row.zsnr+"&fjid="+row.fjid
+	location.href= basePath+"/fileUtil/fileDow?id="+row.zsnr+"&fjid="+row.fjid;
 }
+/**
+ * 日期格式转换
+ */
 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/jyrUser/JyrUserTjInfo.js

@@ -95,7 +95,9 @@ function getjyrUserTjRylx() {
 	});
 	
 }
-
+/**
+ * 打印
+ */
 function printJyrTjInfo () {
 //	location.href = basePath + '/tjcx/printJyrTjInfo';
 }
@@ -105,7 +107,9 @@ function printJyrTjInfo () {
 function closeWh() {
 	$("#wh").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"

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

@@ -176,7 +176,9 @@ function getgqInfo (val) {
 		}
 	});
 }
-
+/**
+ * 加载经营人信息下拉框
+ */
 function getJyrInfoSelect () {
 	$.ajax({
 		type:"POST",
@@ -233,7 +235,12 @@ function editInfo() {
 		});
 	}
 }; 
-
+/**
+ * 初始化人员证书表信息
+ * @param id
+ * @param souces
+ * @param opn
+ */
 function initRyzsbEdit (id,souces,opn) {
 	$.ajax({
 		type : 'POST',
@@ -292,7 +299,15 @@ function delInfo () {
 		layer.alert("请选择记录");
 	}
 }
-
+/**
+ * 关闭弹窗
+ */
+function closeWin(){
+	$("#jyrUserwin").window("close");
+}
+/**
+ * 经营人人员信息统计
+ */
 function jyrUserTj() {
 //	$("#jyrUserTjwin").window("open");
 	showModelDialog("jyrUserTjwin", "新增");
@@ -300,7 +315,9 @@ function jyrUserTj() {
 	getjyrUserTjRylx();
 	tj_initGrid();
 }
-
+/**
+ * 启用from表单元素
+ */
 function formQY () {
 	$("#jyrUserInfoform").find("input").removeAttr("disabled");//禁用表单元素input
 	$("#jyrUserInfoform").find("select").removeAttr("disabled");//禁用表单元素select