Преглед изворни кода

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

ld_xuhx пре 9 година
родитељ
комит
5806a5f7ca
100 измењених фајлова са 343 додато и 242 уклоњено
  1. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxgl/hxgladdmain.jsp
  2. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxhbgl/hxhbglmain.jsp
  3. 4 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdjc/jdjcmain.jsp
  4. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtx/jdtxmain.jsp
  5. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/tzgg/gg/ggmain.jsp
  6. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/tzgg/ggfb/ggfbmain.jsp
  7. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/tzgg/ggxx/ggxxmain.jsp
  8. 4 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/ax/axmain.jsp
  9. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/fbd/fbdmain.jsp
  10. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/gk/gkmain.jsp
  11. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/gq/gqmain.jsp
  12. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/jghd/jghdmain.jsp
  13. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/md/mdmain.jsp
  14. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtmain.jsp
  15. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/xzdwxxgl/xzglryxx/xzglrymain.jsp
  16. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/zyq/zyqmain.jsp
  17. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgmain.jsp
  18. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqmain.jsp
  19. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxmain.jsp
  20. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgmain.jsp
  21. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjmain.jsp
  22. 1 17
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp
  23. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglmain.jsp
  24. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl2/jsjdglmain.jsp
  25. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxmain.jsp
  26. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/tzjhgl/tzjhglmain.jsp
  27. 25 21
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgladd.jsp
  28. 27 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgledit.jsp
  29. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglmain.jsp
  30. 36 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglview.jsp
  31. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsb/dcsbmain.jsp
  32. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsbybb/dcsbybbmain.jsp
  33. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwmain.jsp
  34. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrcg/cgmain.jsp
  35. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrck/ckmain.jsp
  36. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrdc/dcmain.jsp
  37. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/bwxx.jsp
  38. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/cgxx.jsp
  39. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/ckxx.jsp
  40. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/dcxx.jsp
  41. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp
  42. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/mtxx.jsp
  43. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/qytzxx.jsp
  44. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/ryxx.jsp
  45. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/sssbxx.jsp
  46. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/zxjxxx.jsp
  47. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrxkzfz/xkzfzmain.jsp
  48. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/qytz/qytzmain.jsp
  49. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/ry/ryedit.jsp
  50. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/ry/rymain.jsp
  51. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/sssb/sssbmain.jsp
  52. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzns/xkznsmain.jsp
  53. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxmain.jsp
  54. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/zxjx/zxjxmain.jsp
  55. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/bwxxadd.jsp
  56. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/bwxxedit.jsp
  57. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/cgxxadd.jsp
  58. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/cgxxedit.jsp
  59. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ckxxadd.jsp
  60. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ckxxedit.jsp
  61. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/dcxxadd.jsp
  62. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/dcxxedit.jsp
  63. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/mtxxadd.jsp
  64. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/mtxxedit.jsp
  65. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/qytzxxadd.jsp
  66. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/qytzxxedit.jsp
  67. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ryxxadd.jsp
  68. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ryxxedit.jsp
  69. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/sssbxxadd.jsp
  70. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/sssbxxedit.jsp
  71. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgmain.jsp
  72. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/zxjxxxadd.jsp
  73. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/zxjxxxedit.jsp
  74. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/bwxxadd.jsp
  75. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/bwxxedit.jsp
  76. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/cgxxadd.jsp
  77. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/cgxxedit.jsp
  78. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ckxxadd.jsp
  79. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ckxxedit.jsp
  80. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/dcxxadd.jsp
  81. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/dcxxedit.jsp
  82. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/mtxxadd.jsp
  83. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/mtxxedit.jsp
  84. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/qytzxxadd.jsp
  85. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/qytzxxedit.jsp
  86. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ryxxadd.jsp
  87. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ryxxedit.jsp
  88. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/sssbxxadd.jsp
  89. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/sssbxxedit.jsp
  90. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain.jsp
  91. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/zxjxxxadd.jsp
  92. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/zxjxxxedit.jsp
  93. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxmain.jsp
  94. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxmain.jsp
  95. 8 10
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgadd.jsp
  96. 19 7
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgedit.jsp
  97. 13 8
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.jsp
  98. 22 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgview.jsp
  99. 14 17
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqadd.jsp
  100. 28 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqedit.jsp

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxgl/hxgladdmain.jsp

@@ -147,7 +147,7 @@
 							<td class="operatetd">	<a class="btn btn-default btn-xs" href="#" onclick="hxgl.detail.view('${hxhbgl.id}','${month}')" title="查看"> <i class="glyphicon glyphicon-search"></i>
 									</a>
 								<c:if test="${hxhbgl.sfth==202 }">
-									<a class="btn btn-default btn-xs" href="#" onclick="hxgl.detail.edit('${hxhbgl.id}','${month}')" title="修改"> <i class="glyphicon glyphicon-wrench"></i> 
+									<a class="btn btn-default btn-xs" href="#" onclick="hxgl.detail.edit('${hxhbgl.id}','${month}')" title="编辑"> <i class="glyphicon glyphicon-pencil"></i> 
 									</a>
 								</c:if>
 									<a class="btn btn-default btn-xs" href="#" onclick="hxgl.detail.del('${hxhbgl.id}')" title="删除"> <i class="glyphicon glyphicon-trash"></i> 

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxhbgl/hxhbglmain.jsp

@@ -142,8 +142,8 @@
 						        </a>
 						       </authz:hasPermission>
 						       <authz:hasPermission name="${appName}:hxhbgl:edit">
-								<a class="btn btn-default btn-xs" href="#"  onclick="hxhbgl.main.edit('${hxhbgl.id}')" title="修改">
-							   		<i class="glyphicon glyphicon-wrench"></i>
+								<a class="btn btn-default btn-xs" href="#"  onclick="hxhbgl.main.edit('${hxhbgl.id}')" title="编辑">
+							   		<i class="glyphicon glyphicon-pencil"></i>
 							   	</a>
 							   	</authz:hasPermission>
 							   	<authz:hasPermission name="${appName}:hxhbgl:delete">

+ 4 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdjc/jdjcmain.jsp

