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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgedit.jsp

@@ -199,7 +199,10 @@
 						<a class="btn btn-default btn-sm" href="#"  onclick="jgbg.detail.submitAudit()">
 						   <i class="glyphicon glyphicon-ok-sign"></i> 
 						            提交</a>
-						</c:if>     
+						</c:if>   
+						<a class="btn btn-default btn-sm" href="#"  onclick="jgbg.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>  
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jgbg.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>

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

@@ -97,9 +97,9 @@
                        
                     </tr>
                     <tr>
-                   		<td class="right">是否有资金补助：&nbsp;</td>
+                   		<td class="right"></td>
 						<td>
-							<div id="sfyzjbz"></div>
+							
 						</td>
 							<td class="right"></td>
 							<td></td>
@@ -125,7 +125,7 @@
 						<th width="10%">所在港区</th>
 						<th width="10%">项目法人</th>
 						<th width="10%">项目类型</th>
-						<th width="10%">是否有资金补助</th>	
+						<th width="10%">流程状态</th>	
 						<th width="20%">操作</th>
 						 <th width="16%">办理</th>
 					</tr>
@@ -137,7 +137,7 @@
 							<td>${jgbg.szgqzw }</td>
 							<td>${jgbg.xmfr }</td>
 						    <td>${jgbg.xmlxzw }</td>
-						    <td>${jgbg.sfyzjbz }</td>
+						    <td>${jgbg.currentname }</td>
 							<td>
 								<a class="btn btn-default btn-xs" href="#" onclick="jgbg.main.view('${jgbg.id}')">
 							            <i class="glyphicon glyphicon-search"></i> 

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgview.jsp

@@ -12,6 +12,7 @@
 	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jgbg/jgbgdetail.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
