瀏覽代碼

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

ld_xuhx 8 年之前
父節點
當前提交
a599fbc65d
共有 52 個文件被更改,包括 325 次插入166 次删除
  1. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtxxx/jdtxxxedit.jsp
  2. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtxxx/jdtxxxview.jsp
  3. 4 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/ax/axmain.jsp
  4. 2 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtmain.jsp
  5. 2 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsedit.jsp
  6. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsview.jsp
  7. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsedit.jsp
  8. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsview.jsp
  9. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsedit.jsp
  10. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsview.jsp
  11. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp
  12. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjview.jsp
  13. 3 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglmain.jsp
  14. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwmain.jsp
  15. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrcg/cgmain.jsp
  16. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrck/ckmain.jsp
  17. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrdc/dcmain.jsp
  18. 4 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp
  19. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrxkzfz/xkzfzmain.jsp
  20. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/qytz/qytzmain.jsp
  21. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/ry/rymain.jsp
  22. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/sssb/sssbmain.jsp
  23. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxmain.jsp
  24. 1 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/zxjx/zxjxmain.jsp
  25. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgedit.jsp
  26. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgview.jsp
  27. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqedit.jsp
  28. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqview.jsp
  29. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxedit.jsp
  30. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxview.jsp
  31. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjpro.jsp
  32. 12 5
      gkjsjy/trunk/WebContent/static/biz/js/ggfwxxgl/jdtxxx/jdtxxxdetail.js
  33. 12 4
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdetail.js
  34. 13 5
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdsdetail.js
  35. 13 5
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdbg/jsjdbgdetail.js
  36. 12 6
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdbg/jsjdbgdsdetail.js
  37. 12 4
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdcbsj/jsjdcbsjdetail.js
  38. 14 5
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdcbsj/jsjdcbsjdsdetail.js
  39. 14 7
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgdetail.js
  40. 14 14
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhsq/lhsqdetail.js
  41. 14 9
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhyx/lhyxdetail.js
  42. 3 10
      gkjsjy/trunk/WebContent/static/biz/js/todo.js
  43. 6 2
      gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/ctl/JdtxxxCtl.java
  44. 6 2
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java
  45. 6 2
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java
  46. 6 2
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java
  47. 6 2
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java
  48. 6 2
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java
  49. 6 3
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java
  50. 6 2
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java
  51. 41 23
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java
  52. 41 22
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtxxx/jdtxxxedit.jsp

@@ -10,6 +10,8 @@
 	<script type="text/javascript" src="${app }/static/biz/js/ggfwxxgl/jdtxxx/jdtxxxdetail.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
+			jdtxxx.detail.path="${path}";
+			jdtxxx.detail.type="${type}";
 			iFrameHeightIframe('${menuid}');//自适应高度
 			initszdSelect('szdsel', '${record.szd}', 'showgk', '80%');
 			initgkSelect('gksel', '${record.szgk}','${record.szd}', 'showgq', '80%');

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtxxx/jdtxxxview.jsp

@@ -10,6 +10,8 @@
 	<script type="text/javascript" src="${app }/static/biz/js/ggfwxxgl/jdtxxx/jdtxxxdetail.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