@@ -123,8 +123,8 @@
 							    </authz:hasPermission>
 							 <c:if test="${jdjc.btnflag == 1 &&jdjc.flowflag == 0 &&jdjc.recordStatus == 1}"> 
 							  <authz:hasPermission name="${appName}:jdjc:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="jdjc.main.edit('${jdjc.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="jdjc.main.edit('${jdjc.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 								</authz:hasPermission>
 								<authz:hasPermission name="${appName}:jdjc:delete">
@@ -135,8 +135,8 @@
 							 </c:if>
 							    <c:if test="${flag==1 && jdjc.btnflag == 0  &&jdjc.recordStatus == 1 || jdjc.isflag== 1 }"> 
 							    <authz:hasPermission name="${appName}:jdjc:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="jdjc.main.edit('${jdjc.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="jdjc.main.edit('${jdjc.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 								</authz:hasPermission>
 								<c:if test="${jdjc.flowflag !=1 }">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtx/jdtxmain.jsp

@@ -83,8 +83,8 @@
 							           </a>
 							    </authz:hasPermission>
 							    <authz:hasPermission name="${appName}:jdtx:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="jdtx.main.edit('${jdtx.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="jdtx.main.edit('${jdtx.id}')" title="=编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 								</authz:hasPermission>
 								<authz:hasPermission name="${appName}:jdtx:delete">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/tzgg/gg/ggmain.jsp

@@ -91,8 +91,8 @@
 							            </a>
 							</authz:hasPermission>
 							<authz:hasPermission name="${appName}:tzgg:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="gg.main.edit('${gg.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="gg.main.edit('${gg.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 						    </authz:hasPermission>		         
 									        

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/tzgg/ggfb/ggfbmain.jsp

@@ -82,8 +82,8 @@
 								<a class="btn btn-default btn-xs" href="#" onclick="ggfb.main.view('${ggfb.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
-								 <a class="btn btn-default btn-xs" href="#"  onclick="ggfb.main.edit('${ggfb.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="ggfb.main.edit('${ggfb.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          <a class="btn btn-default btn-xs" href="#" onclick="ggfb.main.del('${ggfb.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/tzgg/ggxx/ggxxmain.jsp

@@ -143,8 +143,8 @@
 									 </c:if>
 							      <c:if test="${ ggxx.fbzt == 0 && ggxx.flag == 1}">
 							      <authz:hasPermission name="${appName}:ggxx:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="ggxx.main.edit('${ggxx.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="ggxx.main.edit('${ggxx.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          </authz:hasPermission>
 									          <authz:hasPermission name="${appName}:ggxx:delete">

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

@@ -111,11 +111,11 @@
 							  </authz:hasPermission>
 							  
 							    <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelthisPage('${axmc}','${ssjyr}','${szd}','${szgk}','${szgq}','${totalpage==0?0:page.page}','${page.rows}')">
-							   		<i class="glyphicon glyphicon-th"></i>当前导出
+							   		<i class="glyphicon glyphicon-download-alt"></i>当前导出
 							   	</a>
 							  
 							    <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${axmc}','${ssjyr}','${szd}','${szgk}','${szgq}')">
-							   		<i class="glyphicon glyphicon-th-list"></i>全部导出
+							   		<i class="glyphicon glyphicon-download-alt"></i>全部导出
 							   	</a>
 	                        </td>
 	                    </tr>
@@ -156,8 +156,8 @@
 							        </a>
 							        </authz:hasPermission>
 							         <authz:hasPermission name="${appName}:ax:edit">
-									<a class="btn btn-default btn-xs" href="#"  onclick="ax.main.edit('${ax.id}')" title="修改">
-								   		<i class="glyphicon glyphicon-wrench"></i>
+									<a class="btn btn-default btn-xs" href="#"  onclick="ax.main.edit('${ax.id}')" title="编辑">
+								   		<i class="glyphicon glyphicon-pencil"></i>
 								   	</a>
 								   	</authz:hasPermission>
 								   	 <authz:hasPermission name="${appName}:ax:delete">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/fbd/fbdmain.jsp

@@ -98,8 +98,8 @@
 							            </a>
 							    </authz:hasPermission>
 							    <authz:hasPermission name="${appName}:fbd:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="fbd.main.edit('${fbd.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="fbd.main.edit('${fbd.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									         </a>
 						       </authz:hasPermission>
 						       <authz:hasPermission name="${appName}:fbd:delete">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/gk/gkmain.jsp

@@ -90,8 +90,8 @@
 							            </a>
 							    </authz:hasPermission>
 							    <authz:hasPermission name="${appName}:gkgl:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="gk.main.edit('${gk.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="gk.main.edit('${gk.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 								 </authz:hasPermission>
 								 <authz:hasPermission name="${appName}:gkgl:delete">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/gq/gqmain.jsp

@@ -121,8 +121,8 @@
 							            </a>
 							</authz:hasPermission>
 							<authz:hasPermission name="${appName}:gkgl:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="gq.main.edit('${gq.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="gq.main.edit('${gq.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 				          </authz:hasPermission>
 				          <authz:hasPermission name="${appName}:gkgl:delete">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/jghd/jghdmain.jsp

@@ -114,8 +114,8 @@
 							        </a>
 							        </authz:hasPermission>
 							         <authz:hasPermission name="${appName}:jghd:edit">
-									<a class="btn btn-default btn-xs" href="#"  onclick="jghd.main.edit('${jghd.id}')" title="修改">
-								   		<i class="glyphicon glyphicon-wrench"></i>
+									<a class="btn btn-default btn-xs" href="#"  onclick="jghd.main.edit('${jghd.id}')" title="编辑">
+								   		<i class="glyphicon glyphicon-pencil"></i>
 								   	</a>
 								   	</authz:hasPermission>
 								   	 <authz:hasPermission name="${appName}:jghd:delete">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/md/mdmain.jsp

@@ -103,8 +103,8 @@
 							            </a>
 							    </authz:hasPermission>
 							    <authz:hasPermission name="${appName}:md:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="md.main.edit('${md.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="md.main.edit('${md.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 							     </authz:hasPermission>
 							     <authz:hasPermission name="${appName}:md:delete">

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

@@ -89,7 +89,7 @@
 							<i class="glyphicon glyphicon-plus"></i>新增</a>
 						 </authz:hasPermission>
 						 <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${mtmc}','${szgq}','${szgk}','${szd}','${jyr}','${sfwhpid}','${sfdwkfid}','${fwlx}','${mtyt}')">
-							<i class="glyphicon glyphicon-th-list"></i>导出
+							<i class="glyphicon glyphicon-download-alt"></i>导出
 						</a>
                         </td>
                      </tr>
@@ -138,8 +138,8 @@
 							      <c:if test="${mt.xkzid =='' ||mt.xkzid==null }">
 							      	<c:if test="${mt.recordStatus == 1 }">
 							        <authz:hasPermission name="${appName}:mtxx:edit">
-								 	 <a class="btn btn-default btn-xs" href="#"  onclick="mt.main.edit('${mt.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 	 <a class="btn btn-default btn-xs" href="#"  onclick="mt.main.edit('${mt.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									</authz:hasPermission>
 									<authz:hasPermission name="${appName}:mtxx:delete">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/xzdwxxgl/xzglryxx/xzglrymain.jsp

@@ -73,8 +73,8 @@
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增部门/科室</a>
 							 <a class="btn btn-default btn-sm" href="#"  onclick="xzglry.main.editbm()">
-							   <i class="glyphicon glyphicon-edit"></i> 
-							            修改部门/科室</a>
+							   <i class="glyphicon glyphicon-pencil"></i> 
+							            编辑部门/科室</a>
 							 <a class="btn btn-default btn-sm" href="#"  onclick="xzglry.main.deletebm()">
 							   <i class="glyphicon glyphicon-wrench"></i> 
 							            删除部门/科室</a>	

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/zyq/zyqmain.jsp

@@ -102,7 +102,7 @@
 							            </a>
 							</authz:hasPermission>
 							<authz:hasPermission name="${appName}:zyqgl:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="zyq.main.edit('${zyq.id}')" title="修改">
+								 <a class="btn btn-default btn-xs" href="#"  onclick="zyq.main.edit('${zyq.id}')" title="编辑">
 									   <i class="glyphicon glyphicon-wrench"></i> 
 									          </a>
 							</authz:hasPermission>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgmain.jsp

@@ -143,8 +143,8 @@
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
 							             <c:if test="${jgbg.recordStatus == 1 }">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="jgbg.main.edit('${jgbg.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="jgbg.main.edit('${jgbg.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          <a class="btn btn-default btn-xs" href="#" onclick="jgbg.main.del('${jgbg.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 

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

@@ -143,8 +143,8 @@
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
 							             <c:if test="${jgsq.recordStatus == 1 && jgsq.sftb == 'N' }">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="jgsq.main.edit('${jgsq.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="jgsq.main.edit('${jgsq.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									            <c:if test="${ssFlag == 1 }"> 
 									          <a class="btn btn-default btn-xs" href="#" onclick="jgsq.main.del('${jgsq.id}')" title="删除">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxmain.jsp

@@ -142,8 +142,8 @@
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
 							             <c:if test="${jgzx.recordStatus == 1 }">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="jgzx.main.edit('${jgzx.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="jgzx.main.edit('${jgzx.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          <a class="btn btn-default btn-xs" href="#" onclick="jgzx.main.del('${jgzx.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 

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

@@ -142,8 +142,8 @@
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
 							             <c:if test="${jsjdbg.recordStatus == 1 }">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbg.main.edit('${jsjdbg.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbg.main.edit('${jsjdbg.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdbg.main.del('${jsjdbg.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 

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

@@ -147,8 +147,8 @@
 							            </a>
 							             <c:if test="${jsjdcbsj.recordStatus == 1 && jsjdcbsj.sftb == 'N'}">
 							              
-								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsj.main.edit('${jsjdcbsj.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsj.main.edit('${jsjdcbsj.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          <c:if test="${ssFlag == 1 }"> 
 									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdcbsj.main.del('${jsjdcbsj.id}')" title="删除">

+ 1 - 17
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp

@@ -1614,29 +1614,13 @@
                     </c:if>
                     <c:if test="${sfjyr=='' }">
 					<c:if test="${flag=='audit' }">
-					<c:if test="${spflag !='3' && spflag != '8'}">
-					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
-							            同意</a>
-					</c:if>
-					<c:if test="${record.flowstatus == 2}">
-					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
-							            同意</a>
-					</c:if>
-					<c:if test="${record.flowstatus == 4}">
+					
 					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
 							   <i class="glyphicon glyphicon-ok-sign"></i> 
 							            同意</a>
-					</c:if>
-				 <c:if test="${ (spflag =='3' || spflag == '8') }">
-				 	<c:if test="${record.flowstatus != 2 && record.flowstatus != 4  }">
 					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveTbzt('${record.id}')">
 							   <i class="glyphicon glyphicon-ok-sign"></i> 
 							    转报省级</a>
-					 </c:if> 
-					
-					 </c:if>
 					</c:if>
 					</c:if>
 					<c:if test="${sfjyr==1 }">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglmain.jsp

@@ -201,8 +201,8 @@
 							           </a>
 							    <c:if test="${isjyr==1 }">
 							    <c:if test="${jsjdgl.dqzt=='未提交'}">  
-							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.xiugai('${jsjdgl.id}')" title="修改">
-							    <i class="glyphicon glyphicon-wrench"></i> 
+							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.xiugai('${jsjdgl.id}')" title="编辑">
+							    <i class="glyphicon glyphicon-pencil"></i> 
 							           </a>  
 							    </c:if> 
 							    <%-- <c:if test="${jsjdgl.taskkey=='axlysptb'}">  

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl2/jsjdglmain.jsp

@@ -192,8 +192,8 @@
 							<td class="operatetd">
 								<%-- <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.view('${jsjdgl.id}')">
 							           详细信息</a> --%>
-							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.xiugai('${jsjdgl.id}')" title="修改">
-							          <i class="glyphicon glyphicon-wrench"></i></a>  
+							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.xiugai('${jsjdgl.id}')" title="编辑">
+							          <i class="glyphicon glyphicon-pencil"></i></a>  
 							    <%-- <c:if test="${jsjdgl.taskkey=='axlysptb'}">  
 							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.del('${jsjdgl.id}')">
 							           删除</a>  

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxmain.jsp

@@ -142,8 +142,8 @@
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
 							             <c:if test="${jsjdzx.recordStatus == 1 }">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdzx.main.edit('${jsjdzx.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdzx.main.edit('${jsjdzx.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdzx.main.del('${jsjdzx.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/tzjhgl/tzjhglmain.jsp

@@ -159,8 +159,8 @@
 								<a class="btn btn-default btn-xs" href="#" onclick="tzjhgl.main.view('${tzjhgl.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
-								 <a class="btn btn-default btn-xs" href="#"  onclick="tzjhgl.main.edit('${tzjhgl.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="tzjhgl.main.edit('${tzjhgl.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          <a class="btn btn-default btn-xs" href="#" onclick="tzjhgl.main.del('${tzjhgl.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 

+ 25 - 21
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgladd.jsp

@@ -44,7 +44,7 @@
 				xmxxgl.detail.gk ='${gk}';
 				
 			}
-			
+				xmxxgl.detail.initBw('bwsel','',id);
 			//项目类型默认新建
 				initXmlxSelect('xmlxsel','2201','80%');
 			//投资类型默认企业投资
@@ -88,6 +88,7 @@
 				initszdSelect('szdsel', xmxxgl.detail.szd, 'showgk', '80%');
 				initgkSelect('gksel',xmxxgl.detail.gk,xmxxgl.detail.szd,'showgq','80%');
 				initgqSelect('gqsel',xmxxgl.detail.gq,xmxxgl.detail.szd,xmxxgl.detail.gk,null,'80%');
+				xmxxgl.detail.initBw('bwsel','',data.id);
 		    }, "json");
 		}
 		
@@ -99,6 +100,7 @@
 
 <body>
 <jsp:include page="../../jyrselect.jsp"></jsp:include>
+<jsp:include page="../../showbwview.jsp"></jsp:include>
 	<div class="box" >
 		<div class="box-content" >
 			<div class="apply_fill">
@@ -150,6 +152,12 @@
 							</td>
 						</tr>
 						<tr>
+						 <th>所属泊位:&nbsp;</th>
+						 	<td colspan="3">
+								<div id="bwsel"></div>
+							</td>
+						</tr>
+						<tr>
 						    <th><span class="needwrite">*</span>项目类型:&nbsp;</th>
 							<td >
 								<div id="xmlxsel"></div>
@@ -231,26 +239,6 @@
 							<input type="text" class="Wdate" name="jcsj" value="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
 						</tr>
-						<!-- <tr>
-						    <th>码头前沿位置_上端点X:&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="sddx">
-							</td>
-						    <th>码头前沿位置_上端点Y:&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="sddy">
-							</td>
-						</tr>
-						<tr>
-					    	<th>码头前沿位置_下端点X:&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="xddx">
-							</td>
-							<th>码头前沿位置_下端点Y:&nbsp;</th>
-							<td colspan="3">
-								<input type="text" class="form-control" name="xddy">
-							</td>
-						</tr> -->
 					</table>
 				
 					<div  id="buttons">
@@ -262,6 +250,22 @@
 							           返回</a>
 							            
           			</div>
+          			<br/>
+          			 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				    </table>
 	</form>
 				</div>
 		</div>

+ 27 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgledit.jsp

@@ -23,6 +23,7 @@
 				xmxxgl.detail.gq ='${jyr.szgq.id}';
 				xmxxgl.detail.gk ='${jyr.szgk.id}';
 			}
+			xmxxgl.detail.initBw('bwsel','${record.bwids}','${jyr.id }');
 			initXmlxSelect('xmlxsel', '${record.xmlx }', '80%');
 			initTzlxSelect('tzlxsel', '${record.tzlx }', '80%');
 			initSylxSelect('sylxsel', '${record.sylx }', '80%');
@@ -74,6 +75,7 @@
 
 <body>
 <jsp:include page="../../jyrselect.jsp"></jsp:include>
+<jsp:include page="../../showbwview.jsp"></jsp:include>
 	<div class="box" >
 		<div class="box-content" >
 			<div class="apply_fill">
@@ -84,11 +86,11 @@
 						<tr>
 							<th><span class="needwrite">*</span>行政区划:&nbsp;</th>
 							<td>
-								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control" value="${xzqhname}">
+								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">
 							</td>
 							<th><span class="needwrite">*</span>项目编码:&nbsp;</th>
 							<td>
-								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control" name="xmbm" value="${record.xmbm }">
+								<input type="text"  readonly="readonly" class="form-control" name="xmbm" value="${record.xmbm }">
 							</td>
 						</tr>
 						<tr>
@@ -134,6 +136,12 @@
 							</td>
 						</tr>
 						<tr>
+						 <th>所属泊位:&nbsp;</th>
+						 	<td colspan="3">
+								<div id="bwsel"></div>
+							</td>
+						</tr>
+						<tr>
 						    <th><span class="needwrite">*</span>项目类型:&nbsp;</th>
 							<td >
 								<span id="xmlxsel">
@@ -251,7 +259,23 @@
 							             <a class="btn btn-default btn-sm" href="#"  onclick="xmxxgl.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>
-					</div>		              
+					</div>		 
+					<br/>
+          			 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				    </table>             
 	</form>							            
           			</div>
 			

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

@@ -117,7 +117,7 @@
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
 					            <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${xmmc}','${xmfr}','${szd}','${szgk}','${szgq}','${xmhzjbid}','${sfyzjbz}')">
-							   		<i class="glyphicon glyphicon-th-list"></i>导出
+							   		<i class="glyphicon glyphicon-download-alt"></i>导出
 							   	</a>
                      </td>
                          
@@ -153,8 +153,8 @@
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
 							       <c:if test="${xmxxgl.recordStatus==1 }">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="xmxxgl.main.edit('${xmxxgl.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="xmxxgl.main.edit('${xmxxgl.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          <a class="btn btn-default btn-xs" href="#" onclick="xmxxgl.main.del('${xmxxgl.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 

+ 36 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglview.jsp

@@ -16,7 +16,6 @@
 			$('.close').click(function(){
 				guanbi();
 			})
-			// 
 			if('${record.tzlx }' == "1903") {
 				$("#zftzDiv").css("display","table-row");
 				var ztz = '${record.ztz}';
@@ -45,7 +44,7 @@
 	</script>
 
 </head>
-
+<jsp:include page="../../showbwview.jsp"></jsp:include>
 <body>
 	<div class="box" >
 		<div class="box-content" >
@@ -95,6 +94,12 @@
 							</td>
 						</tr>
 						<tr>
+						 <th>所属泊位:&nbsp;</th>
+						 	<td colspan="3">
+								${record.bwidszw }
+							</td>
+						</tr>
+						<tr>
 						    <th>项目类型:&nbsp;</th>
 							<td >
 								${record.xmlxzw }
@@ -194,7 +199,35 @@
 							            返回</a>
 							           
           			</div>
-			
+				<br/>
+          			 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a onclick="xmxxgl.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>
 			</div>
 		</div>
 </div>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsb/dcsbmain.jsp

@@ -119,8 +119,8 @@
 								</a>
 									<c:if test="${ dcsb.recordStatus == 1 }">
 								 <a class="btn btn-default btn-xs" href="#"
-									onclick="dcsb.main.edit('${dcsb.id}')" title="修改"> <i
-										class="glyphicon glyphicon-wrench"></i> 
+									onclick="dcsb.main.edit('${dcsb.id}')" title="编辑"> <i
+										class="glyphicon glyphicon-pencil"></i> 
 								</a> <a class="btn btn-default btn-xs" href="#"
 									onclick="dcsb.main.del('${dcsb.id}')" title="删除"> <i
 										class="glyphicon glyphicon-trash"></i> 

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsbybb/dcsbybbmain.jsp

@@ -143,8 +143,8 @@
 								</a>
 								<c:if test="${jyr!=null}">
 								<a class="btn btn-default btn-xs" href="#"
-									onclick="dcsbybb.main.edit('${dcsbybb.id}')" title="修改"> <i
-										class="glyphicon glyphicon-wrench"></i> 
+									onclick="dcsbybb.main.edit('${dcsbybb.id}')" title="编辑"> <i
+										class="glyphicon glyphicon-pencil"></i> 
 							   	</a> 
 								<a class="btn btn-default btn-xs" href="#"
 									onclick="dcsbybb.main.del('${dcsbybb.id}')" title="删除"> <i

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

@@ -148,7 +148,7 @@
 						   	</a>
 						   	</authz:hasPermission>
 						   	<a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${ssjyr}','${ssmt}','${szd}','${szgk}','${szgq}','${bwmc}','${sfwxpbw}','${bwsx}','${fwlx}','${sfdwkfbw}','${bwyt}','${bz}')">
-						   		<i class="glyphicon glyphicon-th-list"></i>导出
+						   		<i class="glyphicon glyphicon-download-alt"></i>导出
 						   	</a>
 		                </td>
 		        	</tr>
@@ -194,8 +194,8 @@
 						        <c:if test="${bw.xkzid =='' }">
 						        	<c:if test="${bw.recordStatus == 1 }">
 						         	<authz:hasPermission name="${appName}:bwxx:edit">
-								<a class="btn btn-default btn-xs" href="#"  onclick="bw.main.edit('${bw.id}')" title="修改">
-							   		<i class="glyphicon glyphicon-wrench"></i>
+								<a class="btn btn-default btn-xs" href="#"  onclick="bw.main.edit('${bw.id}')" title="编辑">
+							   		<i class="glyphicon glyphicon-pencil"></i>
 							   	</a>
 							   	</authz:hasPermission>
 							   	 	<authz:hasPermission name="${appName}:bwxx:delete">

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

@@ -127,7 +127,7 @@
 						   	</a>
 						   	</authz:hasPermission>
 						   	<a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${szd}','${szgk}','${szgq}','${ssjyr}','${sfwxpcg}','${cgmc}')">
-						   		<i class="glyphicon glyphicon-th-list"></i>导出
+						   		<i class="glyphicon glyphicon-download-alt"></i>导出
 						   	</a>
 		                </td>
 		        	</tr>
@@ -171,8 +171,8 @@
 						        <c:if test="${cg.xkzid =='' ||cg.xkzid==null }">
 						        	<c:if test="${cg.recordStatus == 1 }">
 						        		<authz:hasPermission name="${appName}:cgxx:edit">
-								<a class="btn btn-default btn-xs" href="#"  onclick="cg.main.edit('${cg.id}')" title="修改">
-							   		<i class="glyphicon glyphicon-wrench"></i>
+								<a class="btn btn-default btn-xs" href="#"  onclick="cg.main.edit('${cg.id}')" title="编辑">
+							   		<i class="glyphicon glyphicon-pencil"></i>
 							   	</a>
 							   	</authz:hasPermission>
 							   			<authz:hasPermission name="${appName}:cgxx:delete">

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

@@ -122,7 +122,7 @@
 						   	</a>
 						   	</authz:hasPermission>
 						   	<a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${ssmt}','${szd}','${szgk}','${szgq}','${ckmc}','${ssjyr}','${wxpck}')">
-						   		<i class="glyphicon glyphicon-th-list"></i>导出
+						   		<i class="glyphicon glyphicon-download-alt"></i>导出
 						   	</a>
 		                </td>
 		        	</tr>
@@ -162,8 +162,8 @@
 						          <c:if test="${ck.xkzid =='' || ck.xkzid ==null }">
 						          <c:if test="${ck.recordStatus == 1 }">
 						         <authz:hasPermission name="${appName}:ckxx:edit">
-								<a class="btn btn-default btn-xs" href="#"  onclick="ck.main.edit('${ck.id}')" title="修改">
-							   		<i class="glyphicon glyphicon-wrench"></i>
+								<a class="btn btn-default btn-xs" href="#"  onclick="ck.main.edit('${ck.id}')" title="编辑">
+							   		<i class="glyphicon glyphicon-pencil"></i>
 							   	</a>
 							   	</authz:hasPermission>
 							   	 <authz:hasPermission name="${appName}:ckxx:delete">

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

@@ -107,7 +107,7 @@
 						   	</a>
 						 </authz:hasPermission>
 						 <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${szd}','${szgk}','${szgq}','${ssjyr}','${dcmc}','${wxpdc}')">
-					   		<i class="glyphicon glyphicon-th-list"></i>导出
+					   		<i class="glyphicon glyphicon-download-alt"></i>导出
 					   	</a>
 		                </td>
 		        	</tr>
@@ -150,8 +150,8 @@
 						        <c:if test="${dc.xkzid =='' }">
 						        <c:if test="${dc.recordStatus == 1 }">
 						        <authz:hasPermission name="${appName}:dcxx:edit">
-								<a class="btn btn-default btn-xs" href="#"  onclick="dc.main.edit('${dc.id}')" title="修改">
-							   		<i class="glyphicon glyphicon-wrench"></i>
+								<a class="btn btn-default btn-xs" href="#"  onclick="dc.main.edit('${dc.id}')" title="编辑">
+							   		<i class="glyphicon glyphicon-pencil"></i>
 							   	</a>
 							   	</authz:hasPermission>
 							   	<authz:hasPermission name="${appName}:dcxx:delete">

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/bwxx.jsp

@@ -66,7 +66,7 @@
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
 					if(bw.recordStatus==1&&bw.xkzid==''){
-						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxdelete('"+bw.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					}
 					str+="</td>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/cgxx.jsp

@@ -63,7 +63,7 @@
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxview('"+cg.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
 					if(cg.recordStatus==1&&cg.xkzid==''){
-						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxedit('"+cg.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxedit('"+cg.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxdelete('"+cg.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					}
 					str+="</td>";

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

@@ -62,10 +62,10 @@
 					str+="<td>"+ck.szgqzw+"</td>";
 					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\"> <i class='glyphicon glyphicon-search'></i>查看</a>";
 					if(ck.recordStatus==1&&ck.xkzid==''){
-						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
-						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxdelete('"+ck.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
+						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\"> <i class='glyphicon glyphicon-pencil'></i>编辑</a>";
+						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxdelete('"+ck.id+"')\"> <i class='glyphicon glyphicon-trash'></i>删除</a>";
 					}
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/dcxx.jsp

@@ -66,7 +66,7 @@
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
 					if(dc.recordStatus==1&&dc.xkzid==''){
-						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-pencil'></i>编辑</a>";
 						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxdelete('"+dc.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					}
 					str+="</td>";

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

@@ -154,7 +154,7 @@
 							</a>
 							</authz:hasPermission>
 							<a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${bwyt}','${whfzbh}','${sfcswhzy}','${sfcyxkz}','${gkjyr}','${szd}','${szgk}','${szgq}','${gkjyxkzh}','${fddbr}','${xkzstartDate}','${xkzendDate}','${fzstartDate}','${fzendDate}','${jyrxkzsfdq}')">
-						   		<i class="glyphicon glyphicon-th-list"></i>导出
+						   		<i class="glyphicon glyphicon-download-alt"></i>导出
 						   	</a>
 							</td>
 						</tr>
@@ -210,9 +210,9 @@
 									onclick="gkjyr.main.details('${gkjyr.id}')"> <i
 										class="glyphicon glyphicon-list-alt"></i> 详情
 								</a> --%>
-								<a class="btn btn-default btn-sm" href="#"
+								<a class="btn btn-default btn-xs" href="#"
 								  onclick="exportJyr('${gkjyr.id}','${gkjyr.gkjyr}')" title="导出">
-						   		<i class="glyphicon glyphicon-th-list"></i>
+						   		<i class="glyphicon glyphicon-download-alt"></i>
 						   	</a>
 								</td>
 							</tr>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/mtxx.jsp

@@ -65,7 +65,7 @@
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxview('"+mt.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
 					if(mt.recordStatus==1&&mt.xkzid==''){
-						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxedit('"+mt.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxedit('"+mt.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxdelete('"+mt.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					}
 					str+="</td>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/qytzxx.jsp

@@ -69,7 +69,7 @@
 					if(qytz.recordStatus==1&&qytz.xkzid==''){
 						var currentBtn = document.getElementById('qytzxx_addBtn');
 						currentBtn.style.display = "block";
-						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxedit('"+qytz.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxedit('"+qytz.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxdelete('"+qytz.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					}
 					str+="</td>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/ryxx.jsp

@@ -61,7 +61,7 @@
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxview('"+ry.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
 					if(ry.recordStatus==1&&ry.xkzid==''){
-						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxedit('"+ry.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxedit('"+ry.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxdelete('"+ry.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					}
 					str+="</td>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/sssbxx.jsp

@@ -66,7 +66,7 @@
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxview('"+sssb.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
 					if(sssb.recordStatus==1&&sssb.xkzid==''){
-						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxedit('"+sssb.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxedit('"+sssb.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxdelete('"+sssb.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					}
 					str+="</td>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/zxjxxx.jsp

@@ -64,7 +64,7 @@
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxview('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
 					if(zxjx.recordStatus==1&&zxjx.xkzid==''){
-						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxedit('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxedit('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 						str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxdelete('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					}
 					str+="</td>";

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

@@ -122,7 +122,7 @@
 						   		<i class="glyphicon glyphicon-search"></i>查询
 						   	</a>
 						   	<a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${ssjyr}','${szd}','${szgk}','${szgq}','${fzsqh}','${fzsfyx}','${wxhwpm}','${fzsfdq}')">
-						   		<i class="glyphicon glyphicon-th-list"></i>导出
+						   		<i class="glyphicon glyphicon-download-alt"></i>导出
 						   	</a>
 		                </td>
 		        	</tr>

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

@@ -104,7 +104,7 @@
 							            新增</a>
 							 </authz:hasPermission>
 							 <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${szd}','${tzrmc}','${szgk}','${szgq}','${jyr}')">
-						   		<i class="glyphicon glyphicon-th-list"></i>导出
+						   		<i class="glyphicon glyphicon-download-alt"></i>导出
 						   	</a>
                          </td>
                     </tr>
@@ -143,8 +143,8 @@
 							   <c:if test="${qytz.xkzid == '' }">
 							   <c:if test="${qytz.recordStatus == 1 }">
 							<authz:hasPermission name="${appName}:qytzxx:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="qytz.main.edit('${qytz.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="qytz.main.edit('${qytz.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 					          </authz:hasPermission>
 							<authz:hasPermission name="${appName}:qytzxx:delete">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/ry/ryedit.jsp

@@ -215,8 +215,8 @@
 							<td id="yxq">${ryzs.yxqfmt}</td>
 							<td>
 								 <a class="btn btn-default btn-xs" href="#"  data-toggle="modal" data-target="#myModal" onclick="ry.main.editzs('${ryzs.id}')">
-									   <i class="glyphicon glyphicon-wrench"></i> 
-									          修改</a>
+									   <i class="glyphicon glyphicon-pencil"></i> 
+									          编辑</a>
 									          <a class="btn btn-default btn-xs" href="#" onclick="ry.main.delzs('${ryzs.id}')">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         删除</a>

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

@@ -113,7 +113,7 @@
 							            新增</a>
 					   </authz:hasPermission>
 					   <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${xm}','${szgk}','${szgq}','${jyr}','${szd}','${rylxid}')">
-					   		<i class="glyphicon glyphicon-th-list"></i>导出
+					   		<i class="glyphicon glyphicon-download-alt"></i>导出
 					   	</a>
                          </td>
                     </tr>
@@ -144,8 +144,8 @@
 							    <c:if test="${ry.xkzid =='' }">
 							    <c:if test="${ry.recordStatus == 1 }">
 							    <authz:hasPermission name="${appName}:ryjtzxx:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="ry.main.edit('${ry.id}')" title=" 修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="ry.main.edit('${ry.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									         </a>
 							    </authz:hasPermission>
 								<authz:hasPermission name="${appName}:ryjtzxx:delete">

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

@@ -101,7 +101,7 @@
 							            新增</a>
 						</authz:hasPermission>					             
 						<a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${ssmc}','${szgk}','${jyr}','${szgq}','${szd}')">
-					   		<i class="glyphicon glyphicon-th-list"></i>导出
+					   		<i class="glyphicon glyphicon-download-alt"></i>导出
 					   	</a>
                          </td>
                     </tr>
@@ -141,8 +141,8 @@
 							    <c:if test="${sssb.xkzid=='' }">
 							    <c:if test="${sssb.recordStatus == 1 }">
 							    <authz:hasPermission name="${appName}:sssbxx:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="sssb.main.edit('${sssb.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="sssb.main.edit('${sssb.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 							    </authz:hasPermission>
 							    

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzns/xkznsmain.jsp

@@ -135,8 +135,8 @@
 							
 							 <c:if test="${xkzns.recordStatus == 1 }">
 							  <authz:hasPermission name="${appName}:xkzns:edit">            
-								 <a class="btn btn-default btn-xs" href="#"  onclick="xkzns.main.edit('${xkzns.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="xkzns.main.edit('${xkzns.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 							 </authz:hasPermission>
 							<authz:hasPermission name="${appName}:xkzns:delete">		          

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

@@ -176,7 +176,7 @@
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
 				            <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${gkjyrzw}','${szgq}','${gkjyxkzh}','${szd}','${szgk}','${yxq1}','${yxq2}','${sfyx}','${xkzsfdq}')">
-						   		<i class="glyphicon glyphicon-th-list"></i>导出
+						   		<i class="glyphicon glyphicon-download-alt"></i>导出
 						   	</a>
 		                </td>
                     </tr>
@@ -223,8 +223,8 @@
 						            <i class="glyphicon glyphicon-search"></i>
 						        </a>
 						        <c:if test ="${xkzxx.isflag == 1 }">
-						        <a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.edit('${xkzxx.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+						        <a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.edit('${xkzxx.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 								<a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.del('${xkzxx.id}')" title=" 删除">
 									   <i class="glyphicon glyphicon-trash"></i> 

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

@@ -103,7 +103,7 @@
 							            新增</a>
 							 </authz:hasPermission>
 							 <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${szd}','${jxlbmc}','${szgk}','${szgq}','${jyr}')">
-						   		<i class="glyphicon glyphicon-th-list"></i>导出
+						   		<i class="glyphicon glyphicon-download-alt"></i>导出
 						   	</a>
 	                        </td>
 	                    </tr>
@@ -141,8 +141,8 @@
 							            <c:if test="${zxjx.xkzid =='' }">
 						        	<c:if test="${zxjx.recordStatus == 1 }">
 							         <authz:hasPermission name="${appName}:zxjxxx:edit">
-									        <a class="btn btn-default btn-xs" href="#" onclick="zxjx.main.edit('${zxjx.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+									        <a class="btn btn-default btn-xs" href="#" onclick="zxjx.main.edit('${zxjx.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									 </authz:hasPermission>
 									 <authz:hasPermission name="${appName}:zxjxxx:delete">

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/bwxxadd.jsp

@@ -119,7 +119,7 @@ function clickbw(){
 					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxdelete('"+bw.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/bwxxedit.jsp

@@ -120,7 +120,7 @@ function clickbw(){
 					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxdelete('"+bw.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/cgxxadd.jsp

@@ -117,7 +117,7 @@ function clickcg(){
 					str+="<td>"+(cg.aqgd == null ? "":cg.aqgd)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxview('"+cg.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxedit('"+cg.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxedit('"+cg.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxdelete('"+cg.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/cgxxedit.jsp

@@ -118,7 +118,7 @@ function clickcg(){
 					str+="<td>"+(cg.aqgd == null ? "":cg.aqgd)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxview('"+cg.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxedit('"+cg.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxedit('"+cg.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxdelete('"+cg.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ckxxadd.jsp

@@ -118,7 +118,7 @@ function clickck(){
 					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxdelete('"+ck.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ckxxedit.jsp

@@ -119,7 +119,7 @@ function clickck(){
 					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxdelete('"+ck.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/dcxxadd.jsp

@@ -120,7 +120,7 @@ function clickdc(){
 					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxdelete('"+dc.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/dcxxedit.jsp

@@ -121,7 +121,7 @@ function clickdc(){
 					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxdelete('"+dc.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/mtxxadd.jsp

@@ -117,7 +117,7 @@ function mtxxdel(mtid){
 					str+="<td>"+mt.sfwhpzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxview('"+mt.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxedit('"+mt.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxedit('"+mt.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxdel('"+mt.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/mtxxedit.jsp

@@ -118,7 +118,7 @@ function mtxxdel(mtid){
 					str+="<td>"+mt.sfwhpzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxview('"+mt.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxedit('"+mt.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxedit('"+mt.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxdel('"+mt.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/qytzxxadd.jsp

@@ -121,7 +121,7 @@ function clickqytz(){
 					str+="<td>"+qytz.sfwszw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxview('"+qytz.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxedit('"+qytz.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxedit('"+qytz.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxdelete('"+qytz.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/qytzxxedit.jsp

@@ -121,7 +121,7 @@ function clickqytz(){
 					str+="<td>"+qytz.sfwszw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxview('"+qytz.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxedit('"+qytz.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxedit('"+qytz.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxdelete('"+qytz.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ryxxadd.jsp

@@ -115,7 +115,7 @@ function clickry(){
 					str+="<td>"+ry.rylxzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxview('"+ry.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxedit('"+ry.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxedit('"+ry.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxdelete('"+ry.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/ryxxedit.jsp

@@ -116,7 +116,7 @@ function clickry(){
 					str+="<td>"+ry.rylxzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxview('"+ry.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxedit('"+ry.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxedit('"+ry.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxdelete('"+ry.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/sssbxxadd.jsp

@@ -118,7 +118,7 @@ function clicksssb(){
 					str+="<td>"+sssb.sldw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxview('"+sssb.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxedit('"+sssb.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxedit('"+sssb.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxdelete('"+sssb.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/sssbxxedit.jsp

@@ -119,7 +119,7 @@ function clicksssb(){
 					str+="<td>"+sssb.sldw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxview('"+sssb.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxedit('"+sssb.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxedit('"+sssb.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxdelete('"+sssb.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgmain.jsp

@@ -144,8 +144,8 @@
 							            </a>
 							 <c:if test="${xkz.recordStatus == 1 }">     
 							 <authz:hasPermission name="${appName}:gkjyxkbg:edit">	       
-								 <a class="btn btn-default btn-xs" href="#"  onclick="xkzbg.main.edit('${xkz.id}')" title=" 修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="xkzbg.main.edit('${xkz.id}')" title=" 编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									         </a>
 									         </authz:hasPermission>
 									  <authz:hasPermission name="${appName}:gkjyxkbg:delete">	        

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/zxjxxxadd.jsp

@@ -116,7 +116,7 @@ function clickzxjx(){
 					str+="<td>"+zxjx.syqzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxview('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxedit('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxedit('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxdelete('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/zxjxxxedit.jsp

@@ -118,7 +118,7 @@ function clickzxjx(){
 					str+="<td>"+zxjx.syqzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxview('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxedit('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxedit('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxdelete('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/bwxxadd.jsp

@@ -118,7 +118,7 @@ function clickbw(){
 					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxdelete('"+bw.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/bwxxedit.jsp

@@ -120,7 +120,7 @@ function clickbw(){
 					str+="<td>"+(bw.sfdwkfzw==null?"":bw.sfdwkfzw)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxedit('"+bw.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxdelete('"+bw.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/cgxxadd.jsp

@@ -116,7 +116,7 @@ function clickcg(){
 					str+="<td>"+(cg.aqgd == null ? "":cg.aqgd)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxview('"+cg.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxedit('"+cg.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxedit('"+cg.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxdelete('"+cg.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/cgxxedit.jsp

@@ -127,7 +127,7 @@ function clickcg(){
 					str+="<td>"+(cg.aqgd == null ? "":cg.aqgd)+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxview('"+cg.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxedit('"+cg.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxedit('"+cg.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxdelete('"+cg.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ckxxadd.jsp

@@ -117,7 +117,7 @@ function clickck(){
 					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxdelete('"+ck.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ckxxedit.jsp

@@ -118,7 +118,7 @@ function clickck(){
 					str+="<td>"+ck.wxpckzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxedit('"+ck.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxdelete('"+ck.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/dcxxadd.jsp

@@ -119,7 +119,7 @@ function clickdc(){
 					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxdelete('"+dc.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/dcxxedit.jsp

@@ -120,7 +120,7 @@ function clickdc(){
 					str+="<td>"+dc.wxpdczw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxdelete('"+dc.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/mtxxadd.jsp

@@ -116,7 +116,7 @@ function mtxxdel(mtid){
 					str+="<td>"+mt.sfwhpzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxview('"+mt.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxedit('"+mt.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxedit('"+mt.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxdel('"+mt.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/mtxxedit.jsp

@@ -117,7 +117,7 @@ function mtxxdel(mtid){
 					str+="<td>"+mt.sfwhpzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxview('"+mt.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxedit('"+mt.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxedit('"+mt.id+"')\"> <i class='glyphicon glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxdel('"+mt.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/qytzxxadd.jsp

@@ -120,7 +120,7 @@ function clickqytz(){
 					str+="<td>"+qytz.sfwszw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxview('"+qytz.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxedit('"+qytz.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxedit('"+qytz.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxdelete('"+qytz.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/qytzxxedit.jsp

@@ -120,7 +120,7 @@ function clickqytz(){
 					str+="<td>"+qytz.sfwszw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxview('"+qytz.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxedit('"+qytz.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxedit('"+qytz.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxdelete('"+qytz.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ryxxadd.jsp

@@ -114,7 +114,7 @@ function clickry(){
 					str+="<td>"+ry.rylxzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxview('"+ry.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxedit('"+ry.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxedit('"+ry.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxdelete('"+ry.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/ryxxedit.jsp

@@ -115,7 +115,7 @@ function clickry(){
 					str+="<td>"+ry.rylxzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxview('"+ry.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxedit('"+ry.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxedit('"+ry.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxdelete('"+ry.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/sssbxxadd.jsp

@@ -117,7 +117,7 @@ function clicksssb(){
 					str+="<td>"+sssb.sldw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxview('"+sssb.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxedit('"+sssb.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxedit('"+sssb.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxdelete('"+sssb.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/sssbxxedit.jsp

@@ -118,7 +118,7 @@ function clicksssb(){
 					str+="<td>"+sssb.sldw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxview('"+sssb.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxedit('"+sssb.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxedit('"+sssb.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxdelete('"+sssb.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain.jsp

@@ -141,8 +141,8 @@
 							
 							 <c:if test="${xkz.recordStatus == 1 }">
 							  <authz:hasPermission name="${appName}:gkjyxksq:edit">            
-								 <a class="btn btn-default btn-xs" href="#"  onclick="xkzsq.main.edit('${xkz.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="xkzsq.main.edit('${xkz.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 							 </authz:hasPermission>
 							<authz:hasPermission name="${appName}:gkjyxksq:delete">		          

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/zxjxxxadd.jsp

@@ -115,7 +115,7 @@ function clickzxjx(){
 					str+="<td>"+zxjx.syqzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxview('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxedit('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxedit('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxdelete('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/zxjxxxedit.jsp

@@ -117,7 +117,7 @@ function clickzxjx(){
 					str+="<td>"+zxjx.syqzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxview('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxedit('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 修改</a>";
+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxedit('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxdelete('"+zxjx.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";
 					str+="</td>";
 					str+="</tr>";

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxmain.jsp

@@ -125,8 +125,8 @@
 							            
 							           <c:if test="${ xkz.recordStatus  == 1 }">
 							           <authz:hasPermission name="${appName}:gkjyxkyx:edit">  
-								 <a class="btn btn-default btn-xs" href="#"  onclick="xkzyx.main.edit('${xkz.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="xkzyx.main.edit('${xkz.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          </authz:hasPermission>
 									          <authz:hasPermission name="${appName}:gkjyxkyx:delete">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxmain.jsp

@@ -125,8 +125,8 @@
 							            </a>
 							     <c:if test="${xkz.recordStatus == 1 }">
 							      <authz:hasPermission name="${appName}:gkjyxkzx:edit">
-								 <a class="btn btn-default btn-xs" href="#"  onclick="xkzzx.main.edit('${xkz.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="xkzzx.main.edit('${xkz.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          </authz:hasPermission>
 									           <authz:hasPermission name="${appName}:gkjyxkzx:delete">

+ 8 - 10
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgadd.jsp

@@ -61,11 +61,11 @@
 <jsp:include page="../../../jyrselect.jsp"></jsp:include>
 <br/>
 
-
+ <form  id="addform" method="post" enctype="multipart/form-data"> 
 	<div class="box" >
 		<div class="box-content" >
 			<div class="apply_fill">
- <form  id="addform" method="post" enctype="multipart/form-data"> 	
+	
  <input type="hidden" id="id" name="id" value="" >	
  	<input type="hidden" id="flag" name="flag" value="">	
 	<table class="apply3" cellpadding="0" cellspacing="0">
@@ -145,24 +145,22 @@
 					
 			</table>
 			</div>
-			</td>
-		</tr>
-	</table>
-</form>
+			
+
 	<div  id="buttons">
   	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.save()">
   <i class="glyphicon glyphicon-floppy-disk"></i> 
            保存</a>
-  	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.submit()">
+  <!-- 	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.submit()">
   <i class="glyphicon glyphicon-share"></i> 
-           提交</a>
+           提交</a> -->
             <a class="btn btn-default btn-sm" href="#"  onclick="lhbg.detail.back()">
   <i class="glyphicon glyphicon-arrow-left"></i> 
            返回</a>
   			</div>
 </div>
-			
-	
+	</div>		
+</form>	
 
 </body>
 </html>

+ 19 - 7
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgedit.jsp

@@ -20,16 +20,18 @@
 </head>
 
 <body style="height: 400px">
+<jsp:include page="../../../showRy.jsp"></jsp:include>
 <jsp:include page="../../../jyrselect.jsp"></jsp:include>
 <br/>
-
+ <form  id="addform" method="post" enctype="multipart/form-data">
 
 	<div class="box" >
 		<div class="box-content" >
 			<div class="apply_fill">
- <form  id="addform" method="post" enctype="multipart/form-data"> 	
+ 	
  <input type="hidden" id="id" name="id" value="${record.id }" >	
  	<input type="hidden" id="flag" name="flag" value="">	
+ 	<input type="hidden" id="userids" name="userids"/>
 	<table class="apply3" cellpadding="0" cellspacing="0">
 		<tr>
 			<th colspan="2"><span class="needwrite">*</span>港口经营人名称:&nbsp;</th>
@@ -113,7 +115,12 @@
 						<c:forEach items="${fjlist }" var="fj" varStatus="status">
 							<tr align="center">
 							<td><a class='main_title' href='/jsjy/accessory/download?id=${fj.fjid }'>${fj.fjmc }</a></td>
+							<c:if test="${ ssFlag == 1}">
 							<td><a class="btn btn-default btn-xs" href="#" onclick="lhyx.detail.delFj('${fj.id}',this)">删除</a></td>
+							</c:if>
+							<c:if test="${ ssFlag == 0}">
+							<td></td>
+							</c:if>
 							</tr>
 						</c:forEach>
 					</table>
@@ -123,24 +130,29 @@
 					
 			</table>
 			</div>
-			</td>
-		</tr>
-	</table>
-</form>
+
 	<div  id="buttons">
+		<c:if test="${ssFlag ==0 }">
+		 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
+		   <i class="glyphicon glyphicon-check"></i> 
+		            选择人员</a>
+		</c:if>
   	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.save()">
   <i class="glyphicon glyphicon-floppy-disk"></i> 
            保存</a>
+           <c:if test="${ssFlag ==0 }">
   	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.submit()">
   <i class="glyphicon glyphicon-share"></i> 
            提交</a>
+           </c:if>
             <a class="btn btn-default btn-sm" href="#"  onclick="lhbg.detail.back()">
   <i class="glyphicon glyphicon-arrow-left"></i> 
            返回</a>
   			</div>
 </div>
 			
+	</div>
 	
-
+</form>
 </body>
 </html>

+ 13 - 8
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.jsp

@@ -93,8 +93,8 @@
 						<th width="25%">港口经营人</th>
 						<th width="20%">办公地点</th>
 						<th width="10%">法定代表</th>
+						<th width="10%">流程状态</th>
 						<th width="1%" class="operatetd">操作</th>
-						<th width="1%" class="operatetd">审核</th>
 					</tr>
 					 <c:forEach items="${list}" var="lhbg" varStatus="status">
 						<tr class="tr_bg">
@@ -108,29 +108,34 @@
 							<c:if test="${lhbg.xfddbr == '' || lhbg.xfddbr == null}">${lhbg.yfddbr }</c:if>
 							<c:if test="${lhbg.xfddbr != null || lhbg.xfddbr !=''}">${lhbg.xfddbr }</c:if>
 							</td> 
+							<td>${lhbg.currentname }</td>
 							<td class="operatetd">
 								<a class="btn btn-default btn-xs" href="#" onclick="lhbg.main.view('${lhbg.id}')" title=" 查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							           </a>
 							 <c:if test="${lhbg.recordStatus == 1 }">     
+							      <c:if test="${ssFlag == 1 && lhbg.sftb == 'N'}"> 
+							     <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.submit('${lhbg.id}')" title="同步">
+						   <i class="glyphicon glyphicon-share"></i>
+						            </a>
+						            </c:if>
 							  
-								 <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.edit('${lhbg.id}')" title="修改">
-									   <i class="glyphicon glyphicon-wrench"></i> 
+								 <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.edit('${lhbg.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
-									     
+									     <c:if test="${ssFlag == 1 }">   
 									          <a class="btn btn-default btn-xs" href="#" onclick="lhbg.main.del('${lhbg.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         </a>
-									       
+									   </c:if>    
 						 </c:if>
-						 		<c:if test="${ lhbg.recordStatus  > 1 }">
+						 		<c:if test="${ lhbg.recordStatus  > 1  && ssFlag ==0}">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${lhbg.id}','lhbg')" title="流程历史"> <i
 										class="glyphicon glyphicon-list-alt"></i>
 									</a>
 								</c:if>
-							</td>
-							<td class="operatetd">
+						
 							  <c:if test="${lhbg.taskState =='Y'}">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.banli('${lhbg.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 

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

@@ -12,6 +12,7 @@
 <script type="text/javascript" src="${app }/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgdetail.js"></script>
 <script type="text/javascript">
 		$(document).ready(function () {
+			lhbg.detail.taskKey="${taskKey}";
 			iFrameHeightIframe('gkjyr');//自适应高度
 			lhbg.detail.init();
 		});
@@ -21,6 +22,8 @@
 
 <body style="height: 400px">
 <jsp:include page="../../../jyrselect.jsp"></jsp:include>
+	<jsp:include page="../../../showRy.jsp"></jsp:include>
+	<jsp:include page="../../../showViewOption.jsp"></jsp:include>
 <br/>
 
  <form  id="addform" method="post" enctype="multipart/form-data"> 	
@@ -30,6 +33,8 @@
 
 		 <input type="hidden" id="id" name="id" value="${record.id }" >	
 		 	<input type="hidden" id="flag" name="flag" value="">	
+		 	<input type="hidden" id="userids" name="userids" />
+		 <input type="hidden" id="yj" name="yj" />
 			<table class="apply3" cellpadding="0" cellspacing="0">
 				<tr>
 					<th colspan="2"><span class="needwrite">*</span>港口经营人名称:&nbsp;</th>
@@ -117,7 +122,14 @@
 				            
 				            </td>
 						</tr>
-							
+								<c:forEach items="${list}" var="list" begin="1" varStatus="status">
+							<tr>
+								<th colspan="2">${list.currName }:&nbsp;</th>
+
+								<td colspan="3">${list.yj }</td>
+
+							</tr>
+						</c:forEach>
 					</table>
 		
 		
@@ -128,7 +140,15 @@
 </form>
 	<div  id="buttons">
    <c:if test="${flag=='audit' }">
-					
+					<c:if test="${roleCode != 'Y' }">
+							<a class="btn btn-default btn-sm" href="#" onclick="showRy()">
+								<i class="glyphicon glyphicon-check"></i> 选择人员
+							</a>
+						</c:if>
+						<a class="btn btn-default btn-sm" href="#" onclick="showYj()">
+							<i class="glyphicon glyphicon-check"></i> 意见
+						</a>
+						
 					
 					 <a class="btn btn-default btn-sm" href="#"  onclick="lhbg.detail.audit('Y','${record.id}')">
 							   <i class="glyphicon glyphicon-ok-sign"></i> 

+ 14 - 17
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqadd.jsp

@@ -156,45 +156,43 @@
 		<li id="jyrLi" role="spp"><a href="#gkjyrxx"
 			aria-controls="gkjyrxx" role="tab" data-toggle="tab">港口理货业务</a></li>
 	</ul>	
-	
 	<div id=myTabcontent class="tab-content">
 		<div class="tab-pane fade" id="lhsq">
 			<div class="box">
 				<div class="box-content">
 					<div class="apply_fill">
-			
 							<table class="apply" cellpadding="0" cellspacing="0">
 								<tr>
 									<th>申请人名称:&nbsp;</th>
-									<td><input type="text" class="form-control" name="sqr"
+									<td><input type="text" class="form-control" name="sqr" style="width: 92.5%"
 										id="sqr" value="${gkjyr.gkjyr}"></td>
 									<th>法定代表人:&nbsp;</th>
-									<td><input type="text" class="form-control"  value="${gkjyr.fddbr }"></td>
+									<td><input type="text" class="form-control" style="width: 92.5%"  value="${gkjyr.fddbr }"></td>
 								</tr>
 								<tr>
 									<th>申请人联系方式:&nbsp;</th>
-									<td><input type="text" class="form-control" id="sqrlxfs"
+									<td><input type="text" class="form-control" id="sqrlxfs" style="width: 92.5%"
 										name="sqrlxfs" value=""></td>
 									<th>申请人邮编:&nbsp;</th>
-									<td><input type="text" class="form-control" id="sqryzbm"
+									<td><input type="text" class="form-control" id="sqryzbm" style="width: 92.5%"
 										name="sqryzbm"></td>
 								</tr>
 								<tr>
 									<th>申请人住址 :&nbsp;</th>
-									<td colspan="3"><input type="text" class="form-control"
+									<td colspan="3"><input type="text" class="form-control" style="width: 92.5%"
 										id="sqrdz" name="sqrdz"></td>
 								</tr>
 								<tr>
 									<th>委托代理人姓名:&nbsp;</th>
-									<td><input type="text" class="form-control" id="wtdlrxm"
+									<td><input type="text" class="form-control" id="wtdlrxm" style="width: 92.5%"
 										name="wtdlrxm"></td>
 									<th>委托代理人联系方式:&nbsp;</th>
-									<td><input type="text" class="form-control"
+									<td><input type="text" class="form-control" style="width: 92.5%"
 										id="wtdlrlxfs" name="wtdlrlxfs"></td>
 								</tr>
 								<tr>
 									<th>申请的交通行政许可事项及内容:&nbsp;</th>
-									<td colspan="3"><textarea  class="form-control"
+									<td colspan="3"><textarea  class="form-control" style="width: 92.5%"
 										id="sqnr" name="sqnr"></textarea></td>
 								</tr>
 								<tr>
@@ -212,21 +210,20 @@
 								</tr>
 								<tr>
 									<th>申请日期:&nbsp;</th>
-									<td><input type="text" class="form-control"
+									<td><input type="text" class="form-control" style="width: 92.5%"
 										readonly="readonly" value="${fn:substring(sqsj,0,10)}"></td>
 									<th>申请人签字或盖章:</th>
-									<td><input type="text" class="form-control" name="sqrqz" id="sqrqz"></td>
+									<td><input type="text" class="form-control" name="sqrqz" id="sqrqz" style="width: 92.5%"></td>
 								</tr>
 							</table>
-						</form>
 						<div id="buttons">
 							<a class="btn btn-default btn-sm" href="#"
 								onclick="lhsq.detail.save()"> <i
 								class="glyphicon glyphicon-floppy-disk"></i> 保存
-							</a> <a class="btn btn-default btn-sm" href="#"
-								onclick="lhsq.detail.submit()"> <i
-								class="glyphicon glyphicon-share"></i> 提交
-							</a> <a class="btn btn-default btn-sm" href="#"
+							</a> 
+							
+							
+							<a class="btn btn-default btn-sm" href="#"
 								onclick="lhsq.detail.back()"> <i
 								class="glyphicon glyphicon-arrow-left"></i> 返回
 							</a>

+ 28 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqedit.jsp

@@ -108,8 +108,10 @@
 </style>
 </head>
 <body>
+<jsp:include page="../../../showRy.jsp"></jsp:include>
 	<br />
 		<form id="addform"  method="post" enctype="multipart/form-data">
+		<input type="hidden" id="userids" name="userids"/>
 	<ul id="myTab" class="nav nav-tabs">
 		<li id="lhsqLi" role="spp"><a href="#lhsq"
 			aria-controls="lhsq" role="tab" data-toggle="tab">港口经营业务申请书</a></li>
@@ -170,7 +172,12 @@
 											<c:forEach items="${fjlist }" var="fj" varStatus="status">
 												<tr align="center">
 												<td><a class='main_title' href='/jsjy/accessory/download?id=${fj.fjid }'>${fj.fjmc }</a></td>
+												<c:if test="${ssFlag ==1 }">
 												<td><a class="btn btn-default btn-xs" href="#" onclick="lhyx.detail.delFj('${fj.id}',this)">删除</a></td>
+												</c:if>
+												<c:if test="${ssFlag ==0 }">
+												<td></td>
+												</c:if>
 												</tr>
 											</c:forEach>
 										</table>
@@ -187,14 +194,27 @@
 							</table>
 						
 						<div id="buttons">
+							<c:if test="${ssFlag ==0 }">
+							 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
+							   <i class="glyphicon glyphicon-check"></i> 
+							            选择人员</a>
+							</c:if>
+							<c:if test="${ssFlag ==1 }">
 							<a class="btn btn-default btn-sm" href="#"
 								onclick="lhsq.detail.save()"> <i
 								class="glyphicon glyphicon-floppy-disk"></i> 保存
-							</a> <a class="btn btn-default btn-sm" href="#"
-								onclick="lhsq.detail.submit()"> <i
+							</a> 
+							</c:if>
+							 <c:if test="${ssFlag == 0 }"> 
+							<a class="btn btn-default btn-sm" href="#"
+								onclick="lhsq.detail.submit()"> 
+								<i
 								class="glyphicon glyphicon-share"></i> 提交
-							</a> <a class="btn btn-default btn-sm" href="#"
-								onclick="lhsq.detail.back()"> <i
+							</a>
+							</c:if>
+							 <a class="btn btn-default btn-sm" href="#"
+								onclick="lhsq.detail.back()"> 
+								<i
 								class="glyphicon glyphicon-arrow-left"></i> 返回
 							</a>
 						</div>
@@ -261,7 +281,9 @@
 										<td>股东名称</td>
 										<td>注册地</td>
 										<td>投资股比</td>
+										<c:if test="${ssFlag ==1 }">
 										<td><button onclick="addtr()">添加</button></td>
+										</c:if>
 									</tr>
 									<c:forEach items="${gdmclist }" var="gdmc" varStatus="status">
 										<tr align="center">
@@ -270,7 +292,9 @@
 										<td>
 										<input type="text" class="form-control" name="tzgb" value="${gdmc.tzgb }">
 										</td>
+										<c:if test="${ssFlag ==1 }">
 										<td><button onclick="deltr(this)">删除</button></td>
+										</c:if>
 										</tr>
 									</c:forEach>
 								</table>

Неке датотеке нису приказане због велике количине промена