+			jgbg.detail.opflag="${opflag}"
 			jgbg.detail.taskKey="${taskKey}";
 			jgbg.detail.init();
 			$('.close').click(function(){
@@ -184,13 +185,13 @@
 					<c:if test="${opflag == 5 || opflag == 9}">
 				
 					 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							   <i class="glyphicon glyphicon-check"></i> 
 							            选择科室人员</a>
 					</c:if>
 					<c:if test="${flag=='audit' }">
 					
 					<a class="btn btn-default btn-sm" href="#"  onclick="showYj()">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							   <i class="glyphicon glyphicon-check"></i> 
 							            意见</a>
 					
 					 <a class="btn btn-default btn-sm" href="#"  onclick="jgbg.detail.audit('Y','${record.id}')">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp

@@ -200,6 +200,9 @@
 						   <i class="glyphicon glyphicon-ok-sign"></i> 
 						            提交</a>
 						</c:if>     
+						<a class="btn btn-default btn-sm" href="#"  onclick="jgsq.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jgsq.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>

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

@@ -97,9 +97,9 @@
                        
                     </tr>
                     <tr>
-                   		<td class="right">是否有资金补助：&nbsp;</td>
+                   		<td class="right"></td>
 						<td>
-							<div id="sfyzjbz"></div>
+							
 						</td>
 							<td class="right"></td>
 							<td></td>
@@ -125,7 +125,7 @@
 						<th width="10%">所在港区</th>
 						<th width="10%">项目法人</th>
 						<th width="10%">项目类型</th>
-						<th width="10%">是否有资金补助</th>	
+						<th width="10%">流程状态</th>	
 						<th width="20%">操作</th>
 						 <th width="16%">办理</th>
 					</tr>
@@ -137,7 +137,7 @@
 							<td>${jgsq.szgqzw }</td>
 							<td>${jgsq.xmfr }</td>
 						    <td>${jgsq.xmlxzw }</td>
-						    <td>${jgsq.sfyzjbz }</td>
+						    <td>${jgbg.currentname }</td>
 							<td>
 								<a class="btn btn-default btn-xs" href="#" onclick="jgsq.main.view('${jgsq.id}')">
 							            <i class="glyphicon glyphicon-search"></i> 

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp

@@ -12,6 +12,7 @@
 	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jgsq/jgsqdetail.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
+			jgsq.detail.opflag="${opflag}"
 			jgsq.detail.taskKey="${taskKey}";
 			jgsq.detail.init();
 			$('.close').click(function(){
@@ -184,13 +185,13 @@
 					<c:if test="${opflag == 5 || opflag == 9}">
 				
 					 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							   <i class="glyphicon glyphicon-check"></i> 
 							            选择科室人员</a>
 					</c:if>
 					<c:if test="${flag=='audit' }">
 					
 					<a class="btn btn-default btn-sm" href="#"  onclick="showYj()">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							   <i class="glyphicon glyphicon-check"></i> 
 							            意见</a>
 					
 					 <a class="btn btn-default btn-sm" href="#"  onclick="jgsq.detail.audit('Y','${record.id}')">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxedit.jsp

@@ -200,6 +200,9 @@
 						   <i class="glyphicon glyphicon-ok-sign"></i> 
 						            提交</a>
 						</c:if>     
+						<a class="btn btn-default btn-sm" href="#"  onclick="jgzx.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jgzx.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>

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

@@ -97,9 +97,8 @@
                        
                     </tr>
                     <tr>
-                   		<td class="right">是否有资金补助：&nbsp;</td>
+                   		<td class="right"></td>
 						<td>
-							<div id="sfyzjbz"></div>
 						</td>
 							<td class="right"></td>
 							<td></td>
@@ -125,7 +124,7 @@
 						<th width="10%">所在港区</th>
 						<th width="10%">项目法人</th>
 						<th width="10%">项目类型</th>
-						<th width="10%">是否有资金补助</th>	
+						<th width="10%">流程状态</th>	
 						<th width="20%">操作</th>
 						 <th width="16%">办理</th>
 					</tr>
@@ -137,7 +136,7 @@
 							<td>${jgzx.szgqzw }</td>
 							<td>${jgzx.xmfr }</td>
 						    <td>${jgzx.xmlxzw }</td>
-						    <td>${jgzx.sfyzjbz }</td>
+						    <td>${jgzx.currentname }</td>
 							<td>
 								<a class="btn btn-default btn-xs" href="#" onclick="jgzx.main.view('${jgzx.id}')">
 							            <i class="glyphicon glyphicon-search"></i> 

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxview.jsp

@@ -12,6 +12,7 @@
 	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jgzx/jgzxdetail.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
+			jgzx.detail.opflag="${opflag}"
 			jgzx.detail.taskKey="${taskKey}";
 			jgzx.detail.init();
 			$('.close').click(function(){
@@ -184,13 +185,13 @@
 					<c:if test="${opflag == 5 || opflag == 9}">
 				
 					 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							   <i class="glyphicon glyphicon-check"></i> 
 							            选择科室人员</a>
 					</c:if>
 					<c:if test="${flag=='audit' }">
 					
 					<a class="btn btn-default btn-sm" href="#"  onclick="showYj()">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							   <i class="glyphicon glyphicon-check"></i> 
 							            意见</a>
 					
 					 <a class="btn btn-default btn-sm" href="#"  onclick="jgzx.detail.audit('Y','${record.id}')">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgedit.jsp

@@ -200,6 +200,10 @@
 						   <i class="glyphicon glyphicon-ok-sign"></i> 
 						            提交</a>
 						</c:if>     
+						
+						<a class="btn btn-default btn-sm" href="#"  onclick="jsjdbg.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbg.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>

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

@@ -97,9 +97,8 @@
                        
                     </tr>
                     <tr>
-                   		<td class="right">是否有资金补助：&nbsp;</td>
+                   		<td class="right"></td>
 						<td>
-							<div id="sfyzjbz"></div>
 						</td>
 							<td class="right"></td>
 							<td></td>
@@ -125,7 +124,7 @@
 						<th width="10%">所在港区</th>
 						<th width="10%">项目法人</th>
 						<th width="10%">项目类型</th>
-						<th width="10%">是否有资金补助</th>	
+						<th width="10%">流程状态</th>	
 						<th width="20%">操作</th>
 						 <th width="16%">办理</th>
 					</tr>
@@ -137,7 +136,7 @@
 							<td>${jsjdbg.szgqzw }</td>
 							<td>${jsjdbg.xmfr }</td>
 						    <td>${jsjdbg.xmlxzw }</td>
-						    <td>${jsjdbg.sfyzjbz }</td>
+						    <td>${jsjdbg.currentname }</td>
 							<td>
 								<a class="btn btn-default btn-xs" href="#" onclick="jsjdbg.main.view('${jsjdbg.id}')">
 							            <i class="glyphicon glyphicon-search"></i> 

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgview.jsp

@@ -12,6 +12,7 @@
 	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jsjdbg/jsjdbgdetail.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
+			jsjdbg.detail.opflag="${opflag}"
 			jsjdbg.detail.taskKey="${taskKey}";
 			jsjdbg.detail.init();
 			$('.close').click(function(){
@@ -184,13 +185,13 @@
 					<c:if test="${opflag == 5 || opflag == 9}">
 				
 					 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							   <i class="glyphicon glyphicon-check"></i> 
 							            选择科室人员</a>
 					</c:if>
 					<c:if test="${flag=='audit' }">
 					
 					<a class="btn btn-default btn-sm" href="#"  onclick="showYj()">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							   <i class="glyphicon glyphicon-check"></i> 
 							            意见</a>
 					
 					 <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbg.detail.audit('Y','${record.id}')">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxedit.jsp

@@ -200,6 +200,10 @@
 						   <i class="glyphicon glyphicon-ok-sign"></i> 
 						            提交</a>
 						</c:if>     
+							
+						<a class="btn btn-default btn-sm" href="#"  onclick="jsjdzx.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdzx.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>

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

@@ -97,9 +97,8 @@
                        
                     </tr>
                     <tr>
-                   		<td class="right">是否有资金补助：&nbsp;</td>
+                   		<td class="right"></td>
 						<td>
-							<div id="sfyzjbz"></div>
 						</td>
 							<td class="right"></td>
 							<td></td>
@@ -125,7 +124,7 @@
 						<th width="10%">所在港区</th>
 						<th width="10%">项目法人</th>
 						<th width="10%">项目类型</th>
-						<th width="10%">是否有资金补助</th>	
+						<th width="10%">流程状态</th>	
 						<th width="20%">操作</th>
 						 <th width="16%">办理</th>
 					</tr>
@@ -137,7 +136,7 @@
 							<td>${jsjdzx.szgqzw }</td>
 							<td>${jsjdzx.xmfr }</td>
 						    <td>${jsjdzx.xmlxzw }</td>
-						    <td>${jsjdzx.sfyzjbz }</td>
+						    <td>${jsjdzx.currentname }</td>
 							<td>
 								<a class="btn btn-default btn-xs" href="#" onclick="jsjdzx.main.view('${jsjdzx.id}')">
 							            <i class="glyphicon glyphicon-search"></i> 

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxview.jsp

@@ -12,6 +12,7 @@
 	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jsjdzx/jsjdzxdetail.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
+			jsjdzx.detail.opflag ="${opflag}";
 			jsjdzx.detail.taskKey="${taskKey}";
 			jsjdzx.detail.init();
 			$('.close').click(function(){
@@ -184,13 +185,13 @@
 					<c:if test="${opflag == 5 || opflag == 9}">
 				
 					 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							   <i class="glyphicon glyphicon-check"></i> 
 							            选择科室人员</a>
 					</c:if>
 					<c:if test="${flag=='audit' }">
 					
 					<a class="btn btn-default btn-sm" href="#"  onclick="showYj()">
-							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							   <i class="glyphicon glyphicon-check"></i> 
 							            意见</a>
 					
 					 <a class="btn btn-default btn-sm" href="#"  onclick="jsjdzx.detail.audit('Y','${record.id}')">

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

@@ -73,39 +73,14 @@
                         </td>
                        </tr>
 						<tr>
-					<%-- 	 <td class="right">
-                         	流程状态:&nbsp;
-                        </td>
-                        <td >
-                        	<span>
-	                        	<select id="lczt" name="lczt" class='lcselectpicker'>
-	                        		<option 
-	                        		<c:if test="${lczt == '' }">
-	                        		selected="selected"
-	                        		</c:if>
-	                        		>
-	                        		全部
-	                        		</option>
-	                        		
-	                        		<option
-	                        		<c:if test="${lczt == 'clsc' }">
-	                        		selected="selected"
-	                        		</c:if>
-	                        		  value="clsc">材料审查</option>
-	                        	</select>
-	                        </span>
-                        </td> --%>
                         <td class="right" colspan="6">
-                        <authz:hasPermission name="${appName}:gkjyxkbg:main">	  
                          			 <a class="btn btn-default btn-sm" href="#" onclick="lhbg.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
-							            </authz:hasPermission>
-							            <authz:hasPermission name="${appName}:gkjyxkbg:add">	  
+							           
 							             <a class="btn btn-default btn-sm" href="#"  onclick="lhbg.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
-							            </authz:hasPermission>
                         </td>
                         
                     </tr>
@@ -124,56 +99,48 @@
 						<th width="25%">操作</th>
 						<th width="5%">审核</th>
 					</tr>
-					 <c:forEach items="${list}" var="xkz" varStatus="status">
+					 <c:forEach items="${list}" var="lhbg" varStatus="status">
 						<tr class="tr_bg">
 							<td>${status.index+1 }</td>
-							<td>${xkz.jyrmc }</td>
+							<td>${lhbg.jyrmc }</td>
 							<td>
-							<c:if test="${xkz.xbgdz =='' || xkz.xbgdz == null }">${xkz.ybgdz }</c:if>
-							<c:if test="${xkz.xbgdz !='' || xkz.xbgdz != null }">${xkz.xbgdz }</c:if>
+							${lhbg.zcdz }
 							</td>
 							<td>
-							<c:if test="${xkz.xfddbr == '' || xkz.xfddbr == null}">${xkz.yfddbr }</c:if>
-							<c:if test="${xkz.xfddbr != null || xkz.xfddbr !=''}">${xkz.xfddbr }</c:if>
+							${lhbg.fddbr }
 							</td> 
-							<td>${xkz.lxr }</td>
-							<td>${xkz.dh }</td>
+							<td>${lhbg.lxr }</td>
+							<td>${lhbg.lxdh }</td>
 							<td>
-								<a class="btn btn-default btn-xs" href="#" onclick="lhbg.main.view('${xkz.id}')">
+								<a class="btn btn-default btn-xs" href="#" onclick="lhbg.main.view('${lhbg.id}')">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            查看</a>
-							 <c:if test="${xkz.recordStatus == 1 }">     
+							 <c:if test="${lhbg.recordStatus == 1 }">     
 							  
-								 <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.edit('${xkz.id}')">
+								 <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.edit('${lhbg.id}')">
 									   <i class="glyphicon glyphicon-wrench"></i> 
 									          修改</a>
 									     
-									          <a class="btn btn-default btn-xs" href="#" onclick="lhbg.main.del('${xkz.id}')">
+									          <a class="btn btn-default btn-xs" href="#" onclick="lhbg.main.del('${lhbg.id}')">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         删除</a>
 									       
 						 </c:if>
-						 		<c:if test="${ xkz.recordStatus  > 1 }">
+						 		<c:if test="${ lhbg.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
-									onclick="hisList('${xkz.id}','lhbg')"> <i
+									onclick="hisList('${lhbg.id}','lhbg')"> <i
 										class="glyphicon glyphicon-search"></i>流程历史
 									</a>
 								</c:if>
-								<c:if test="${ xkz.recordStatus == '2'}">
-									<a class="btn btn-default btn-xs" href="#"
-									onclick="lhbg.main.showxkzjds('${xkz.id}')"> <i
-										class="glyphicon glyphicon-search"></i>许可证决定书
-									</a>
-								</c:if>
 							</td>
 							<td>
-							  <c:if test="${xkz.taskState =='Y'}">
-							 <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.banli('${xkz.id}')">
+							  <c:if test="${lhbg.taskState =='Y'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.banli('${lhbg.id}')">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          办理</a>
 							 </c:if>
-							  <c:if test="${xkz.taskState =='TH'}">
-							 <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.back('${xkz.id}')">
+							  <c:if test="${lhbg.taskState =='TH'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.back('${lhbg.id}')">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          办理</a>
 							 </c:if>

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

@@ -23,115 +23,126 @@
 <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="">	
-	<table class="apply3" cellpadding="0" cellspacing="0">
-		<tr>
-			<th colspan="2"><span class="needwrite">*</span>港口经营人名称：&nbsp;</th>
-			<td colspan="3" style="position:relative;">
-				<input type="text" readonly="readonly" style="width:85%" class="form-control" id="xzjyr" name="jyrmc" value = "${record.jyrmc}" >
-				<input type="hidden" class="form-control" style="width:85%" name="jyrid" id="jyrid" value="${record.jyrid }">
-			</td>
-		</tr>
-		<tr>
-			<th colspan="2">港口经营许可证编号：&nbsp;</th>
-			<td colspan="3">
-				<input type="text" readonly="readonly" class="form-control" style="width:85%" id="xkzbh" name="xkzbh" value="${record.xkzbh }">
-			</td>
-		</tr>
-		<tr>
-			<th colspan="2"><span class="needwrite">*</span>联系人：&nbsp;</th>
-			<td>
-				<input type="text" class="form-control" id="lxr" name="lxr" value="${record.lxr }">
-			</td>
-			<th><span class="needwrite">*</span>电话：&nbsp;</th>
-			<td>
-				<input type="text" class="form-control" style="width:61%"  id="dh" name="dh" value="${record.dh }">
-			</td>
-		</tr>
-		<tr>
-			<th colspan="2">申请日期：&nbsp;</th>
-			<td>
-				<input type="text" class="form-control" value="${fn:substring(record.sqrq,0,10)}">
-			</td>
-			<th>传真：&nbsp;</th>
-			<td>
-				<input type="text" class="form-control" id="cz" style="width:61%" name="cz" value="${record.cz }">
-			</td>
-		</tr>
-		<tr>
-			<td width="2%" rowspan="4" align="center" style="background: #e6eff9;text-indent: 0px;"><font size="5">申<br/>请<br/>变<br/>更<br/>事<br/>项</font></td>
-			<th rowspan="2"><input type="checkbox" id="bgdzChe" style="width: 10%"
-			<c:if test="${record.xbgdz != null}">
-			checked="checked"
-			</c:if>
-			 onclick="xkzbg.detail.bgdzChe()" />办公地址：&nbsp;</th>
-			<td colspan="3">
-			由：<span style="color: white;">一一</span><input type="text" style="display:inline-table " class="form-control" readonly="readonly" name="ybgdz" id ="ybgdz" value="${record.ybgdz }">
-			</td>
-		</tr>
-		<tr>
-			<td colspan="3">
-			变更为：<input type="text" style="display:inline-table " class="form-control" 
-			<c:if test="${record.xbgdz == null || record.xbgdz ==''}"> readonly="readonly" </c:if>
-			 name="xbgdz" id ="xbgdz" value="${record.xbgdz }">
-			</td>
-		</tr>
-		<tr>
-			<th rowspan="2"><input type="checkbox" style="width: 10%"
-			<c:if test="${record.xfddbr != null}">
-			checked="checked"
-			</c:if>
-			 id="fddbrChe" onclick="xkzbg.detail.fddbrChe()" />法定代表人：&nbsp;</th>
-			<td colspan="3">
-			由：<span style="color: white;">一一</span><input type="text" style="display:inline-table " class="form-control" readonly="readonly" name="yfddbr" id ="yfddbr" value="${record.yfddbr }">
-			</td>
-		</tr>
-		<tr>
-			<td colspan="3">
-			变更为：<input type="text"  style="display:inline-table " class="form-control" 
-			<c:if test="${record.xfddbr == null}">
-			readonly="readonly" 
-			</c:if>
-			name="xfddbr" id ="xfddbr" value="${record.xfddbr }">
-			</td>
-		</tr>
-		<tr>
-			<th colspan="2">提交材料清单:&nbsp;</th>
+
+		 <input type="hidden" id="id" name="id" value="${record.id }" >	
+		 	<input type="hidden" id="flag" name="flag" value="">	
+			<table class="apply3" cellpadding="0" cellspacing="0">
+				<tr>
+					<th colspan="2"><span class="needwrite">*</span>港口经营人名称：&nbsp;</th>
+					<td colspan="3" style="position:relative;">
+						<input type="text" readonly="readonly" style="width:85%" class="form-control" id="xzjyr" name="jyrmc" value = "${record.jyrmc}" >
+						<input type="hidden" class="form-control" style="width:85%" name="jyrid" id="jyrid" value="${record.jyrid }">
+					</td>
+				</tr>
+				<tr>
+					<th colspan="2">港口经营许可证编号：&nbsp;</th>
+					<td colspan="3">
+						<input type="text" readonly="readonly" class="form-control" style="width:85%" id="xkzbh" name="xkzbh" value="${record.xkzbh }">
+					</td>
+				</tr>
+				<tr>
+					<th colspan="2"><span class="needwrite">*</span>联系人：&nbsp;</th>
+					<td>
+						<input type="text" class="form-control" id="lxr" name="lxr" value="${record.lxr }">
+					</td>
+					<th><span class="needwrite">*</span>电话：&nbsp;</th>
+					<td>
+						<input type="text" class="form-control" style="width:61%"  id="dh" name="dh" value="${record.dh }">
+					</td>
+				</tr>
+				<tr>
+					<th colspan="2">申请日期：&nbsp;</th>
+					<td>
+						<input type="text" class="form-control" value="${fn:substring(record.sqrq,0,10)}">
+					</td>
+					<th>传真：&nbsp;</th>
+					<td>
+						<input type="text" class="form-control" id="cz" style="width:61%" name="cz" value="${record.cz }">
+					</td>
+				</tr>
+				<tr>
+					<td width="2%" rowspan="4" align="center" style="background: #e6eff9;text-indent: 0px;"><font size="5">申<br/>请<br/>变<br/>更<br/>事<br/>项</font></td>
+					<th rowspan="2"><input type="checkbox" id="bgdzChe" style="width: 10%"
+					<c:if test="${record.xbgdz != null}">
+					checked="checked"
+					</c:if>
+					 onclick="xkzbg.detail.bgdzChe()" />办公地址：&nbsp;</th>
+					<td colspan="3">
+					由：<span style="color: white;">一一</span><input type="text" style="display:inline-table " class="form-control" readonly="readonly" name="ybgdz" id ="ybgdz" value="${record.ybgdz }">
+					</td>
+				</tr>
+				<tr>
+					<td colspan="3">
+					变更为：<input type="text" style="display:inline-table " class="form-control" 
+					<c:if test="${record.xbgdz == null || record.xbgdz ==''}"> readonly="readonly" </c:if>
+					 name="xbgdz" id ="xbgdz" value="${record.xbgdz }">
+					</td>
+				</tr>
+				<tr>
+					<th rowspan="2"><input type="checkbox" style="width: 10%"
+					<c:if test="${record.xfddbr != null}">
+					checked="checked"
+					</c:if>
+					 id="fddbrChe" onclick="xkzbg.detail.fddbrChe()" />法定代表人：&nbsp;</th>
+					<td colspan="3">
+					由：<span style="color: white;">一一</span><input type="text" style="display:inline-table " class="form-control" readonly="readonly" name="yfddbr" id ="yfddbr" value="${record.yfddbr }">
+					</td>
+				</tr>
+				<tr>
 					<td colspan="3">
-					<table  id="tableId" style="width: 100%">
-						<tr>
-						<td style="width:40%;text-align: center;">上传附件名称</td>
+					变更为：<input type="text"  style="display:inline-table " class="form-control" 
+					<c:if test="${record.xfddbr == null}">
+					readonly="readonly" 
+					</c:if>
+					name="xfddbr" id ="xfddbr" value="${record.xfddbr }">
+					</td>
+				</tr>
+				<tr>
+					<th colspan="2">提交材料清单:&nbsp;</th>
+							<td colspan="3">
+							<table  id="tableId" style="width: 100%">
+								<tr>
+								<td style="width:40%;text-align: center;">上传附件名称</td>
+								</tr>
+								<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>
+									</tr>
+									</c:forEach>
+							</table>
+				            
+				            </td>
 						</tr>
-						<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>
-							</tr>
-							</c:forEach>
+							
 					</table>
-		            
-		            </td>
-				</tr>
-					
-			</table>
-			</div>
-			</td>
-		</tr>
-	</table>
+		
+		
+	</div>
+</div>
+</div>	
+
 </form>
 	<div  id="buttons">
-  
+   <c:if test="${flag=='audit' }">
+					
+					
+					 <a class="btn btn-default btn-sm" href="#"  onclick="lhbg.detail.audit('Y','${record.id}')">
+							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							            同意</a>
+						<a class="btn btn-default btn-sm" href="#"  onclick="lhbg.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></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>
-			
+	
 	
 
 </body>

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

@@ -146,6 +146,7 @@
 }
 </style>
 </head>
+<jsp:include page="../../../jyrselect.jsp"></jsp:include>
 <body>
 	<br />
 <form id="addform"  method="post" enctype="multipart/form-data">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqmain.jsp

@@ -125,8 +125,24 @@
 									         删除</a>
 									        
 						 </c:if>
+								<c:if test="${ lhsq.recordStatus  > 1 }">
+									<a class="btn btn-default btn-xs" href="#"
+									onclick="hisList('${lhsq.id}','lhsq')"> <i
+										class="glyphicon glyphicon-search"></i>流程历史
+									</a>
+								</c:if>
 							</td>
 							<td>
+							  <c:if test="${lhsq.taskState =='Y'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="lhsq.main.banli('${lhsq.id}')">
+									   <i class="glyphicon glyphicon-check"></i> 
+									          办理</a>
+							 </c:if>
+							  <c:if test="${lhsq.taskState =='TH'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="lhsq.main.back('${lhsq.id}')">
+									   <i class="glyphicon glyphicon-check"></i> 
+									          办理</a>
+							 </c:if>
 							</td>
 						</tr>
 					</c:forEach>

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

@@ -185,8 +185,18 @@
 							</table>
 						
 						<div id="buttons">
-							
-							</a> <a class="btn btn-default btn-sm" href="#"
+							 <c:if test="${flag=='audit' }">
+					
+					
+					 <a class="btn btn-default btn-sm" href="#"  onclick="lhsq.detail.audit('Y','${record.id}')">
+							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							            同意</a>
+						<a class="btn btn-default btn-sm" href="#"  onclick="lhsq.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
+				          
+					</c:if>
+							 <a class="btn btn-default btn-sm" href="#"
 								onclick="lhsq.detail.back()"> <i
 								class="glyphicon glyphicon-arrow-left"></i> 返回
 							</a>

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

@@ -153,9 +153,7 @@
 					
 			</table>
 			</div>
-			</td>
-		</tr>
-	</table>
+		
 </form>
 	<div  id="buttons">
   	<a class="btn btn-default btn-sm" href="#" onclick="lhyx.detail.save()">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.jsp

@@ -134,12 +134,6 @@
 										class="glyphicon glyphicon-search"></i>流程历史
 									</a>
 								</c:if>
-								<c:if test="${ lhyx.recordStatus == '2'}">
-									<a class="btn btn-default btn-xs" href="#"
-									onclick="lhyx.main.showxkzjds('${lhyx.id}')"> <i
-										class="glyphicon glyphicon-search"></i>许可证决定书
-									</a>
-								</c:if>
 							</td>
 							<td>
 							  <c:if test="${lhyx.taskState =='Y'}">
@@ -147,7 +141,7 @@
 									   <i class="glyphicon glyphicon-check"></i> 
 									          办理</a>
 							 </c:if>
-							  <c:if test="${xkz.taskState =='TH'}">
+							  <c:if test="${lhsq.taskState =='TH'}">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="lhyx.main.back('${lhyx.id}')">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          办理</a>

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

@@ -149,19 +149,31 @@
 				</tr>
 					
 			</table>
-			</div>
-			</td>
-		</tr>
-	</table>
+		
 </form>
+
+
 	<div  id="buttons">
   
+  <c:if test="${flag=='audit' }">
+					
+					
+					 <a class="btn btn-default btn-sm" href="#"  onclick="lhyx.detail.audit('Y','${record.id}')">
+							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							            同意</a>
+						<a class="btn btn-default btn-sm" href="#"  onclick="lhyx.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
+				          
+					</c:if>
+  
             <a class="btn btn-default btn-sm" href="#"  onclick="lhyx.detail.back()">
   <i class="glyphicon glyphicon-arrow-left"></i> 
            返回</a>
   			</div>
 </div>
-			
+		</div>
+		</div>	
 	
 
 </body>

gkjsjy/trunk/WebContent/WEB-INF/pages/showViewOption.jsp

@@ -25,7 +25,7 @@ function guanbiyj(){
 $(document).ready(function () {
 });
 </script>
-<div  class="theme-popover" id="selectyjdiv" style="width: 350px;height: 400px;overflow-y: auto;">
+<div  class="theme-popover" id="selectyjdiv" style="width: 345px;height: 300px;overflow-y: auto;">
 	     <div class="theme-poptit">
 	          <div class="popTitle">
 	          	<h4>意见框</h4>