+			jdtxxx.detail.path="${path}";
+			jdtxxx.detail.type="${type}";
 			iFrameHeightIframe('${menuid}');//自适应高度
 			/* initszdSelect('szdsel', '${record.szd}', 'showgk', '80%');
 			initgkSelect('gksel', '${record.szgk}','${record.szd}', 'showgq', '80%');

+ 4 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/ax/axmain.jsp

@@ -29,22 +29,21 @@
 			initgqSelect('szgqsel','',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
 		}
 		function exportExcelAll(data1,data2,data3,data4,data5,data6){
-			
+			location.href=$.app+"/ax/exportExcelAll?axmc="+data1+"&ssjyr="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&lyztid="+data6;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/ax/exportExcelAll?axmc="+data1+"&ssjyr="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&lyztid="+data6;
-			    }
+			    	  }
 			});
 		} 
 		function exportExcelthisPage(data1,data2,data3,data4,data5,data6,data7,data8){
+			location.href=$.app+"/ax/exportExcelthisPage?axmc="+data1+"&ssjyr="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&pageNum="+data6+"&pageSize="+data7+"&lyztid="+data8;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/ax/exportExcelthisPage?axmc="+data1+"&ssjyr="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&pageNum="+data6+"&pageSize="+data7+"&lyztid="+data8;
-			    }
+			    	}
 			});
 		} 
 	</script>

+ 2 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtmain.jsp

@@ -35,11 +35,12 @@
 			initgqSelect('gqsel','',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
 		}
 		function exportExcelAll(data1,data2,data3,data4,data5,data6,data7,data8,data9){
+			location.href=$.app+"/mt/exportExcelAll?mtmc="+data1+"&szgqid="+data2+"&szgkid="+data3+"&szdid="+data4+"&jyr="+data5+"&sfwhpid="+data6+"&sfdwkfid="+data7+"&fwlxid="+data8+"&mtyt="+data9;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/mt/exportExcelAll?mtmc="+data1+"&szgqid="+data2+"&szgkid="+data3+"&szdid="+data4+"&jyr="+data5+"&sfwhpid="+data6+"&sfdwkfid="+data7+"&fwlxid="+data8+"&mtyt="+data9;
+			    	
 				}
 			});
 			}

+ 2 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsedit.jsp

@@ -19,7 +19,8 @@
 				jgsqds.detail.gq ='${jyr.szgq.id}'
 				jgsqds.detail.gk ='${jyr.szgk.id}'
 			}
-			
+			jgsqds.detail.path = "${path}";
+			jgsqds.detail.type = "${type}";
 			jgsqds.detail.fjid81='${fjList81.fjid }';
 			fjgt(jgsqds.detail.fjid81,'scbt81','tjbt81');
 			jgsqds.detail.fjid82='${fjList82.fjid }';

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsview.jsp

@@ -15,6 +15,8 @@
 			jgsqds.detail.opflag="${opflag}"
 			jgsqds.detail.taskKey="${taskKey}";
 			jgsqds.detail.hqflag ="${hqflag}";
+			jgsqds.detail.path = "${path}";
+			jgsqds.detail.type = "${type}";
 			jgsqds.detail.init();
 			$('.close').click(function(){
 				guanbi();

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsedit.jsp

@@ -19,6 +19,8 @@
 				jsjdbgds.detail.gq ='${jyr.szgq.id}'
 				jsjdbgds.detail.gk ='${jyr.szgk.id}'
 			}
+			jsjdbgds.detail.path = "${path}";
+			jsjdbgds.detail.type = "${type}";
 			//附件
 			jsjdbgds.detail.fjid31='${fjList31.fjid }';
 			fjgt(jsjdbgds.detail.fjid31,'scbt31','tjbt31');

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsview.jsp

@@ -15,6 +15,8 @@
 			jsjdbgds.detail.opflag="${opflag}"
 			jsjdbgds.detail.taskKey="${taskKey}";
 			jsjdbgds.detail.hqflag ="${hqflag}";
+			jsjdbgds.detail.path = "${path}";
+			jsjdbgds.detail.type = "${type}";
 			jsjdbgds.detail.init();
 			$('.close').click(function(){
 				guanbi();

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsedit.jsp

@@ -19,6 +19,8 @@
 				jsjdcbsjds.detail.gq ='${jyr.szgq.id}'
 				jsjdcbsjds.detail.gk ='${jyr.szgk.id}'
 			}
+			jsjdcbsjds.detail.path = "${path}";
+			jsjdcbsjds.detail.type = "${type}";
 			//附件
 			jsjdcbsjds.detail.fjid31='${fjList31.fjid }';
 			fjgt(jsjdcbsjds.detail.fjid31,'scbt31','tjbt31');

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsview.jsp

@@ -16,6 +16,8 @@
 		jsjdcbsjds.detail.opflag = "${opflag}"
 		jsjdcbsjds.detail.taskKey = "${taskKey}";
 		jsjdcbsjds.detail.hqflag ="${hqflag}";
+		jsjdcbsjds.detail.path = "${path}";
+		jsjdcbsjds.detail.type = "${type}";
 		jsjdcbsjds.detail.init();
 		$('.close').click(function() {
 			guanbi();

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp

@@ -13,6 +13,8 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			jsjdcbsj.detail.ssFlag = '${ssFlag}';
+			jsjdcbsj.detail.path = "${path}";
+			jsjdcbsj.detail.type = "${type}";
 			jsjdcbsj.detail.init();
 			var id = '${jyr.id}';
 			if(!isEmpty(id)){

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjview.jsp

@@ -16,6 +16,8 @@
 		jsjdcbsj.detail.opflag = "${opflag}"
 		jsjdcbsj.detail.taskKey = "${taskKey}";
 		jsjdcbsj.detail.hqflag ="${hqflag}";
+		jsjdcbsj.detail.path = "${path}";
+		jsjdcbsj.detail.type = "${type}";
 		jsjdcbsj.detail.init();
 		$('.close').click(function() {
 			guanbi();

+ 3 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglmain.jsp

@@ -34,12 +34,13 @@
 		}
 		
 		function exportExcelAll(data1,data2,data3,data4,data5,data6,data7,data8,data9){
+			location.href=$.app+"/xmxxgl/exportExcelAll?xmmc="+data1+"&xmfr="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&xmhzjbid="+data6+"&sfyzjbzid="+data7+"&xmbm="+data8+"&jyrmc="+data9;
+			
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/xmxxgl/exportExcelAll?xmmc="+data1+"&xmfr="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&xmhzjbid="+data6+"&sfyzjbzid="+data7+"&xmbm="+data8+"&jyrmc="+data9;
-				 }
+			    	 }
 			});
 		}
 	</script>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwmain.jsp

@@ -44,12 +44,12 @@
 		
 		function exportExcelAll(data1,data2,data3,data4,data5,data6,data7,data8,data9,data10,data11,data12){
 			//alert(encodeURIComponent($.app+"/bw/exportExcelAll?ssjyr="+data1+"&ssmt="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&bwmc="+data6+"&wxpbwid="+data7+"&bwsxid="+data8+"&fwlxid="+data9+"&sfdwkfid="+data10+"&bwbwyt="+data11+"&bz="+data12));
+			location.href=$.app+"/bw/exportExcelAll?ssjyr="+data1+"&ssmt="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&bwmc="+data6+"&wxpbwid="+data7+"&bwsxid="+data8+"&fwlxid="+data9+"&sfdwkfid="+data10+"&bwyt="+data11+"&bz="+data12;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/bw/exportExcelAll?ssjyr="+data1+"&ssmt="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&bwmc="+data6+"&wxpbwid="+data7+"&bwsxid="+data8+"&fwlxid="+data9+"&sfdwkfid="+data10+"&bwyt="+data11+"&bz="+data12;
-			    }
+			    	}
 			});
 		}
 	</script>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrcg/cgmain.jsp

@@ -27,12 +27,12 @@
 			initgqSelect('szgqsel','',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
 		}
 		function exportExcelAll(data1,data2,data3,data4,data5,data6){
+			location.href=$.app+"/cg/exportExcelAll?szdid="+data1+"&szgkid="+data2+"&szgqid="+data3+"&ssjyr="+data4+"&sfwxpcgid="+data5+"&cgmc="+data6;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/cg/exportExcelAll?szdid="+data1+"&szgkid="+data2+"&szgqid="+data3+"&ssjyr="+data4+"&sfwxpcgid="+data5+"&cgmc="+data6;
-			    }
+			    	}
 			});
 		}
 	</script>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrck/ckmain.jsp

@@ -28,12 +28,12 @@
 			initgqSelect('szgqsel','',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
 		}
 		function exportExcelAll(data1,data2,data3,data4,data5,data6,data7){
+			location.href=$.app+"/ck/exportExcelAll?ssmt="+data1+"&szdid="+data2+"&szgkid="+data3+"&szgqid="+data4+"&ckmc="+data5+"&ssjyr="+data6+"&wxpckid="+data7;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/ck/exportExcelAll?ssmt="+data1+"&szdid="+data2+"&szgkid="+data3+"&szgqid="+data4+"&ckmc="+data5+"&ssjyr="+data6+"&wxpckid="+data7;
-			    }
+			    	  }
 			});
 			
 		}

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrdc/dcmain.jsp

@@ -28,11 +28,11 @@
 		}
 		
 		function exportExcelAll(data1,data2,data3,data4,data5,data6){
+			location.href=$.app+"/dc/exportExcelAll?szdid="+data1+"&szgkid="+data2+"&szgqid="+data3+"&ssjyr="+data4+"&dcmc="+data5+"&wxpdcid="+data6;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/dc/exportExcelAll?szdid="+data1+"&szgkid="+data2+"&szgqid="+data3+"&ssjyr="+data4+"&dcmc="+data5+"&wxpdcid="+data6;
 			    }
 			});
 			

+ 4 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp

@@ -52,20 +52,21 @@ var expandFlg=false;
 	}
 
 	function exportExcelAll(data2,data4,data5,data6,data7,data8,data9,data10,data11,data12,data13,data14,data15,data16,data17){
+		location.href=$.app+"/gkjyr/exportExcelAll?bwyt="+data2+"&whfzbh="+data4+"&sfcswhzy="+data5+"&sfcyxkz="+data6+"&gkjyr="+data7+"&szdid="+data8+"&szgkid="+data9+"&szgqid="+data10+"&gkjyxkzh="+data11+"&fddbr="+data12+"&xkzstartDate="+data13+"&xkzendDate="+data14+"&fzstartDate="+data15+"&fzendDate="+data16+"&jyrxkzsfdq="+data17;
 		$.alert({
    		    title: '提示',
 		    content: '导出数据中,请耐心等待!',
 		    confirm: function(){
-		    	location.href=$.app+"/gkjyr/exportExcelAll?bwyt="+data2+"&whfzbh="+data4+"&sfcswhzy="+data5+"&sfcyxkz="+data6+"&gkjyr="+data7+"&szdid="+data8+"&szgkid="+data9+"&szgqid="+data10+"&gkjyxkzh="+data11+"&fddbr="+data12+"&xkzstartDate="+data13+"&xkzendDate="+data14+"&fzstartDate="+data15+"&fzendDate="+data16+"&jyrxkzsfdq="+data17;
-		    }
+		    	}
 		});
 	}
 	function exportJyr(data1,data2){
+		location.href=$.app+"/gkjyr/exportJyr?id="+data1+"&jyr="+data2;
 		$.alert({
    		    title: '提示',
 		    content: '导出数据中,请耐心等待!',
 		    confirm: function(){
-		    	location.href=$.app+"/gkjyr/exportJyr?id="+data1+"&jyr="+data2;
+		    	
 		    }
 		});
 	}

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrxkzfz/xkzfzmain.jsp

@@ -34,12 +34,12 @@
 			$("#fzsfyx option[value='"+data+"']").attr("selected", "selected");
 		}
 		function exportExcelAll(data1,data2,data3,data4,data5,data6,data7,data8){
+			location.href=$.app+"/xkzfz/exportExcelAll?ssjyr="+data1+"&szdid="+data2+"&szgkid="+data3+"&szgqid="+data4+"&fzsqh="+data5+"&fzsfyx="+data6+"&wxhwpm="+data7+"&fzsfdq="+data8;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/xkzfz/exportExcelAll?ssjyr="+data1+"&szdid="+data2+"&szgkid="+data3+"&szgqid="+data4+"&fzsqh="+data5+"&fzsfyx="+data6+"&wxhwpm="+data7+"&fzsfdq="+data8;
-			    }
+			    	 }
 			});
 			
 		}

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/qytz/qytzmain.jsp

@@ -28,12 +28,12 @@
 		}
 		
 		function exportExcelAll(data1,data2,data3,data4,data5){
+			location.href=$.app+"/qytz/exportExcelAll?szdid="+data1+"&tzrmc="+data2+"&szgkid="+data3+"&szgqid="+data4+"&jyr="+data5;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/qytz/exportExcelAll?szdid="+data1+"&tzrmc="+data2+"&szgkid="+data3+"&szgqid="+data4+"&jyr="+data5;
-			    }
+			    	 }
 			});
 			
 		}

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/ry/rymain.jsp

@@ -31,11 +31,11 @@
 		}
 
 		function exportExcelAll(data1,data2,data3,data4,data5,data6){
+			location.href=$.app+"/ry/exportExcelAll?xm="+data1+"&szgkid="+data2+"&szgqid="+data3+"&jyr="+data4+"&szdid="+data5+"&rylxid="+data6;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/ry/exportExcelAll?xm="+data1+"&szgkid="+data2+"&szgqid="+data3+"&jyr="+data4+"&szdid="+data5+"&rylxid="+data6;
 			    }
 			});
 		}

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/sssb/sssbmain.jsp

@@ -28,11 +28,11 @@
 		}
 
 		function exportExcelAll(data1,data2,data3,data4,data5){
+			location.href=$.app+"/sssb/exportExcelAll?ssmc="+data1+"&szgkid="+data2+"&jyr="+data3+"&szgqid="+data4+"&szdid="+data5;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/sssb/exportExcelAll?ssmc="+data1+"&szgkid="+data2+"&jyr="+data3+"&szgqid="+data4+"&szdid="+data5;
 			    }
 			});
 		}

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxmain.jsp

@@ -53,12 +53,12 @@
 		}
 		
 		function exportExcelAll(data1,data2,data3,data4,data6,data7,data8,data9,data10){
+			location.href=$.app+"/xkzxx/exportExcelAll?gkjyr="+data1+"&szgqid="+data2+"&gkjyxkzh="+data3+"&szdid="+data4+"&szgkid="+data6+"&yxq1="+data7+"&yxq2="+data8+"&sfyx="+data9+"&xkzsfdq="+data10;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/xkzxx/exportExcelAll?gkjyr="+data1+"&szgqid="+data2+"&gkjyxkzh="+data3+"&szdid="+data4+"&szgkid="+data6+"&yxq1="+data7+"&yxq2="+data8+"&sfyx="+data9+"&xkzsfdq="+data10;
-		    	 }
+			    	}
 			});
 		}
 	</script>

+ 1 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/zxjx/zxjxmain.jsp

@@ -30,14 +30,13 @@
 		}
 		
 		function exportExcelAll(data1,data2,data3,data4,data5){
+			location.href=$.app+"/zxjx/exportExcelAll?szdid="+data1+"&jxlbmcid="+data2+"&szgkid="+data3+"&szgqid="+data4+"&jyr="+data5;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/zxjx/exportExcelAll?szdid="+data1+"&jxlbmcid="+data2+"&szgkid="+data3+"&szgqid="+data4+"&jyr="+data5;
 			    }
 			});
-			
 		}
 	</script>
 

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgedit.jsp

@@ -13,6 +13,8 @@
 <script type="text/javascript">
 		$(document).ready(function () {
 			iFrameHeightIframe('gkjyr');//自适应高度
+			lhbg.detail.path = "${path}";
+			lhbg.detail.type = "${type}";
 			lhbg.detail.init();
 		});
 	</script>

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgview.jsp

@@ -13,6 +13,8 @@
 <script type="text/javascript">
 		$(document).ready(function () {
 			lhbg.detail.taskKey="${taskKey}";
+			lhbg.detail.path = "${path}";
+			lhbg.detail.type = "${type}";
 			iFrameHeightIframe('gkjyr');//自适应高度
 			lhbg.detail.init();
 		});

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqedit.jsp

@@ -13,6 +13,8 @@
 	src="${app }/static/biz/js/gkjygl/gklhxkgl/gkjylhsq/lhsqdetail.js"></script>
 <script type="text/javascript">
 	$(document).ready(function() {
+		lhsq.detail.path = "${path}";
+		lhsq.detail.type= "${type}";
 		iFrameHeightIframe('gkjyr');//自适应高度
 		var root = $("#simple_new_menu");
 		$("#lhsqLi").addClass("active");

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqview.jsp

@@ -14,6 +14,8 @@
 <script type="text/javascript">
 	$(document).ready(function() {
 		lhsq.detail.taskKey="${taskKey}";
+		lhsq.detail.path = "${path}";
+		lhsq.detail.type= "${type}";
 		iFrameHeightIframe('gkjyr');//自适应高度
 		var root = $("#simple_new_menu");
 		$("#lhsqLi").addClass("active");

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxedit.jsp

@@ -12,6 +12,8 @@
 <script type="text/javascript" src="${app }/static/biz/js/gkjygl/gklhxkgl/gkjylhyx/lhyxdetail.js"></script>
 <script type="text/javascript">
 		$(document).ready(function () {
+			lhyx.detail.path = "${path}";
+			lhyx.detail.type = "${type}";
 			iFrameHeightIframe('gkjyr');//自适应高度
 			lhyx.detail.init();
 		});

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxview.jsp

@@ -13,6 +13,8 @@
 <script type="text/javascript">
 		$(document).ready(function () {
 			lhyx.detail.taskKey="${taskKey}";
+			lhyx.detail.path = "${path}";
+			lhyx.detail.type = "${type}";
 			iFrameHeightIframe('gkjyr');//自适应高度
 			lhyx.detail.init();
 		});

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjpro.jsp

@@ -137,11 +137,11 @@
 		//导出按钮
 		function exportExcelAll(){
 		    rqdate=$("#rq").val();
+		    location.href=$.app+"/hxhbtjpro/exportExcelAll?rq="+rqdate;
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中,请耐心等待!',
 			    confirm: function(){
-			    	location.href=$.app+"/hxhbtjpro/exportExcelAll?rq="+rqdate;
 				}
 			});
 		}

+ 12 - 5
gkjsjy/trunk/WebContent/static/biz/js/ggfwxxgl/jdtxxx/jdtxxxdetail.js

@@ -4,7 +4,8 @@
  */
 $.namespace("jdtxxx.detail");
 
-
+jdtxxx.detail.path=null;
+jdtxxx.detail.type=null;
 
 jdtxxx.detail.init=function(set,jyrset){
 	$.fn.zTree.init($("#usertree"), set);
@@ -12,7 +13,13 @@ jdtxxx.detail.init=function(set,jyrset){
 }
 
 jdtxxx.detail.back=function(){
-	location.href=$.app+"/jdtxxx/main";
+	if(jdtxxx.detail.path!=null&&jdtxxx.detail.path!=''){
+		var type=jdtxxx.detail.type;
+		location.href=$.app+jdtxxx.detail.path+"?type="+type;
+	}else {
+		location.href=$.app+"/jdtxxx/main";
+	}
+	
 }
 
 vae = function(a, b) {
@@ -44,7 +51,7 @@ jdtxxx.detail.save=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    	location.href=$.app+'/jdtxxx/main';
+		       		    	jdtxxx.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -81,7 +88,7 @@ jdtxxx.detail.savexf=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    	location.href=$.app+'/jdtxxx/main';
+		       		    	jdtxxx.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -119,7 +126,7 @@ jdtxxx.detail.submit=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    	location.href=$.app+'/jdtxxx/main';
+		       		    	jdtxxx.detail.back();
 		       		    }
 		           	});
 	           }else {

+ 12 - 4
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdetail.js

@@ -8,6 +8,8 @@ jgsq.detail.taskKey=null;
 jgsq.detail.opflag = null;
 jgsq.detail.hqflag = null;
 jgsq.detail.ssFlag = null;
+jgsq.detail.type = null;
+jgsq.detail.path = null;
 
 jgsq.detail.init=function(){
 }
@@ -255,7 +257,13 @@ function tzlxChange() {
 };
 
 jgsq.detail.back=function(){
-	location.href=$.app+"/jgsq/main";
+	if(jgsq.detail.path!=null&&jgsq.detail.path!=''){
+		var type=jgsq.detail.type;
+		location.href=$.app+jgsq.detail.path+"?type="+type;
+	}else {
+		location.href=$.app+"/jgsq/main";
+	}
+	
 }
 
 van=function(a,b){
@@ -297,7 +305,7 @@ jgsq.detail.save=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jgsq/main';
+		       		    	jgsq.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -359,7 +367,7 @@ jgsq.detail.submit=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jgsq/main';
+		       		    	jgsq.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -885,7 +893,7 @@ jgsq.detail.submitAudit=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jgsq/main';
+		       		    	jgsq.detail.back();
 		       		    }
 		           	});
 	           }else {

+ 13 - 5
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdsdetail.js

@@ -7,6 +7,8 @@ jgsqds.detail.gq=null;
 jgsqds.detail.taskKey=null;
 jgsqds.detail.opflag = null;
 jgsqds.detail.hqflag == null
+jgsqds.detail.path = null;
+jgsqds.detail.type = null;
 jgsqds.detail.init=function(){
 }
 
@@ -265,7 +267,13 @@ function tzlxChange() {
 };
 
 jgsqds.detail.back=function(){
-	location.href=$.app+"/jgsqds/main";
+	
+	if(jgsqds.detail.path!=null&&jgsqds.detail.path!=''){
+		var type=jgsqds.detail.type;
+		location.href=$.app+jgsqds.detail.path+"?type="+type;
+	}else {
+		location.href=$.app+"/jgsqds/main";
+	}
 }
 
 van=function(a,b){
@@ -306,7 +314,7 @@ jgsqds.detail.save=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jgsqds/main';
+		       		    	jgsqds.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -355,7 +363,7 @@ jgsqds.detail.submit=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jgsqds/main';
+		       		    	jgsqds.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -862,7 +870,7 @@ jgsqds.detail.submitAudit=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jgsqds/main';
+		       		    	jgsqds.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -1083,7 +1091,7 @@ jgsqds.detail.saveTbzt=function(data){
         		    title: '提示',
         		    content: '转报省级成功',
         		    confirm: function(){
-        		    	location.href=$.app+'/jgsqds/main';
+        		    	jgsqds.detail.back();
         		    }
         	 });
          } else {

+ 13 - 5
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdbg/jsjdbgdetail.js

@@ -8,7 +8,8 @@ jsjdbg.detail.taskKey=null;
 jsjdbg.detail.opflag=null;
 jsjdbg.detail.hqflag = null;
 jsjdbg.detail.ssFlag = null;
-
+jsjdbg.detail.path = null;
+jsjdbg.detail.type = null;
 jsjdbg.detail.viewBw=function(id){
 	$('#selectbwdiv').fadeIn(100);
 	$('#selectbw2div').slideDown(0);
@@ -208,7 +209,14 @@ jsjdbg.detail.init=function(){
 }
 
 jsjdbg.detail.back=function(){
-	location.href=$.app+"/jsjdbg/main";
+	
+	if(jsjdbg.detail.path!=null&&jsjdbg.detail.path!=''){
+		var type=jsjdbg.detail.type;
+		location.href=$.app+jsjdbg.detail.path+"?type="+type;
+	}else {
+		location.href=$.app+"/jsjdbg/main";
+	}
+
 }
 
 //构建政府投资额占比变化事件	
@@ -310,7 +318,7 @@ jsjdbg.detail.save=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jsjdbg/main';
+		       		    	jsjdbg.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -369,7 +377,7 @@ jsjdbg.detail.submit=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jsjdbg/main';
+		       		 	jsjdbg.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -889,7 +897,7 @@ jsjdbg.detail.submitAudit=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jsjdbg/main';
+		       		 	jsjdbg.detail.back();
 		       		    }
 		           	});
 	           }else {

+ 12 - 6
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdbg/jsjdbgdsdetail.js

@@ -7,7 +7,8 @@ jsjdbgds.detail.gq=null;
 jsjdbgds.detail.taskKey=null;
 jsjdbgds.detail.opflag=null;
 jsjdbgds.detail.hqflag = null;
-
+jsjdbgds.detail.path = null;
+jsjdbgds.detail.type = null;
 
 jsjdbgds.detail.viewBw=function(id){
 	$('#selectbwdiv').fadeIn(100);
@@ -35,7 +36,12 @@ jsjdbgds.detail.init=function(){
 }
 
 jsjdbgds.detail.back=function(){
-	location.href=$.app+"/jsjdbgds/main";
+	if(jsjdbgds.detail.path!=null&&jsjdbgds.detail.path!=''){
+		var type=jsjdbgds.detail.type;
+		location.href=$.app+jsjdbgds.detail.path+"?type="+type;
+	}else {
+		location.href=$.app+"/jsjdbgds/main";
+	}
 }
 
 //构建政府投资额占比变化事件	
@@ -134,7 +140,7 @@ jsjdbgds.detail.save=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jsjdbgds/main';
+		       		    	jsjdbgds.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -184,7 +190,7 @@ jsjdbgds.detail.submit=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jsjdbgds/main';
+		       		    	jsjdbgds.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -638,7 +644,7 @@ jsjdbgds.detail.submitAudit=function(){
 		       		    title: '提示',
 		       		    content: '操作成功',
 		       		    confirm: function(){
-		       		    location.href=$.app+'/jsjdbgds/main';
+		       		    	jsjdbgds.detail.back();
 		       		    }
 		           	});
 	           }else {
@@ -849,7 +855,7 @@ jsjdbgds.detail.saveTbzt=function(data){
         		    title: '提示',
         		    content: '转报省级成功',
         		    confirm: function(){
-        		    	location.href=$.app+'/jsjdbgds/main';
+        		    	jsjdbgds.detail.back();
         		    }
         	 });
          } else {

+ 12 - 4
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdcbsj/jsjdcbsjdetail.js

@@ -7,6 +7,8 @@ jsjdcbsj.detail.taskKey = null;
 jsjdcbsj.detail.opflag = null;
 jsjdcbsj.detail.hqflag = null;
 jsjdcbsj.detail.ssFlag = null;
+jsjdcbsj.detail.path = null;
+jsjdcbsj.detail.type = null;
 jsjdcbsj.detail.init = function() {
 }
 
@@ -255,7 +257,13 @@ function tzlxChange() {
 };
 
 jsjdcbsj.detail.back = function() {
-	location.href = $.app + "/jsjdcbsj/main";
+	if(jsjdcbsj.detail.path!=null&&jsjdcbsj.detail.path!=''){
+		var type=jsjdcbsj.detail.type;
+		location.href=$.app+jsjdcbsj.detail.path+"?type="+type;
+	}else {
+		location.href = $.app + "/jsjdcbsj/main";
+	}
+	
 }
 
 van = function(a, b) {
@@ -304,7 +312,7 @@ jsjdcbsj.detail.save = function() {
 					title : '提示',
 					content : '操作成功',
 					confirm : function() {
-						location.href = $.app + '/jsjdcbsj/main';
+						jsjdcbsj.detail.back();
 					}
 				});
 			} else {
@@ -371,7 +379,7 @@ jsjdcbsj.detail.submit = function() {
 					title : '提示',
 					content : '操作成功',
 					confirm : function() {
-						location.href = $.app + '/jsjdcbsj/main';
+						jsjdcbsj.detail.back();
 					}
 				});
 			} else {
@@ -401,7 +409,7 @@ jsjdcbsj.detail.submitAudit = function() {
 					title : '提示',
 					content : '操作成功',
 					confirm : function() {
-						location.href = $.app + '/jsjdcbsj/main';
+						jsjdcbsj.detail.back();
 					}
 				});
 			} else {

+ 14 - 5
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdcbsj/jsjdcbsjdsdetail.js

@@ -6,6 +6,8 @@ jsjdcbsjds.detail.gq = null;
 jsjdcbsjds.detail.taskKey = null;
 jsjdcbsjds.detail.opflag = null;
 jsjdcbsjds.detail.hqflag = null;
+jsjdcbsjds.detail.path = null;
+jsjdcbsjds.detail.type = null;
 jsjdcbsjds.detail.init = function() {
 }
 
@@ -268,7 +270,14 @@ function tzlxChange() {
 };
 
 jsjdcbsjds.detail.back = function() {
-	location.href = $.app + "/jsjdcbsjds/main";
+	if(jsjdcbsjds.detail.path!=null&&jsjdcbsjds.detail.path!=''){
+		var type=jsjdcbsjds.detail.type;
+		location.href=$.app+jsjdcbsjds.detail.path+"?type="+type;
+	}else {
+		location.href = $.app + "/jsjdcbsjds/main";
+	}
+	
+	
 }
 
 van = function(a, b) {
@@ -317,7 +326,7 @@ jsjdcbsjds.detail.save = function() {
 					title : '提示',
 					content : '操作成功',
 					confirm : function() {
-						location.href = $.app + '/jsjdcbsjds/main';
+						jsjdcbsjds.detail.back();
 					}
 				});
 			} else {
@@ -372,7 +381,7 @@ jsjdcbsjds.detail.submit = function() {
 					title : '提示',
 					content : '操作成功',
 					confirm : function() {
-						location.href = $.app + '/jsjdcbsjds/main';
+						jsjdcbsjds.detail.back();
 					}
 				});
 			} else {
@@ -402,7 +411,7 @@ jsjdcbsjds.detail.submitAudit = function() {
 					title : '提示',
 					content : '操作成功',
 					confirm : function() {
-						location.href = $.app + '/jsjdcbsjds/main';
+						jsjdcbsjds.detail.back();
 					}
 				});
 			} else {
@@ -1161,7 +1170,7 @@ jsjdcbsjds.detail.saveTbzt = function(data) {
 				title : '提示',
 				content : '转报省级成功',
 				confirm : function() {
-					location.href = $.app + '/jsjdcbsjds/main';
+					jsjdcbsjds.detail.back();
 				}
 			});
 		} else {

+ 14 - 7
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgdetail.js

@@ -10,6 +10,8 @@ lhbg.detail.szdData=null;
 lhbg.detail.gk = null;
 lhbg.detail.gq = null;
 lhbg.detail.taskKey=null;
+lhbg.detail.path = null;
+lhbg.detail.type = null;
 lhbg.detail.init = function() {
 	initgkSelect('gksel', '', lhbg.detail.szdData,'showgq', 300);
 	initgqSelect('gqsel','','','',null,300);
@@ -39,7 +41,7 @@ lhbg.detail.delData=function(data){
                 		    title: '提示',
                 		    content: '删除成功',
                 		    confirm: function(){
-                		    	location.href=$.app+'/lhbg/main';
+                		    	lhbg.detail.back();
                 		    }
                 	 });
                  } else {
@@ -148,7 +150,7 @@ lhbg.detail.save = function(){
 						title : '提示',
 						content : '操作成功',
 						confirm : function() {
-							 location.href=$.app+'/lhbg/main';
+							lhbg.detail.back();
 						}
 					});
 		       		
@@ -200,7 +202,7 @@ lhbg.detail.saveTb = function(){
 						title : '提示',
 						content : '操作成功',
 						confirm : function() {
-							 location.href=$.app+'/lhbg/main';
+							lhbg.detail.back();
 						}
 					});
 		       		
@@ -263,7 +265,7 @@ lhbg.detail.submit = function(){
 						title : '提示',
 						content : '操作成功',
 						confirm : function() {
-							 location.href=$.app+'/lhbg/main';
+							lhbg.detail.back();
 						}
 					});
 	           }else{
@@ -281,8 +283,13 @@ lhbg.detail.submit = function(){
 
 // 返回
 lhbg.detail.back = function(){
+	if(lhbg.detail.path!=null&&lhbg.detail.path!=''){
+		var type=lhbg.detail.type;
+		location.href=$.app+lhbg.detail.path+"?type="+type;
+	}else {
+		location.href=$.app+'/lhbg/main';
+	}
 	
-	location.href=$.app+'/lhbg/main';
    		
 }
 
@@ -390,7 +397,7 @@ lhbg.detail.audit=function(auditpass,id){
            		    title: '提示',
            		    content: '操作成功',
            		    confirm: function(){
-           		    	location.href=$.app+'/lhbg/main';
+           		    	lhbg.detail.back();
            		    }
                	});
     	
@@ -431,7 +438,7 @@ lhbg.detail.submitAudit=function(){
             		    title: '提示',
             		    content: '操作成功',
             		    confirm: function(){
-            		    	location.href=$.app+'/lhbg/main';
+            		    	lhbg.detail.back();
             		    }
                 	});
             }else {

+ 14 - 14
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhsq/lhsqdetail.js

@@ -10,6 +10,7 @@ lhsq.detail.szdData = null;
 lhsq.detail.gk = null;
 lhsq.detail.gq = null;
 lhsq.detail.path = null;
+lhsq.detail.type= null;
 lhsq.detail.taskKey=null;
 lhsq.detail.init = function() {
 	
@@ -32,7 +33,13 @@ function showYj() {
 
 //返回
 lhsq.detail.back = function() {
-	location.href=$.app+'/lhsq/main';
+	
+	if(lhsq.detail.path!=null&&lhsq.detail.path!=''){
+		var type=lhsq.detail.type;
+		location.href=$.app+lhsq.detail.path+"?type="+type;
+	}else {
+		location.href=$.app+'/lhsq/main';
+	}
 }
 
 
@@ -81,7 +88,7 @@ lhsq.detail.save = function() {
 						title : '提示',
 						content : '操作成功',
 						confirm : function() {
-							 location.href=$.app+'/lhsq/main';
+							lhsq.detail.back();
 						}
 					});
 			} else {
@@ -132,7 +139,7 @@ lhsq.detail.saveTb = function() {
 						title : '提示',
 						content : '操作成功',
 						confirm : function() {
-							 location.href=$.app+'/lhsq/main';
+							lhsq.detail.back();
 						}
 					});
 			} else {
@@ -172,7 +179,7 @@ lhsq.detail.submit = function() {
 						title : '提示',
 						content : '操作成功',
 						confirm : function() {
-							 location.href=$.app+'/lhsq/main';
+							lhsq.detail.back();
 						}
 					});
 			} else {
@@ -202,7 +209,7 @@ lhsq.detail.delData=function(data){
                 		    title: '提示',
                 		    content: '删除成功',
                 		    confirm: function(){
-                		    	location.href=$.app+'/lhsq/main';
+                		    	lhsq.detail.back();
                 		    }
                 	 });
                  } else {
@@ -221,13 +228,6 @@ lhsq.detail.delData=function(data){
 	});
 }
 
-//返回
-lhsq.detail.back = function(){
-	
-	location.href=$.app+'/lhsq/main';
-   		
-}
-
 // 保存附件
 lhsq.detail.submitFile = function(id){
 	 $('#addform').form('submit', {
@@ -356,7 +356,7 @@ lhsq.detail.audit=function(auditpass,id){
            		    title: '提示',
            		    content: '操作成功',
            		    confirm: function(){
-           		    	location.href=$.app+'/lhsq/main';
+           		    	lhsq.detail.back();
            		    }
                	});
           
@@ -396,7 +396,7 @@ lhsq.detail.submitAudit=function(){
             		    title: '提示',
             		    content: '操作成功',
             		    confirm: function(){
-            		    	location.href=$.app+'/lhsq/main';
+            		    	lhsq.detail.back();
             		    }
                 	});
             }else {

+ 14 - 9
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhyx/lhyxdetail.js

@@ -10,6 +10,8 @@ lhyx.detail.szdData=null;
 lhyx.detail.gk = null;
 lhyx.detail.gq = null;
 lhyx.detail.taskKey=null;
+lhyx.detail.path = null;
+lhyx.detail.type = null;
 lhyx.detail.init = function() {
 	initgkSelect('gksel', '', lhyx.detail.szdData,'showgq', 300);
 	initgqSelect('gqsel','','','',null,300);
@@ -41,7 +43,7 @@ lhyx.detail.delData=function(data){
                 		    title: '提示',
                 		    content: '删除成功',
                 		    confirm: function(){
-                		    	location.href=$.app+'/lhyx/main';
+                		    	lhyx.detail.back();
                 		    }
                 	 });
                  } else {
@@ -143,7 +145,7 @@ lhyx.detail.save = function(){
 						title : '提示',
 						content : '操作成功',
 						confirm : function() {
-							 location.href=$.app+'/lhyx/main';
+							lhyx.detail.back();
 						}
 					});
 		       		
@@ -198,7 +200,7 @@ lhyx.detail.saveTb = function(){
 						title : '提示',
 						content : '操作成功',
 						confirm : function() {
-							 location.href=$.app+'/lhyx/main';
+							lhyx.detail.back();
 						}
 					});
 		       		
@@ -263,7 +265,7 @@ lhyx.detail.submit = function(){
 						title : '提示',
 						content : '操作成功',
 						confirm : function() {
-							 location.href=$.app+'/lhyx/main';
+							lhyx.detail.back();
 						}
 					});
 	           }else{
@@ -281,9 +283,12 @@ lhyx.detail.submit = function(){
 
 // 返回
 lhyx.detail.back = function(){
-	
-	location.href=$.app+'/lhyx/main';
-   		
+	if(lhyx.detail.path!=null&&lhyx.detail.path!=''){
+		var type=lhyx.detail.type;
+		location.href=$.app+lhyx.detail.path+"?type="+type;
+	}else {
+		location.href=$.app+'/lhyx/main';
+	}
 }
 
 // 保存附件
@@ -387,7 +392,7 @@ lhyx.detail.audit=function(auditpass,id){
            		    title: '提示',
            		    content: '操作成功',
            		    confirm: function(){
-           		    	location.href=$.app+'/lhyx/main';
+           		    	lhyx.detail.back();
            		    }
                	});
           
@@ -427,7 +432,7 @@ lhyx.detail.submitAudit=function(){
             		    title: '提示',
             		    content: '操作成功',
             		    confirm: function(){
-            		    	location.href=$.app+'/lhyx/main';
+            		    	lhyx.detail.back();
             		    }
                 	});
             }else {

+ 3 - 10
gkjsjy/trunk/WebContent/static/biz/js/todo.js

@@ -30,11 +30,11 @@ todo.banli=function(type,id){
 	}else if(type=="xkzzx"){
 		location.href=$.app+"/xkzzx/viewmain?flag=audit&id="+id+"&path2="+path+"&type="+type;
 	}else if(type=="jsjdcbsjds"){
-		location.href=$.app+"/jsjdcbsjds/view?flag=audit&path="+path+"&id="+id+"&type="+type;
+		location.href=$.app+"/jsjdcbsjds/view?flag=audit&path="+path+"&id="+id+"&type="+"qt";
 	}else if(type=="jsjdbgds"){
-		location.href=$.app+"/jsjdbgds/view?flag=audit&path="+path+"&id="+id+"&type="+type;
+		location.href=$.app+"/jsjdbgds/view?flag=audit&path="+path+"&id="+id+"&type="+"qt";
 	}else if(type=="jgsqds"){
-		location.href=$.app+"/jgsqds/view?flag=audit&path="+path+"&id="+id+"&type="+type;
+		location.href=$.app+"/jgsqds/view?flag=audit&path="+path+"&id="+id+"&type="+"qt";
 	}else if(type=="jsjdcbsj"){
 		location.href=$.app+"/jsjdcbsj/view?flag=audit&path="+path+"&id="+id+"&type="+type;
 	}else if(type=="jsjdbg"){
@@ -49,8 +49,6 @@ todo.banli=function(type,id){
 		location.href=$.app+"/lhzx/view?flag=audit&path="+path+"&id="+id+"&type="+type;
 	}else if(type=="jdtx"){
 		location.href=$.app+"/jdtxxx/view?flag=audit&path="+path+"&id="+id+"&type="+type;
-	}else if(type="jsjd"){
-		location.href=$.app+"/jsjdgl/edit?id="+id+"&flag=audit&type="+type;
 	}
 }
 
@@ -60,8 +58,6 @@ todo.banliTh=function(type,id){
 		location.href=$.app+"/dcsb/edit?flag=th&path="+path+"&id="+id+"&type="+type;
 	}else if(type=="jsjd"){
 		location.href=$.app+"/jsjdgl/edit?id="+id+"&flag=audit"+"&path="+path+"&type="+type;
-	}else if(type=="jsjdjggz"){
-		location.href=$.app+"/jsjdgl/edit?id="+id+"&flag=audit"+"&path="+path+"&type="+type;
 	}else if(type=="xkzyx"){
 		location.href=$.app+"/xkzyx/editmain?flag=th&id="+id+"&path2="+path+"&type="+type;
 	}else if(type=="xkzsq"){
@@ -90,9 +86,6 @@ todo.banliTh=function(type,id){
 		location.href=$.app+"/lhzx/edit?flag=th&path="+path+"&id="+id+"&type="+type;
 	}else if(type=="jdtx"){
 		location.href=$.app+"/jdtxxx/edit?flag=audit&path="+path+"&id="+id+"&type="+type;
-	}else if(type=="jsjd"){
-		location.href=$.app+"/jsjdgl/edit?id="+id+"&flag=audit&type="+type;
-	
 	}
 }
 

+ 6 - 2
gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/ctl/JdtxxxCtl.java

@@ -655,8 +655,10 @@ public class JdtxxxCtl extends BaseWebCtl {
 	//编辑信息
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jdtxxx:edit")
-	public String edit(Model model, String id, String flag) {
+	public String edit(Model model, String id, String flag,String path,String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("path",path);
+		model.addAttribute("type",type);
 		JdtxxxEntity entity = jdtxxxService.findOne(id);
 		JdtxxxVo vo = new JdtxxxVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -681,8 +683,10 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 	//查看
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag,String path,String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("path",path);
+		model.addAttribute("type",type);
 		JdtxxxEntity entity = jdtxxxService.findOne(id);
 		JdtxxxVo vo = new JdtxxxVo();
 		BeanUtils.copyProperties(entity, vo);

+ 6 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java

@@ -775,8 +775,10 @@ public class JgsqCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jgsq:edit")
-	public String edit(Model model, String id, String flag) {
+	public String edit(Model model, String id, String flag,String path,String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		JgsqEntity entity = jgsqService.findOne(id);
 		JgsqVo vo = new JgsqVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -980,8 +982,10 @@ public class JgsqCtl extends BaseWebCtl {
 
 	// 查看
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag,String path,String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		JgsqEntity entity = jgsqService.findOne(id);
 		JgsqVo vo = new JgsqVo();
 		BeanUtils.copyProperties(entity, vo);

+ 6 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java

@@ -769,8 +769,10 @@ public class JgsqdsCtl extends BaseWebCtl {
 	//编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jgsqds:edit")
-	public String edit(Model model, String id, String flag) {
+	public String edit(Model model, String id, String flag,String path,String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		JgsqEntity entity = jgsqdsService.findOne(id);
 		XmxxglVo vo = new XmxxglVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -904,8 +906,10 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 	//查看
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag,String path,String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("type", type);
+		model.addAttribute("path", path);
 		JgsqEntity entity = jgsqdsService.findOne(id);
 		JgsqVo vo = new JgsqVo();
 		BeanUtils.copyProperties(entity, vo);

+ 6 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java

@@ -730,7 +730,9 @@ public class JsjdbgCtl extends BaseWebCtl {
 	// 编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jsjdbg:edit")
-	public String edit(Model model, String id, String flag) {
+	public String edit(Model model, String id, String flag, String path, String type) {
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		model.addAttribute("flag", flag);
 		JsjdbgEntity entity = jsjdbgService.findOne(id);
 		JsjdbgVo vo = new JsjdbgVo();
@@ -935,8 +937,10 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 	// 查看
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag, String path, String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		JsjdbgEntity entity = jsjdbgService.findOne(id);
 		JsjdbgVo vo = new JsjdbgVo();
 		BeanUtils.copyProperties(entity, vo);

+ 6 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -769,8 +769,10 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jsjdbgds:edit")
-	public String edit(Model model, String id, String flag) {
+	public String edit(Model model, String id, String flag,String path,String type) {
+		model.addAttribute("path", path);
 		model.addAttribute("flag", flag);
+		model.addAttribute("type", type);
 		JsjdbgEntity entity = jsjdbgdsService.findOne(id);
 		JsjdbgVo vo = new JsjdbgVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -894,7 +896,9 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag,String path,String type) {
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		model.addAttribute("flag", flag);
 		JsjdbgEntity entity = jsjdbgdsService.findOne(id);
 		JsjdbgVo vo = new JsjdbgVo();

+ 6 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java

@@ -839,8 +839,10 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	// 编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jsjdcbsj:edit")
-	public String edit(Model model, String id, String flag) {
+	public String edit(Model model, String id, String flag,String path,String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
 		JsjdcbsjVo vo = new JsjdcbsjVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -1040,8 +1042,10 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	// 查看
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag,String path,String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
 		JsjdcbsjVo vo = new JsjdcbsjVo();

+ 6 - 3
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java

@@ -783,7 +783,9 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 	// 编辑数据
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jsjdcbsjds:edit")
-	public String edit(Model model, String id, String flag) {
+	public String edit(Model model, String id, String flag,String path,String type) {
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		model.addAttribute("flag", flag);
 		JsjdcbsjEntity entity = jsjdcbsjdsService.findOne(id);
 		JsjdcbsjVo vo = new JsjdcbsjVo();
@@ -984,9 +986,10 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 
 	// 查看
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag,String path,String type) {
 		model.addAttribute("flag", flag);
-
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		JsjdcbsjEntity entity = jsjdcbsjdsService.findOne(id);
 		JsjdcbsjVo vo = new JsjdcbsjVo();
 		BeanUtils.copyProperties(entity, vo);

+ 6 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -290,8 +290,10 @@ public class LhbgCtl extends BaseWebCtl {
 	 * @return
 	 */
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag, String path, String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		LhbgEntity lhbg = lhbgService.findOne(id);
 
 		List<LhbgfjEntity> list = lhbgfjService.findByBgid(lhbg.getId());
@@ -400,7 +402,9 @@ public class LhbgCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("lhbg:edit")
-	public String edit(Model model, String id, String flag) {
+	public String edit(Model model, String id, String flag, String path, String type) {
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		model.addAttribute("flag", flag);
 		LhbgEntity lhbg = lhbgService.findOne(id);
 		model.addAttribute("record", lhbg);

+ 41 - 23
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -85,22 +85,31 @@ public class LhsqCtl extends BaseWebCtl {
 
 	/**
 	 * 一览
-	 * @param page 分页
+	 * 
+	 * @param page
+	 *            分页
 	 * @param model
-	 * @param lczt 流程状态
-	 * @param szdid 所在地ID
-	 * @param szgkid 所在港口ID
-	 * @param szgqid 所在港区ID
-	 * @param gkjyr 经营人
-	 * @param fddbr 法定代表人
-	 * @param bgdd 办公地址
+	 * @param lczt
+	 *            流程状态
+	 * @param szdid
+	 *            所在地ID
+	 * @param szgkid
+	 *            所在港口ID
+	 * @param szgqid
+	 *            所在港区ID
+	 * @param gkjyr
+	 *            经营人
+	 * @param fddbr
+	 *            法定代表人
+	 * @param bgdd
+	 *            办公地址
 	 * @param menuid
 	 * @return
 	 * @throws JsonProcessingException
 	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("lhsq:main")
-	public String main(SimplePageRequest page,final HttpServletRequest request, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
+	public String main(SimplePageRequest page, final HttpServletRequest request, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
 		if (!StringUtils.isEmpty(user.getSsjyr())) {
@@ -223,9 +232,9 @@ public class LhsqCtl extends BaseWebCtl {
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 		model.addAttribute("lczt", lczt);
-		model.addAttribute("gkjyr",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr"));
-		model.addAttribute("fddbr",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr"));
-		model.addAttribute("bgdd",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd"));
+		model.addAttribute("gkjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr"));
+		model.addAttribute("fddbr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr"));
+		model.addAttribute("bgdd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd"));
 		model.addAttribute("list", voList);
 		model.addAttribute("menuid", menuid);
 		// 翻页共通
@@ -278,7 +287,9 @@ public class LhsqCtl extends BaseWebCtl {
 	// 编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("lhsq:edit")
-	public String edit(Model model, String id, String flag) {
+	public String edit(Model model, String id, String flag, String path, String type) {
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		model.addAttribute("flag", flag);
 		LhsqEntity lhsq = lhsqService.findOne(id);
 		model.addAttribute("record", lhsq);
@@ -316,7 +327,9 @@ public class LhsqCtl extends BaseWebCtl {
 
 	// 查看
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag) {
+	public String view(Model model, String id, String flag, String path, String type) {
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		model.addAttribute("flag", flag);
 		LhsqEntity lhsq = lhsqService.findOne(id);
 		model.addAttribute("record", lhsq);
@@ -326,7 +339,7 @@ public class LhsqCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhsqfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -640,7 +653,7 @@ public class LhsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//同步 到省级
+	// 同步 到省级
 	@RequestMapping(value = "/saveTbzt")
 	@ResponseBody
 	public WebJsonResult saveTbzt(Model model, String id) {
@@ -739,6 +752,7 @@ public class LhsqCtl extends BaseWebCtl {
 
 	/**
 	 * 退回提交
+	 * 
 	 * @param code
 	 * @param accid
 	 * @param userids
@@ -797,9 +811,13 @@ public class LhsqCtl extends BaseWebCtl {
 
 	/**
 	 * 审核流程
-	 * @param shyj 审核意见
-	 * @param id 主键ID
-	 * @param flag  同意true 不同意 false
+	 * 
+	 * @param shyj
+	 *            审核意见
+	 * @param id
+	 *            主键ID
+	 * @param flag
+	 *            同意true 不同意 false
 	 * @param userids
 	 * @return
 	 */
@@ -831,7 +849,7 @@ public class LhsqCtl extends BaseWebCtl {
 
 					// 许可证信息
 					GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());
-					if(jyr != null){
+					if (jyr != null) {
 						XkzxxEntity xkz = new XkzxxEntity();
 						xkz.setGkjyr(jyr.getId());
 						// xkz.setZyqyfw(jyfwstr2);
@@ -860,7 +878,7 @@ public class LhsqCtl extends BaseWebCtl {
 							code = securityMgr.codeService().findOne(code.getPid());
 						}
 						szd = szd + "港经证";
-						
+
 						xkz.setGkjyxkzh("");
 						xkz.setFzrq(new Date());
 						xkz.setYxqq(new Date());
@@ -876,9 +894,9 @@ public class LhsqCtl extends BaseWebCtl {
 						xkz.setOpid(entity.getId());
 						xkz = xkzxxService.save(xkz);
 					}
-					
+
 				}
-				//退回地市,同步
+				// 退回地市,同步
 				if (!flag) {
 					entity.setSftb(Constants.YES);
 					entity = lhsqService.save(entity);

+ 41 - 22
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -95,22 +95,30 @@ public class LhyxCtl extends BaseWebCtl {
 
 	/**
 	 * 一览
+	 * 
 	 * @param page
 	 * @param model
-	 * @param lczt 流程状态
-	 * @param szdid 所在地ID
-	 * @param szgkid 所在港口Id
-	 * @param szgqid 所在港区ID
-	 * @param gkjyr 经营人
-	 * @param fddbr 法定代表人
-	 * @param bgdd 办地地址
-	 * @param menuid 
+	 * @param lczt
+	 *            流程状态
+	 * @param szdid
+	 *            所在地ID
+	 * @param szgkid
+	 *            所在港口Id
+	 * @param szgqid
+	 *            所在港区ID
+	 * @param gkjyr
+	 *            经营人
+	 * @param fddbr
+	 *            法定代表人
+	 * @param bgdd
+	 *            办地地址
+	 * @param menuid
 	 * @return
 	 * @throws JsonProcessingException
 	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("lhyx:main")
-	public String main(SimplePageRequest page, Model model,final HttpServletRequest request, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
+	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
 		if (!StringUtils.isEmpty(user.getSsjyr())) {
@@ -283,8 +291,10 @@ public class LhyxCtl extends BaseWebCtl {
 
 	// 查看
 	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String opflag) {
+	public String view(Model model, String id, String flag, String opflag, String path, String type) {
 		model.addAttribute("flag", flag);
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		LhyxEntity lhyx = lhyxService.findOne(id);
 		model.addAttribute("record", lhyx);
 		List<LhyxfjEntity> list = lhyxfjService.findByYxid(lhyx.getId());
@@ -292,7 +302,7 @@ public class LhyxCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhyxfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -383,7 +393,9 @@ public class LhyxCtl extends BaseWebCtl {
 	// 编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("lhyx:edit")
-	public String edit(Model model, String id, String flag) {
+	public String edit(Model model, String id, String flag, String path, String type) {
+		model.addAttribute("path", path);
+		model.addAttribute("type", type);
 		model.addAttribute("flag", flag);
 		LhyxEntity lhyx = lhyxService.findOne(id);
 		model.addAttribute("record", lhyx);
@@ -563,6 +575,7 @@ public class LhyxCtl extends BaseWebCtl {
 
 	/**
 	 * 退回提交
+	 * 
 	 * @param code
 	 * @param accid
 	 * @param userids
@@ -693,10 +706,15 @@ public class LhyxCtl extends BaseWebCtl {
 
 	/**
 	 * 审核流程
-	 * @param shyj 审核意见
-	 * @param id 主键ID
-	 * @param flag 同意true 不同意false
-	 * @param userids 选择人员
+	 * 
+	 * @param shyj
+	 *            审核意见
+	 * @param id
+	 *            主键ID
+	 * @param flag
+	 *            同意true 不同意false
+	 * @param userids
+	 *            选择人员
 	 * @return
 	 */
 	@RequestMapping(value = "/audit")
@@ -722,11 +740,11 @@ public class LhyxCtl extends BaseWebCtl {
 				}
 				// entity.setSftb(Constants.YES);
 				entity = lhyxService.save(entity);
-				if(flag){
+				if (flag) {
 					List<XkzxxEntity> list = xkzxxService.findByJyrid(entity.getJyrid());
-					if(list != null && list.size()>0){
-						for(XkzxxEntity xkz:list){
-							if("1".equals(xkz.getSfyx())){
+					if (list != null && list.size() > 0) {
+						for (XkzxxEntity xkz : list) {
+							if ("1".equals(xkz.getSfyx())) {
 								xkz.setIsflag("0");
 								xkz = xkzxxService.save(xkz);
 								XkzxxEntity xkzxx = new XkzxxEntity();
@@ -748,7 +766,7 @@ public class LhyxCtl extends BaseWebCtl {
 								xkzxx.setZyhwpm(xkz.getZyhwpm());
 								xkzxx.setZyqyfw(xkz.getZyqyfw());
 								xkzxx.setSzgk(xkz.getSzgk());
-								//xkzxx.setZmpicid(xkz.getZmpicid());
+								// xkzxx.setZmpicid(xkz.getZmpicid());
 								if (xkz.getYxqz() != null) {
 									SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
 									String date = dateTimeFormat.format(xkz.getYxqz());
@@ -764,7 +782,7 @@ public class LhyxCtl extends BaseWebCtl {
 						}
 					}
 				}
-				
+
 				if (!flag) {
 					entity.setSftb(Constants.YES);
 					entity = lhyxService.save(entity);
@@ -804,6 +822,7 @@ public class LhyxCtl extends BaseWebCtl {
 
 	/**
 	 * 同步省级状态
+	 * 
 	 * @param model
 	 * @param id
 	 * @return