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

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

@@ -1,3 +1,4 @@
+
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8"%>
 
@@ -88,21 +89,35 @@
 					<table class="apply" cellpadding="0" cellspacing="0">
 					<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
-							<td colspan="4">
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm">
+							<td>
+								<input type="text"  readonly="readonly" class="form-control" name="xmbm" value="${record.xmbm }">
 							</td>
-						</tr>
-						<tr>
 							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="4"  style="position:relative;">
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc">
+							<td  style="position:relative;">
+								<input type="text"  readonly="readonly" class="form-control" name="xmmc" value="${record.xmmc }">
 							<a class="btn btn-primary btn-sm" style="position:absolute;right:4px;top:4px;" href="#" onclick="jsjdbg.detail.xmxxxz()">选择</a>
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
-							<td colspan="4" style="position:relative;">
-								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
+						 <th>项目概况：&nbsp;</th>
+							<td colspan="3" >
+								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
+							</td>
+						</tr>
+						<tr>
+						 <th>建设规模：&nbsp;</th>
+							<td colspan="3" >
+								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
+							</td>
+						</tr>
+						<tr>
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmfr" id="xmfr" value="${record.xmfr }">
+							</td>
+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>
+							<td style="position:relative;">
+								<input type="text"  readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
 								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid"  value ="${jyr.id }">
 								<c:if test="${jyr.id == null }">
 										<a class="btn btn-primary btn-sm" href="#"
@@ -113,24 +128,26 @@
 							</td>
 						</tr>
 						<tr>
-						    <th><span class="needwrite">*</span>所在地：&nbsp;</th>
+							 <th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">
+							</td>
+							 <th><span class="needwrite">*</span>所在地：&nbsp;</th>
 							<td>
 								<div id="szdsel"></div>
 							</td>
+						</tr>
+						<tr>
+						   
 							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>
 							<td >
 								<div id="gksel"></div>
 							</td>
-						</tr>
-						<tr>
 						    <th><span class="needwrite">*</span>所在港区：&nbsp;</th>
 						 	<td >
 								<div id="gqsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmfr" id="xmfr">
-							</td>
+							
 						</tr>
 						<tr>
 						    <th><span class="needwrite">*</span>项目类型：&nbsp;</th>
@@ -139,33 +156,26 @@
 							</td>
 							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>
 							<td >
-								<input type="text" class="form-control" name="jsdd">
+								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
 							</td>
 						</tr>
 						<tr>
-						    <th>建设规模：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="jsgm">
+							
+						
+						    <th>总投资 （万元）：&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" name="ztz" value="${record.ztz }">
 							</td>
 							<th>投资类型：&nbsp;</th>
 							<td >
 								<div id="tzlxsel"></div>
 							</td>
-						</tr>
-						<tr>
-						    <th>总投资 （万元）：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="ztz">
-							</td>
-     						<th>项目核准级别：&nbsp;</th>
-							<td>
-							   <div id="xmhzjbsel"></div>
-							</td>
+     						
 						</tr>
 							<tr id="zftzDiv" style="display:none">
 						    <th>政府投资（万元）：&nbsp;</th>
 							<td >
-								<input type="text" class="form-control" name="zftze" onchange="ratesub()">
+								<input type="text" class="form-control" name="zftze" value="${record.zftze }" onchange="ratesub()">
 							</td>
 							<th>政府投资占比（%）：&nbsp;</th>
 							<td >
@@ -173,36 +183,41 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>岸线审批级别：&nbsp;</th>
-							<td >
-								<div id="axspjbsel"></div>
+						    <th>建成时间：&nbsp;</th>
+							<td>
+							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
-							<th>岸线长度 （米）：&nbsp;</th>
+								
+							<th>泊位个数：&nbsp;</th>
 							<td >
-								<input type="text" class="form-control" name="axcd">
+								<input type="text"  readonly="readonly" class="form-control" value="${bwgs}">
 							</td>
+						   
 						</tr>
 						<tr>
-						  
+						  	<th>项目核准级别：&nbsp;</th>
+							<td>
+							   <div id="xmhzjbsel"></div>
+							</td>
 							<th>通过能力（万吨）：&nbsp;</th>
 							<td >
-								<input type="text" class="form-control" name="tgnl">
+								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
-					
-					 	    <th>泊位用途：&nbsp;</th>
-                        <td >
-	                        <span id="bwytsel"></span>
-                        </td>
-                       
 						</tr>
-							<tr>
-							<th>水域类型：&nbsp;</th>
+						<tr>
+						    <th>岸线审批级别：&nbsp;</th>
 							<td >
-								<div id="sylxsel"></div>
+								<div id="axspjbsel"></div>
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+							<th>岸线长度 （米）：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
+							</td>
+						</tr>
+						<tr>
+						<th>水域类型：&nbsp;</th>
+							<td colspan="3">
+								<div id="sylxsel"></div>
 							</td>
 						</tr>
 					</table>

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

@@ -78,51 +78,61 @@
 					<table class="apply" cellpadding="0" cellspacing="0">
 					<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
-							<td colspan="4">
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm" value="${record.xmbm }">
+							<td >
+								<input type="text"  class="form-control" name="xmbm" value="${record.xmbm }">
+							</td>
+							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
+							<td >
+								<input type="text"  class="form-control" name="xmmc" value="${record.xmmc }">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="4" >
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc" value="${record.xmmc }">
+							<th>项目概况：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
-							<td colspan="4" style="position:relative;">
-								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
-								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid" value ="${jyr.id }">
-								<c:if test="${jyr.id == null }">
-								<a class="btn btn-primary btn-sm" href="#"
-								 onclick="jyrselpop('jyrSel')"  
-								style="position:absolute;right:4px;top:4px;"> <i class="glyphicon"></i>选择
-									   </a>
-								</c:if> 
+							<th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
 							</td>
 						</tr>
 						<tr>
-						    <th><span class="needwrite">*</span>所在地：&nbsp;</th>
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
+							</td>
+					
+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>
+							<td style="position:relative;">
+								<input type="text" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
+								
+							</td>
+						</tr>
+						<tr>
+							 <th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">
+							</td>
+							<th><span class="needwrite">*</span>所在地：&nbsp;</th>
 							<td>
 								<span id="szdsel">
 								</span>
 							</td>
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>
 							<td >
 								<span id="gksel">
 								</span>
 							</td>
-						</tr>
-						<tr>
+						
 					    	<th><span class="needwrite">*</span>所在港区：&nbsp;</th>
 							<td >
 								<span id="gqsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
-							</td>
 						</tr>
 						<tr>
 						    <th><span class="needwrite">*</span>项目类型：&nbsp;</th>
@@ -136,9 +146,9 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>建设规模：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
+					    	<th>总投资（万元）：&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" name="ztz" value="${record.ztz }">
 							</td>
 							<th>投资类型：&nbsp;</th>
 							<td>
@@ -146,27 +156,39 @@
 								</span>
 							</td>
 						</tr>
+							<tr id="zftzDiv" style="display:none">
+						    <th>政府投资（万元）：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="zftze" id="zftze" onchange="ratesub()" value="${record.zftze }">
+							</td>
+							<th>政府投资占比（%）：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" readonly="readonly" id="zftzezb" >
+							</td>
+						</tr>
 						<tr>
-						    <th>总投资（万元）：&nbsp;</th>
+						 <th>建成时间：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="ztz" value="${record.ztz }">
+							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10) }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
+							<th>泊位个数：&nbsp;</th>
+							<td >
+								<input type="text"  readonly="readonly" class="form-control" value="${bwgs}">
+							</td>
+						</tr>
+						<tr>
+						   
 							<th>项目核准级别：&nbsp;</th>
 							<td>
 								<span id="xmhzjbsel">
 								</span>
 							</td>
-						</tr>
-							<tr id="zftzDiv" style="display:none">
-						    <th>政府投资（万元）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="zftze" id="zftze" onchange="ratesub()" value="${record.zftze }">
-							</td>
-							<th>政府投资占比（%）：&nbsp;</th>
+							<th>通过能力（万吨）：&nbsp;</th>
 							<td >
-								<input type="text" class="form-control" readonly="readonly" id="zftzezb" >
+								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
 						</tr>
+						
 						<tr>
 					    	<th>岸线审批级别：&nbsp;</th>
 							<td>
@@ -178,28 +200,14 @@
 								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
 							</td>
 						</tr>
-						<tr>
 						
-							<th>通过能力（万吨）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
-							</td>
-					 	    <th>泊位用途：&nbsp;</th>
-                        <td>
-	                        <span id="bwytsel"></span>
-                        </td>
-                       
-						</tr>
 						
 							<tr>
 							<th>水域类型：&nbsp;</th>
-							<td >
+							<td  colspan="3">
 								<div id="sylxsel"></div>
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10) }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
-							</td>
+						   
 						</tr>
 				
 					</table>

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

@@ -126,7 +126,6 @@
 						<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="jsjdbg" varStatus="status">
 						<tr class="tr_bg">
@@ -155,8 +154,7 @@
 										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
-					        </td>
-							<td class="operatetd">
+					        
 							 <c:if test="${jsjdbg.taskState =='Y'}">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbg.main.banli('${jsjdbg.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 

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

@@ -68,41 +68,56 @@
 					<table class="apply" cellpadding="0" cellspacing="0">
 					<tr>
 							<th>项目编码：&nbsp;</th>
-							<td colspan="4">
+							<td>
 								${record.xmbm }
 							</td>
-						</tr>
-						<tr>
 							<th>项目名称：&nbsp;</th>
-							<td colspan="4" >
+							<td >
 								${record.xmmc }
 							</td>
 						</tr>
 						<tr>
-							<th>所属单位：&nbsp;</th>
-							<td colspan="4" >
+							 <th>项目概况：&nbsp;</th>
+							<td colspan="3" >
+								${record.xmgk }
+							</td>
+						</tr>
+						<tr>
+							 <th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								${record.jsgm }
+							</td>
+						</tr>
+						<tr>
+							<th>项目法人：&nbsp;</th>
+							<td >
+								${record.xmfr }
+							</td>
+							<th>建设单位：&nbsp;</th>
+							<td  >
 								${jyr.gkjyr }
 							</td>
 						</tr>
 						<tr>
+							 <th>行政区划：&nbsp;</th>
+							<td>
+								${xzqhname}
+							</td>
 						    <th>所在地：&nbsp;</th>
 							<td >
 								${record.szddzw }
 							</td>
+						</tr>
+						<tr>
 							<th>所在港口：&nbsp;</th>
 							<td>
 								${record.szgkzw }
 							</td>
-						</tr>
-						<tr>
 						    <th>所在港区：&nbsp;</th>
 							<td >
 								${record.szgqzw }
 							</td>
-							<th>项目法人：&nbsp;</th>
-							<td >
-								${record.xmfr }
-							</td>
+							
 						</tr>
 						<tr>
 						    <th>项目类型：&nbsp;</th>
@@ -114,24 +129,15 @@
 								${record.jsdd }
 							</td>
 						</tr>
-						<tr>
-						    <th>建设规模：&nbsp;</th>
-							<td >
-								${record.jsgm }
-							</td>
-							<th>投资类型：&nbsp;</th>
-							<td>
-								${record.tzlxzw }
-							</td>
-						</tr>
+						
 						<tr>
 					    	<th>总投资 （万元）：&nbsp;</th>
 							<td>
 								${record.ztz }
 							</td>
-							<th>项目核准级别：&nbsp;</th>
+							<th>投资类型：&nbsp;</th>
 							<td>
-								${record.xmhzjbzw }
+								${record.tzlxzw }
 							</td>
 						</tr>
 							<tr id="zftzDiv" style="display:none">
@@ -143,36 +149,41 @@
 							<td id="zftzTd"></td>
 						</tr>
 						<tr>
-						    <th>岸线审批级别：&nbsp;</th>
-							<td >
-								${record.axspjbzw }
+					    	<th>建成时间：&nbsp;</th>
+							<td>
+								${fn:substring(record.jcsj,0,10)}
 							</td>
-							<th>岸线长度 （米）：&nbsp;</th>
-							<td >
-								${record.axcd }
+							<th>泊位个数：&nbsp;</th>
+							<td>
+								${bwgs }
 							</td>
 						</tr>
 						<tr>
-						   
+					    	<th>项目核准级别：&nbsp;</th>
+							<td>
+								${record.xmhzjbzw }
+							</td>
 							<th>通过能力（万吨）：&nbsp;</th>
 							<td >
 								${record.tgnl }
 							</td>
-						
-					    	<th>泊位用途：&nbsp;</th>
-                            <td>
-                             ${record.bwytzw }
-                            </td>
                        </tr>
+                       <tr>
+						    <th>岸线审批级别：&nbsp;</th>
+							<td >
+								${record.axspjbzw }
+							</td>
+							<th>岸线长度 （米）：&nbsp;</th>
+							<td >
+								${record.axcd }
+							</td>
+						</tr>
                          <tr>
 							<th>水域类型：&nbsp;</th>
-							<td >
+							<td colspan="3">
 								${record.sylxzw }
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-								${fn:substring(record.jcsj,0,10)}
-							</td>
+						   
 						</tr>
                        <tr>
                        		<th>专家评审附件：&nbsp;</th>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjadd.jsp

@@ -86,22 +86,36 @@
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
  <input type="hidden" id="userids"	name="userids"/>
  <input type="hidden" class="form-control"  name="roleCode" id="roleCode" value="${roleCode }">
-					<table class="apply" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
+					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
+							<td>
+								<input type="text"  readonly="readonly"  class="form-control" name="xmbm">
+							</td>
+							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
+							<td >
+								<input type="text" readonly="readonly"  class="form-control"  name="xmmc">
+							</td>
+						</tr>
+						<tr>
+							<th>项目概况：&nbsp;</th>
 							<td colspan="3">
-								<input type="text" style="width: 92.5%;"  class="form-control" name="xmbm">
+								<input type="text" class="form-control" name="xmgk">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
+						 	<th>建设规模：&nbsp;</th>
 							<td colspan="3">
-								<input type="text" style="width: 92.5%;" class="form-control"  name="xmmc">
+								<input type="text" class="form-control" name="jsgm">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
-							<td colspan="3" style="position:relative;">
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmfr" id="xmfr">
+							</td>
+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>
+							<td  style="position:relative;">
 								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
 								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid"  value ="${jyr.id }">
 								<c:if test="${jyr.id == null }">
@@ -113,24 +127,27 @@
 							</td>
 						</tr>
 						<tr>
+							<th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<div id="xzqhsel"></div>
+								<input type="hidden"  id="xmbm" name="xmbm">
+							</td>
 						    <th><span class="needwrite">*</span>所在地：&nbsp;</th>
 							<td>
 								<div id="szdsel"></div>
 							</td>
+							
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>
 							<td >
 								<div id="gksel"></div>
 							</td>
-						</tr>
-						<tr>
 						    <th><span class="needwrite">*</span>所在港区：&nbsp;</th>
 						 	<td >
 								<div id="gqsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmfr" id="xmfr">
-							</td>
+							
 						</tr>
 						<tr>
 						    <th><span class="needwrite">*</span>项目类型：&nbsp;</th>
@@ -157,9 +174,9 @@
 							<td>
 								<input type="text" class="form-control" name="ztz" onchange="ratesub()">
 							</td>
-     						<th>项目核准级别：&nbsp;</th>
-							<td>
-							   <div id="xmhzjbsel"></div>
+     						<th>投资类型：&nbsp;</th>
+							<td >
+								<div id="tzlxsel"></div>
 							</td>
 						</tr>
 							<tr id="zftzDiv" style="display:none">
@@ -172,6 +189,27 @@
 								<input type="text" class="form-control" readonly="readonly" id="zftzezb">
 							</td>
 						</tr>
+						<Tr>
+						 <th>建成时间：&nbsp;</th>
+							<td>
+							<input type="text" class="Wdate" name="jcsj" value="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+							</td>
+							 <th>泊位个数：&nbsp;</th>
+							<td>
+							<input type="text" readonly="readonly" class="form-control" id="bwgs">
+							</td>
+						</tr>
+						<tr>
+						    
+     						<th>项目核准级别：&nbsp;</th>
+							<td>
+							   <div id="xmhzjbsel"></div>
+							</td>
+							<th><span class="needwrite">*</span>通过能力（万吨）：&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" name="tgnl">
+							</td>
+						</tr>
 						<tr>
 						    <th>岸线审批级别：&nbsp;</th>
 							<td >
@@ -182,30 +220,15 @@
 								<input type="text" class="form-control" name="axcd">
 							</td>
 						</tr>
-						<tr>
-						  <!--   <th>泊位吨级 （吨）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="bwdj">
-							</td> -->
-							<th>通过能力（万吨）：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="tgnl">
-							</td>
-							   <th>泊位用途：&nbsp;</th>
-                        <td >
-	                        <span id="bwytsel"></span>
-	                        </td>
-						</tr>
+						
+						
 						
 							<tr>
 							<th>水域类型：&nbsp;</th>
 							<td >
 								<div id="sylxsel"></div>
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
-							</td>
+						   
 						</tr>
 					</table>
 				

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

@@ -83,18 +83,32 @@
 					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
+							<td >
+								<input type="text"  readonly class="form-control" name="xmbm" value="${record.xmbm }">
+							</td>
+							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
+							<td >
+								<input type="text"  readonly class="form-control" name="xmmc" value="${record.xmmc }">
+							</td>
+						</tr>
+						<tr>
+							<th>项目概况：&nbsp;</th>
 							<td colspan="3">
-								<input type="text" style="width: 92.5%;" readonly class="form-control" name="xmbm" value="${record.xmbm }">
+								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="3" >
-								<input type="text" style="width: 92.5%;" readonly class="form-control" name="xmmc" value="${record.xmmc }">
+							<th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
+							</td>
+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>
 							<td colspan="3" style="position:relative;">
 								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
 								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid" value ="${jyr.id }">
@@ -107,27 +121,28 @@
 							</td>
 						</tr>
 						<tr>
+							 <th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">
+							</td>
 						    <th><span class="needwrite">*</span>所在地：&nbsp;</th>
 							<td>
 								<span id="szdsel">
 								</span>
 							</td>
+							
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>
 							<td >
 								<span id="gksel">
 								</span>
 							</td>
-						</tr>
-						<tr>
 					    	<th><span class="needwrite">*</span>所在港区：&nbsp;</th>
 							<td >
 								<span id="gqsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
-							</td>
 						</tr>
 						<tr>
 						    <th><span class="needwrite">*</span>项目类型：&nbsp;</th>
@@ -141,24 +156,13 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>建设规模：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
-							</td>
-							<th>投资类型：&nbsp;</th>
-							<td>
-								<span id="tzlxsel">
-								</span>
-							</td>
-						</tr>
-						<tr>
-						    <th>总投资（万元）：&nbsp;</th>
+					    	 <th>总投资（万元）：&nbsp;</th>
 							<td>
 								<input type="text" class="form-control" name="ztz" value="${record.ztz }">
 							</td>
-							<th>项目核准级别：&nbsp;</th>
+							<th>投资类型：&nbsp;</th>
 							<td>
-								<span id="xmhzjbsel">
+								<span id="tzlxsel">
 								</span>
 							</td>
 						</tr>
@@ -173,38 +177,46 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>岸线审批级别：&nbsp;</th>
+						 <th>建成时间：&nbsp;</th>
 							<td>
-								<span id="axspjbsel">
-								</span>
+							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10) }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
-							<th>岸线长度 （米）：&nbsp;</th>
+							<th>泊位个数：&nbsp;</th>
 							<td >
-								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
+								<input type="text"  readonly="readonly" class="form-control" value="${bwgs}">
 							</td>
 						</tr>
 						<tr>
-					    	
+						   
+							<th>项目核准级别：&nbsp;</th>
+							<td>
+								<span id="xmhzjbsel">
+								</span>
+							</td>
 							<th>通过能力（万吨）：&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
+						</tr>
 						
-					 	    <th>泊位用途：&nbsp;</th>
-                        <td >
-	                        <span id="bwytsel"></span>
-                        </td>
-                       
+						<tr>
+					    	<th>岸线审批级别：&nbsp;</th>
+							<td>
+								<span id="axspjbsel">
+								</span>
+							</td>
+							<th>岸线长度 （米）：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
+							</td>
 						</tr>
+						
 							<tr>
 							<th>水域类型：&nbsp;</th>
 							<td >
 								<div id="sylxsel"></div>
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10) }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
-							</td>
+						    
 						</tr>
 				<tr>
 							<th>地市附件与专家评审附件：&nbsp;</th>

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

@@ -86,27 +86,52 @@
 					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 						<tr>
 							<th>项目编码：&nbsp;</th>
-							<td colspan="3">${record.xmbm }</td>
-						</tr>
-						<tr>
+							<td>${record.xmbm }</td>
 							<th>项目名称：&nbsp;</th>
-							<td colspan="3">${record.xmmc }</td>
+							<td >${record.xmmc }</td>
 						</tr>
 						<tr>
-							<th>所属单位：&nbsp;</th>
-							<td colspan="3">${jyr.gkjyr }</td>
+							 <th>项目概况：&nbsp;</th>
+							<td colspan="3" >
+								${record.xmgk }
+							</td>
 						</tr>
 						<tr>
-							<th>所在地：&nbsp;</th>
-							<td>${record.szddzw }</td>
-							<th>所在港口：&nbsp;</th>
-							<td>${record.szgkzw }</td>
+							 <th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								${record.jsgm }
+							</td>
 						</tr>
 						<tr>
-							<th>所在港区：&nbsp;</th>
-							<td>${record.szgqzw }</td>
 							<th>项目法人：&nbsp;</th>
-							<td>${record.xmfr }</td>
+							<td >
+								${record.xmfr }
+							</td>
+							<th>建设单位：&nbsp;</th>
+							<td  >
+								${jyr.gkjyr }
+							</td>
+						</tr>
+						<tr>
+							 <th>行政区划：&nbsp;</th>
+							<td>
+								${xzqhname}
+							</td>
+						    <th>所在地：&nbsp;</th>
+							<td >
+								${record.szddzw }
+							</td>
+						</tr>
+						<tr>
+							<th>所在港口：&nbsp;</th>
+							<td>
+								${record.szgkzw }
+							</td>
+						    <th>所在港区：&nbsp;</th>
+							<td >
+								${record.szgqzw }
+							</td>
+							
 						</tr>
 						<tr>
 							<th>项目类型：&nbsp;</th>
@@ -115,16 +140,14 @@
 							<td>${record.jsdd }</td>
 						</tr>
 						<tr>
-							<th>建设规模：&nbsp;</th>
-							<td>${record.jsgm }</td>
+					    	<th>总投资 （万元）：&nbsp;</th>
+							<td>
+								${record.ztz }
+							</td>
 							<th>投资类型：&nbsp;</th>
-							<td>${record.tzlxzw }</td>
-						</tr>
-						<tr>
-							<th>总投资 （万元）：&nbsp;</th>
-							<td>${record.ztz }</td>
-							<th>项目核准级别：&nbsp;</th>
-							<td>${record.xmhzjbzw }</td>
+							<td>
+								${record.tzlxzw }
+							</td>
 						</tr>
 						<tr id="zftzDiv" style="display: none">
 							<th>政府投资（万元）：&nbsp;</th>
@@ -133,24 +156,37 @@
 							<td id="zftzTd"></td>
 						</tr>
 						<tr>
+					    	<th>建成时间：&nbsp;</th>
+							<td>
+								${fn:substring(record.jcsj,0,10)}
+							</td>
+							<th>泊位个数：&nbsp;</th>
+							<td>
+								${bwgs }
+							</td>
+						</tr>
+						<tr>
+					    	<th>项目核准级别：&nbsp;</th>
+							<td>
+								${record.xmhzjbzw }
+							</td>
+							<th>通过能力（万吨）：&nbsp;</th>
+							<td >
+								${record.tgnl }
+							</td>
+                       </tr>
+						<tr>
 							<th>岸线审批级别：&nbsp;</th>
 							<td>${record.axspjbzw }</td>
 							<th>岸线长度 （米）：&nbsp;</th>
 							<td>${record.axcd }</td>
 						</tr>
-						<tr>
-							<th>通过能力（万吨）：&nbsp;</th>
-							<td>${record.tgnl }</td>
-
-							<th>泊位用途：&nbsp;</th>
-							<td>${record.bwytzw }</td>
-
-						</tr>
+						
+						
 						<tr>
 							<th>水域类型：&nbsp;</th>
 							<td>${record.sylxzw }</td>
-							<th>建成时间：&nbsp;</th>
-							<td>${fn:substring(record.jcsj,0,10)}</td>
+							
 						</tr>
 						<tr>
 							<th>地市附件与专家评审附件：&nbsp;</th>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgladd.jsp

@@ -81,44 +81,61 @@ text-align:center;
 					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th>项目编码：&nbsp;</th>
+							<td >
+								<input type="text"  class="form-control" name="xmbm" value="${record.xmbm }" readonly>
+							</td>
+							<th>项目名称：&nbsp;</th>
+							<td style="position:relative;">
+							<input type="text"  class="form-control" id="xmmc" name="xmmc" value="${record.xmmc }" readonly>
+							<a class="btn btn-primary btn-sm" style="position:absolute;right:4px;top:4px;" href="#" onclick="jsjdgl.detail.xmxxxz()">选择</a>
+							</td>
+						</tr>
+						<tr>
+						
+							<th>项目概况：&nbsp;</th>
 							<td colspan="3">
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm" value="${record.xmbm }" readonly>
+								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
 							</td>
 						</tr>
 						<tr>
-							<th>项目名称：&nbsp;</th>
-							<td colspan="3" style="position:relative;">
-							<input type="text" style="width: 92.5%;" class="form-control" id="xmmc" name="xmmc" value="${record.xmmc }" readonly>
-							<a class="btn btn-primary btn-sm" style="position:absolute;right:4px;top:4px;" href="#" onclick="jsjdgl.detail.xmxxxz()">选择</a>
+						 	<th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
 							</td>
 						</tr>
 						<tr>
-							<th>所属单位：&nbsp;</th>
-							<td colspan="3" >
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
+							</td>
+							<th>建设单位：&nbsp;</th>
+							<td>
 								<input type="hidden"  class="form-control" id="ssjyrid" name="ssjyrid" value="${jyr.id}">
 								<input type="text" style="width: 92.5%;" readonly class="form-control" id="jyrmc" value="${jyr.gkjyr }">
 							</td>
 						</tr>
 						
 						<tr>
+							<th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">
+							</td>
 						    <th>所在地：&nbsp;</th>
 							<td>
 								<div id="szdsel"></div>
 							</td>
+							
+						</tr>
+						<tr>
 							<th>所在港口：&nbsp;</th>
 							<td>
 								<div id="gksel"></div>
 							</td>
-						</tr>
-						<tr>
 						    <th>所在港区：&nbsp;</th>
 							<td >
 								<div id="gqsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
-							</td>
+							
 						</tr>
 						<tr>
 				     		<th>项目类型：&nbsp;</th>
@@ -131,25 +148,15 @@ text-align:center;
 							</td>
 						</tr>
 						<tr>
-						    <th>建设规模：&nbsp;</th>
+						    <th>总投资 （万元）：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
+								<input type="text" class="form-control"  value="${record.ztz }" name="ztz">
 							</td>
 							<th>投资类型：&nbsp;</th>
 							<td>
 								<div id="tzlxsel"></div>
 							</td>
 						</tr>
-						<tr>
-							<th>总投资 （万元）：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control"  value="${record.ztz }" name="ztz">
-							</td>
-							<th>项目核准级别：&nbsp;</th>
-							<td>
-							   <div id="xmhzjbsel"></div>
-							</td>
-						</tr>
 						<tr id="zftzDiv" style="display:none">
 						    <th>政府投资（万元）：&nbsp;</th>
 							<td >
@@ -161,77 +168,47 @@ text-align:center;
 							</td>
 						</tr>
 						<tr>
-					    	<th>岸线审批级别：&nbsp;</th>
+						 <th>建成时间：&nbsp;</th>
 							<td>
-								<span id="axspjbsel">
-								</span>
-							</td>
-							<th>岸线长度 （米）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
+							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
-						</tr>
-						<tr>
-					    	<%-- <th>泊位吨级（吨）：&nbsp;</th>
+							 <th>泊位个数：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="bwdj" value="${record.bwdj }">
-							</td> --%>
-							<th><span class="needwrite">*</span>通过能力（万吨）：&nbsp;</th>
-							<td colspan="1">
-								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
+								<input type="text" class="form-control" name="bwgs" value="" readonly="readonly">
 							</td>
-						<!-- </tr>
-						
-						<tr> -->
-					 	    <th>泊位用途：&nbsp;</th>
-                        <td>
-	                        <span id="bwytsel"></span>
-                        </td>
-                       
-                      <!--   <th>专业化泊位分类：&nbsp;</th>
-                        <td>
-	                        <span id="zyhbwflsel"></span>
-                        </td> -->
 						</tr>
 						<tr>
-							<th>水域类型：&nbsp;</th>
-							<td >
-								<div id="sylxsel"></div>
+							
+							<th>项目核准级别：&nbsp;</th>
+							<td>
+							   <div id="xmhzjbsel"></div>
 							</td>
-						    <th>建成时间：&nbsp;</th>
+								<th><span class="needwrite">*</span>通过能力（万吨）：&nbsp;</th>
 							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
+					
 						</tr>
-						<!-- <tr>
-						    <th>泊位个数：&nbsp;</th>
+						
+						<tr>
+					    	<th>岸线审批级别：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="bwgs" value="" readonly="readonly">
+								<span id="axspjbsel">
+								</span>
 							</td>
-							<th></th>
+							<th>岸线长度 （米）：&nbsp;</th>
 							<td >
-							</td>
-						</tr> -->
-						<%-- <tr>
-						    <th>码头前沿位置_上端点X：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="sddx" value="${record.sddx }">
-							</td>
-						    <th>码头前沿位置_上端点Y：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="sddy" value="${record.sddy }">
+								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
 							</td>
 						</tr>
 						<tr>
-					    	<th>码头前沿位置_下端点X：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="xddx" value="${record.xddx }">
-							</td>
-							<th>码头前沿位置_下端点Y：&nbsp;</th>
-							<td colspan="3">
-								<input type="text" class="form-control" name="xddy" value="${record.xddy }">
+							<th>水域类型：&nbsp;</th>
+							<td >
+								<div id="sylxsel"></div>
 							</td>
-						</tr> --%>
+						   
+						</tr>
+					
 					</table>
 <ul id="myTab" class="nav nav-tabs">
    <li class="active" style="width:12%;font-size:14px">

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

@@ -205,46 +205,65 @@
  <input type="hidden" id="fhbz"  value="${fhbz }">
  <input type="hidden" id ="id" name="id" value="${record.id }"/>
  <input type="hidden" id ="opflag" name="opflag" value="${opflag }"/>
+  <input type="hidden" id ="spflag" name="spflag" value="${spflag }"/>
  <input type="hidden" id ="sfjyr" name="sfjyr" value="${sfjyr }">
  					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
  					<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmbm" readonly value="${record.xmbm }">
+							</td>
+						
+							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
+							<td  style="position:relative;">
+								<input type="text"  class="form-control" id="xmmc" name="xmmc" readonly value="${record.xmmc }">
+							</td>
+						</tr>
+						<tr>
+						
+							<th>项目概况：&nbsp;</th>
 							<td colspan="3">
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm" readonly value="${record.xmbm }">
+								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="3" style="position:relative;">
-								<input type="text" style="width: 92.5%;" class="form-control" id="xmmc" name="xmmc" readonly value="${record.xmmc }">
+						 	<th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
 							</td>
 						</tr>
+
 						<tr>
-							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
-							<td colspan="3" >
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" id="xmfr" name="xmfr" value="${record.xmfr }">
+							</td>
+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>
+							<td >
 								<input type="hidden" class="form-control" id="ssjyrid" name="ssjyrid" value="${jyr.id }">
-								<input type="text" style="width: 92.5%;" readonly class="form-control" id="jyrmc" value="${jyr.gkjyr }">
+								<input type="text"  readonly class="form-control" id="jyrmc" value="${jyr.gkjyr }">
 							</td>
 						</tr>
 						<tr>
+							<th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">
+							</td>
 					    	<th><span class="needwrite">*</span>所在地：&nbsp;</th>
 							<td>
 								<div id="szdsel"></div>
 							</td>
+							
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>
 							<td >
 								<div id="gksel"></div>
 							</td>
-						</tr>
-						<tr>
 						    <th><span class="needwrite">*</span>所在港区：&nbsp;</th>
 							<td>
 								<div id="gqsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" id="xmfr" name="xmfr" value="${record.xmfr }">
-							</td>
 						</tr>
 						<tr>
 						    <th><span class="needwrite">*</span>项目类型：&nbsp;</th>
@@ -258,9 +277,10 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>建设规模：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" id="jsgm" name="jsgm" value="${record.jsgm }">
+							
+							<th>总投资 （万元）：&nbsp;</th>
+				 			<td>
+								<input type="text" class="form-control" id="ztz" name="ztz" value="${record.ztz }">
 							</td>
 							<th>投资类型：&nbsp;</th>
 							<td>
@@ -278,14 +298,26 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>总投资 （万元）：&nbsp;</th>
-				 			<td>
-								<input type="text" class="form-control" id="ztz" name="ztz" value="${record.ztz }">
+						 	<th>建成时间：&nbsp;</th>
+							<td>
+							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
+							<th>泊位个数：&nbsp;</th>
+								<td>
+								<input type="text" class="form-control" id="bwgs" value="${bwgs }">
+								</td>
+						</tr>
+						<tr>
+					    	
 							<th>项目核准级别：&nbsp;</th>
 							<td>
 								<div id="xmhzjbsel"></div>
 							</td>
+							<th>通过能力（万吨）：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" id="tgnl" name="tgnl" value="${record.tgnl }">
+							</td>
+						
 						</tr>
 						<tr>
 						    <th>岸线审批级别：&nbsp;</th>
@@ -298,47 +330,13 @@
 							</td>
 						</tr>
 						<tr>
-						   
-							<th>通过能力（万吨）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" id="tgnl" name="tgnl" value="${record.tgnl }">
-							</td>
-						
-					 	    <th>泊位用途：&nbsp;</th>
-                        <td>
-	                        <span id="bwytsel"></span>
-                        </td>
-						</tr>
-						<tr>
 							<th>水域类型：&nbsp;</th>
 							<td >
 								<div id="sylxsel"></div>
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10)}" 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" id="sddx" value="${record.sddx }">
-							</td>
-						    <th>码头前沿位置_上端点Y：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="sddy" id="sddy" value="${record.sddy }">
-							</td>
+						   
 						</tr>
-						<tr>
-				    		<th>码头前沿位置_下端点X：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="xddx" id="xddx" value="${record.xddx }">
-							</td>
-							<th>码头前沿位置_下端点Y：&nbsp;</th>
-							<td colspan="3">
-								<input type="text" class="form-control" name="xddy" id="xddy" value="${record.xddy }">
-							</td>
-						</tr> --%>
+						
 					</table>
 					
 <ul id="myTab" class="nav nav-tabs">
@@ -570,7 +568,7 @@
 						<th width="10%">批文单位</th>
 						<th width="10%">文号</th>
 						<th width="10%">批文时间</th>
-						<c:if test="${spflag!=3 && opflag == 3 }">
+						<c:if test="${spflag==3 && opflag == 3}">
 						<th width="15%">操作</th>
 						</c:if>
 					</tr>
@@ -604,7 +602,9 @@
 							           删除</a>
 					</td> 
 					 </c:if>	           
-					
+					<c:if test="${spflag==3  && opflag == 3 }">
+					<td></td>
+					</c:if>     
 				</tr>
 				
 				<tr height="40px">
@@ -637,7 +637,9 @@
 							           删除</a>
 					</td> 
 					</c:if>	           
-					
+					<c:if test="${spflag==3  && opflag == 3 }">
+					<td></td>
+					</c:if>     
 				</tr>
 				<tr height="40px">
 				    <td>
@@ -668,7 +670,10 @@
 					<a id="scbt33" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('33')">
 							           删除</a>
 					</td> 
-					</c:if>	         
+					</c:if>	  
+					<c:if test="${spflag==3  && opflag == 3 }">
+					<td></td>
+					</c:if>            
 					<tr>
 					<td>4</td>
 					<td>审查会议纪要</td>
@@ -681,14 +686,17 @@
 					<td><span id="fbdw34">${recordfj34.fbdw }</span></td>
 					<td><span id="wjh34">${recordfj34.wjh }</span></td>
 					<td><span id="fbsj34">${recordfj34.fbsj }</span></td>
-					<c:if test="${spflag!=3  && opflag == 3 }">
+					<c:if test="${spflag ==3  && opflag == 3 }">
 					<td>
 					<a id="tjbt34" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('34')">
 							           添加</a>
 					<a id="scbt34" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('34')">
 							           删除</a>
 					</td> 
-					</c:if>	         
+					</c:if>	 
+					<c:if test="${spflag!=3  && opflag == 3 }">
+					<td></td>
+					</c:if>        
 				</tr>
 				<tr>
 					<td>5</td>
@@ -702,14 +710,17 @@
 					<td><span id="fbdw35">${recordfj35.fbdw }</span></td>
 					<td><span id="wjh35">${recordfj35.wjh }</span></td>
 					<td><span id="fbsj35">${recordfj35.fbsj }</span></td>
-					<c:if test="${spflag!=3  && opflag == 3 }">
+					<c:if test="${spflag==3  && opflag == 3 }">
 					<td>
 					<a id="tjbt35" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('35')">
 							           添加</a>
 					<a id="scbt35" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('35')">
 							           删除</a>
 					</td> 
-					</c:if>	         
+					</c:if>	
+					<c:if test="${spflag!=3  && opflag == 3 }">
+					<td></td>
+					</c:if>            
 				</tr>
 				<tr>
 					<td>6</td>
@@ -723,14 +734,17 @@
 					<td><span id="fbdw36">${recordfj36.fbdw }</span></td>
 					<td><span id="wjh36">${recordfj36.wjh }</span></td>
 					<td><span id="fbsj36">${recordfj36.fbsj }</span></td>
-					<c:if test="${spflag!=3  && opflag == 3 }">
+					<c:if test="${spflag==3  && opflag == 3 }">
 					<td>
 					<a id="tjbt36" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('36')">
 							           添加</a>
 					<a id="scbt36" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('36')">
 							           删除</a>
 					</td> 
-					</c:if>	         
+					</c:if>	 
+					<c:if test="${spflag!=3  && opflag == 3 }">
+					<td></td>
+					</c:if>            
 				</tr>
 				<tr>
 					<td>7</td>
@@ -744,14 +758,17 @@
 					<td><span id="fbdw37">${recordfj37.fbdw }</span></td>
 					<td><span id="wjh37">${recordfj37.wjh }</span></td>
 					<td><span id="fbsj37">${recordfj37.fbsj }</span></td>
-					<c:if test="${spflag!=3  && opflag == 3 }">
+					<c:if test="${spflag==3  && opflag == 3 }">
 					<td>
 					<a id="tjbt37" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('37')">
 							           添加</a>
 					<a id="scbt37" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('37')">
 							           删除</a>
 					</td> 
-					</c:if>	         
+					</c:if>	 
+					<c:if test="${spflag!=3  && opflag == 3 }">
+					<td></td>
+					</c:if>            
 				</tr>
 				<tr>
 					<td>8</td>
@@ -765,14 +782,17 @@
 					<td><span id="fbdw38">${recordfj38.fbdw }</span></td>
 					<td><span id="wjh38">${recordfj38.wjh }</span></td>
 					<td><span id="fbsj38">${recordfj38.fbsj }</span></td>
-					<c:if test="${spflag!=3  && opflag == 3 }">
+					<c:if test="${spflag==3  && opflag == 3 }">
 					<td>
-					<a id="tjbt33" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('38')">
+					<a id="tjbt38" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('38')">
 							           添加</a>
-					<a id="scbt33" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('38')">
+					<a id="scbt38" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('38')">
 							           删除</a>
 					</td> 
-					</c:if>	         
+					</c:if>	 
+					<c:if test="${spflag!=3  && opflag == 3 }">
+					<td></td>
+					</c:if>            
 				</tr>
 				<c:forEach items="${fjvolist3}" var="qtfj" varStatus="status">
 						<tr height="40px">
@@ -796,7 +816,7 @@
 				<td colspan=1 >
 			                           审批意见
 				</td>
-				<td colspan=5> 
+				<td colspan=6> 
 				     <textarea  class="form-control" name="spyj3" id="spyj3" style="height:100px;" value="${xmxxfb.yj }"></textarea>
 				</td>
 				</tr>
@@ -1657,15 +1677,45 @@
                     </c:if>
                     <c:if test="${sfjyr=='' }">
 					<c:if test="${flag=='audit' }">
+					<c:if test="${record.flowstatus == '1' || record.flowstatus == '3'  }">
+					<c:if test="${sfjyr!=1 }">	            
+					<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
+					</c:if>
+						
+						
+					</c:if>
+					<c:if test="${record.flowstatus == '2' || 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 test="${sfjyr!=1 }">	            
+					<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
+					</c:if>
+					</c:if>
 					
+					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">
 					<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 test="${ (spflag =='3' || spflag == '8') }">
-					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveTbzt('${record.id}')">
+					
+						
+						<c:if test="${ (spflag =='3' || spflag == '8' ) }">
+							<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 test="${sfjyr!=1 }">	            
+					<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
 					</c:if>
+					</c:if>	
+					
 					</c:if>
 					</c:if>
 					<c:if test="${sfjyr==1 }">
@@ -1675,14 +1725,10 @@
 							            提交</a>
 					</c:if>	
 					</c:if>
-					<c:if test="${sfjyr!=1 }">	            
-					<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
-							   <i class="glyphicon glyphicon-ban-circle"></i> 
-							            退回</a>
-					</c:if>
-							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.back()">
+					
+					     <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
-							            返回</a>
+							            返回</a>	            		            		            		            
           			</div>
 			</div>
 		</div>

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

@@ -212,7 +212,7 @@
 							    </c:if>
 							<!-- </td>
 							<td class="operatetd"> -->
-							<c:if test="${jsjdgl.taskState!=null  }">
+							<c:if test="${jsjdgl.taskState!=null && jsjdgl.sftb =='N' }">
 							<a class="btn btn-default btn-xs" href="#"  onclick="jsjdgl.main.banli('${jsjdgl.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglview.jsp

@@ -91,42 +91,56 @@
 					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 						<tr>
 							<th>项目编码：&nbsp;</th>
-							<td colspan="3" >
+							<td>
 								<span id="xmmc">${record.xmbm}</span>
 							</td>
-						</tr>
-						<tr>
 							<th>项目名称：&nbsp;</th>
-							<td colspan="3" >
+							<td >
 								<span id="xmmc">${record.xmmc}</span>
 							</td>
 						</tr>
 						<tr>
-							<th>所属单位：&nbsp;</th>
-							<td colspan="3" >
+							<th>项目概况：&nbsp;</th>
+							<td >
+								${record.xmgk }
+							</td>
+							<th>建设规模：&nbsp;</th>
+							<td >
+								${record.jsgm }
+							</td>
+						</tr>
+						<tr>
+							<th>项目法人：&nbsp;</th>
+							<td >
+								<span id="xmfr">${record.xmfr }</span>
+							</td>
+							<th>建设单位：&nbsp;</th>
+							<td  >
 								<span id="jyrid">${jyr.jyrid }</span>
 								<span id="jyrmc">${record.jyrzw }</span>
 							</td>
 						</tr>
 						<tr>
+							<th>行政区划：&nbsp;</th>
+							<td >
+								${xzqhname}
+							</td>
 					    	<th>所在地：&nbsp;</th>
 							<td >
 								<span id="szd">${record.szddzw }</span>
 							</td>
+							
+						</tr>
+						<tr>
 							<th>所在港口：&nbsp;</th>
 							<td >
 								<span id="szgk">${record.szgkzw }</span>
 							</td>
-						</tr>
-						<tr>
 					    	<th>所在港区：&nbsp;</th>
 							<td >
 								<span id="szgq">${record.szgqzw }</span>
 							</td>
-							<th>项目法人：&nbsp;</th>
-							<td >
-								<span id="xmfr">${record.xmfr }</span>
-							</td>
+							
 						</tr>
 						<tr>
 					    	<th>项目类型：&nbsp;</th>
@@ -139,33 +153,45 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>建设规模：&nbsp;</th>
-					 		<td >
-								<span id="jsgm">${record.jsgm }</span>
+					    	 <th>总投资 （万元）：&nbsp;</th>
+							<td>
+								<span id="ztz">${record.ztz }</span>
 							</td>
 							<th>投资类型：&nbsp;</th>
 							<td>
 								<span id="tzlxzw">${record.tzlxzw }</span>
 							</td>
 						</tr>
+						<tr id="zftzDiv" style="display:none">
+						    <th>政府投资（万元）：&nbsp;</th>
+							<td >
+								${record.zftze }
+							</td>
+							<th>政府投资占比（%）：&nbsp;</th>
+							<td id="zftzTd"></td>
+						</tr>
 						<tr>
-						    <th>总投资 （万元）：&nbsp;</th>
+					    	<th>建成时间：&nbsp;</th>
 							<td>
-								<span id="ztz">${record.ztz }</span>
+								${fn:substring(record.jcsj,0,10)}
+							</td>
+							<th>泊位个数：&nbsp;</th>
+							<td>
+								${bwgs }
 							</td>
+						</tr>
+						<tr>
+						   
 							<th>项目核准级别：&nbsp;</th>
 							<td>
 								<span id="xmhzjbzw">${record.xmhzjbzw }</span>
 							</td>
-						</tr>
-					<tr id="zftzDiv" style="display:none">
-						    <th>政府投资（万元）：&nbsp;</th>
+							<th>通过能力（万吨）：&nbsp;</th>
 							<td >
-								${record.zftze }
+								${record.tgnl }
 							</td>
-							<th>政府投资占比（%）：&nbsp;</th>
-							<td id="zftzTd"></td>
 						</tr>
+					
 						<tr>
 						    <th>岸线审批级别：&nbsp;</th>
 							<td >
@@ -176,26 +202,13 @@
 								${record.axcd }
 							</td>
 						</tr>
-						<tr>
-						   
-							<th>通过能力（万吨）：&nbsp;</th>
-							<td >
-								${record.tgnl }
-							</td>
-					
-					    	<th>泊位用途：</th>
-                            <td>
-                             ${record.bwytzw }
-                       </tr>
+						
 						<tr>
 							<th>水域类型：&nbsp;</th>
 							<td >
 								${record.sylxzw }
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-								${fn:substring(record.jcsj,0,10)}
-							</td>
+						    
 						</tr>
 						<%-- <tr>
 					    	<th>码头前沿位置_上端点X：&nbsp;</th>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglxiugai.jsp

@@ -93,44 +93,62 @@ text-align:center;
 					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
-							<td colspan="3">
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm" readonly value="${record.xmbm }">
+							<td>
+								<input type="text"  class="form-control" name="xmbm" readonly value="${record.xmbm }">
 							</td>
-						</tr>
-						<tr>
+						
 							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="3" style="position:relative;">
-							<input type="text" style="width: 92.5%;" class="form-control" id="xmmc" name="xmmc" readonly value="${record.xmmc }">
+							<td style="position:relative;">
+							<input type="text"  class="form-control" id="xmmc" name="xmmc" readonly value="${record.xmmc }">
 							<a  class="btn btn-primary btn-sm" style="position:absolute;right:1px;top:4px;" href="#" onclick="jsjdgl.detail.xmxxxz()">
 							           选择</a>
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>所属企业：&nbsp;</th>
-							<td colspan="3" >
+						
+							<th>项目概况：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
+							</td>
+						</tr>
+						<tr>
+						 	<th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
+							</td>
+						</tr>
+						<tr>
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
+							</td>
+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>
+							<td  >
 								<input type="hidden" class="form-control" id="ssjyrid" name="ssjyrid" value="${jyr.id }">
 								<input readonly type="text" style="width: 92.5%;" readonly class="form-control" id="jyrmc" value="${jyr.gkjyr }">
 							</td>
 						</tr>
 						<tr>
+							<th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">
+							</td>
 					    	<th><span class="needwrite">*</span>所在地：&nbsp;</th>
 							<td>
 								<div id="szdsel"></div>
 							</td>
+							
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>
 							<td>
 								<div id="gksel"></div>
 							</td>
-						</tr>
-						<tr>
 					    	<th><span class="needwrite">*</span>所在港区：&nbsp;</th>
 							<td >
 								<div id="gqsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
-							</td>
+							
 						</tr>
 						<tr>
 					    	<th><span class="needwrite">*</span>项目类型：&nbsp;</th>
@@ -143,35 +161,46 @@ text-align:center;
 							</td>
 						</tr>
 						<tr>
-						    <th>建设规模：&nbsp;</th>
+						   <th>总投资（万元）：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
+								<input type="text" class="form-control"  value="${record.ztz }" name="ztz">
 							</td>
 							<th>投资类型：&nbsp;</th>
 							<td >
 								<div id="tzlxsel"></div>
 							</td>
 						</tr>
+						<tr id="zftzDiv" style="display:none">
+						    <th>政府投资（万元）：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="zftze" value="${record.zftze }" onchange="ratesub()">
+							</td>
+							<th>政府投资占比（%）：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" readonly="readonly" id="zftzezb">
+							</td>
+						</tr>
 						<tr>
-					    	<th>总投资（万元）：&nbsp;</th>
+						 	<th>建成时间：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control"  value="${record.ztz }" name="ztz">
+							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
+							<th>泊位个数：&nbsp;</th>
+								<td>
+								<input type="text" class="form-control" id="bwgs" value="${bwgs }">
+								</td>
+						</tr>
+						<tr>
 							<th>项目核准级别：&nbsp;</th>
 							<td>
 							   <div id="xmhzjbsel"></div>
 							</td>
-						</tr>
-							<tr id="zftzDiv" style="display:none">
-						    <th>政府投资（万元）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="zftze" value="${record.zftze }" onchange="ratesub()">
-							</td>
-							<th>政府投资占比（%）：&nbsp;</th>
+							<th>通过能力（万吨）：&nbsp;</th>
 							<td >
-								<input type="text" class="form-control" readonly="readonly" id="zftzezb">
+								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
 						</tr>
+						
 						<tr>
 					    	<th>岸线审批级别：&nbsp;</th>
 							<td >
@@ -182,53 +211,13 @@ text-align:center;
 								<input type="text" class="form-control" value="${record.axcd }" name="axcd">
 							</td>
 						</tr>
-						<tr>
-						   
-						    <th>通过能力（万吨）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
-							</td>
-					
-					 	    <th>泊位用途：&nbsp;</th>
-                        <td>
-	                        <span id="bwytsel"></span>
-                        </td>
-                       
-                        <!-- <th>专业化泊位分类：&nbsp;</th>
-                        <td>
-	                        <span id="zyhbwflsel"></span>
-                        </td> -->
-						</tr>
+						
 						<tr>
 							<th>水域类型：&nbsp;</th>
 							<td >
 								<div id="sylxsel"></div>
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10)}" 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" value="${record.sddx }">
-							</td>
-						    <th>码头前沿位置_上端点Y：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="sddy" value="${record.sddy }">
-							</td>
-						</tr>
-						<tr>
-						    <th>码头前沿位置_下端点X：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="xddx" value="${record.xddx }">
-							</td>
-							<th>码头前沿位置_下端点Y：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="xddy" value="${record.xddy }">
-							</td>
-						</tr> --%>
 					</table>
 <ul id="myTab" class="nav nav-tabs">
    <li class="active" style="width:12%;font-size:14px">

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

@@ -34,7 +34,7 @@
 							$("#xzqhsel").append(str);
 							
 							$('.xzqhselectpicker').selectpicker({
-								width:'92.5%'
+								width:'80%'
 							});
 						}
 						}, "json");
@@ -108,10 +108,9 @@
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
 					<table class="apply" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 						<tr>
-						    <th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+						    <th>项目编码：&nbsp;</th>
 							<td>
-								<div id="xzqhsel"></div>
-								<input type="hidden"  id="xmbm" name="xmbm">
+								<input type="text" readonly="readonly" class="form-control" name="xmbm">
 							</td>
 							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
 							<td>
@@ -119,9 +118,26 @@
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
-							<td colspan="4" style="position:relative;">
-								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
+							<th>项目概况：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="xmgk">
+							</td>
+						</tr>
+						<tr>
+						 	<th>建设规模：&nbsp;</th>
+							<td colspan="3">
+								<input type="text" class="form-control" name="jsgm">
+							</td>
+						</tr>
+						<tr>
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmfr" id="xmfr">
+							</td>
+						
+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>
+							<td style="position:relative;">
+								<input type="text"  readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
 								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid"  value ="${jyr.id }">
 								<c:if test="${jyr.id == null }">
 										<a class="btn btn-primary btn-sm" href="#"
@@ -132,24 +148,27 @@
 							</td>
 						</tr>
 						<tr>
+							<th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<div id="xzqhsel"></div>
+								<input type="hidden"  id="xmbm" name="xmbm">
+							</td>
 						    <th><span class="needwrite">*</span>所在地：&nbsp;</th>
 							<td>
 								<div id="szdsel"></div>
 							</td>
+							
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>
 							<td >
 								<div id="gksel"></div>
 							</td>
-						</tr>
-						<tr>
 						    <th><span class="needwrite">*</span>所在港区：&nbsp;</th>
 						 	<td >
 								<div id="gqsel"></div>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmfr" id="xmfr">
-							</td>
+						
 						</tr>
 						<tr>
 						 <th>所属泊位：&nbsp;</th>
@@ -168,25 +187,16 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>建设规模：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="jsgm">
+						   <th>总投资 （万元）：&nbsp;</th>
+							<td>
+								<input type="text" class="form-control" name="ztz" onchange="ratesub()">
 							</td>
 							<th>投资类型：&nbsp;</th>
 							<td >
 								<div id="tzlxsel"></div>
 							</td>
 						</tr>
-						<tr>
-						    <th>总投资 （万元）：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="ztz" onchange="ratesub()">
-							</td>
-     						<th>项目核准级别：&nbsp;</th>
-							<td>
-							   <div id="xmhzjbsel"></div>
-							</td>
-						</tr>
+					
 						<tr id="zftzDiv" style="display:none">
 						    <th>政府投资（万元）：&nbsp;</th>
 							<td >
@@ -198,46 +208,42 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>岸线审批级别：&nbsp;</th>
-							<td >
-								<div id="axspjbsel"></div>
+						 <th>建成时间：&nbsp;</th>
+							<td>
+							<input type="text" class="Wdate" name="jcsj" value="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
-							<th>岸线长度 （米）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="axcd">
+							 <th>泊位个数：&nbsp;</th>
+							<td>
+							<input type="text" readonly="readonly" class="form-control" id="bwgs">
 							</td>
 						</tr>
 						<tr>
-						    <!-- <th>泊位吨级 （吨）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="bwdj">
-							</td> -->
+						    
+     						<th>项目核准级别：&nbsp;</th>
+							<td>
+							   <div id="xmhzjbsel"></div>
+							</td>
 							<th><span class="needwrite">*</span>通过能力（万吨）：&nbsp;</th>
 							<td>
 								<input type="text" class="form-control" name="tgnl">
 							</td>
-						<!-- </tr>
-						
-						<tr> -->
-					 	    <th>泊位用途：&nbsp;</th>
-                        <td>
-	                        <span id="bwytsel"></span>
-                        </td>
-                       
-                        <!-- <th>专业化泊位分类：&nbsp;</th>
-                        <td>
-	                        <span id="zyhbwflsel"></span>
-                        </td> -->
+						</tr>
+						<tr>
+						    <th>岸线审批级别：&nbsp;</th>
+							<td >
+								<div id="axspjbsel"></div>
+							</td>
+							<th>岸线长度 （米）：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="axcd">
+							</td>
 						</tr>
 						<tr>
 							<th>水域类型：&nbsp;</th>
 							<td >
 								<div id="sylxsel"></div>
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
-							</td>
+						   
 						</tr>
 					</table>
 				

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

@@ -84,24 +84,33 @@
  <input type="hidden" name="fjids" id="fjids">	
 					<table class="apply" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 						<tr>
-							<th><span class="needwrite">*</span>行政区划：&nbsp;</th>
-							<td>
-								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">
-							</td>
+							
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
 							<td>
 								<input type="text"  readonly="readonly" class="form-control" name="xmbm" value="${record.xmbm }">
 							</td>
-						</tr>
-						<tr>
 							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="4" >
+							<td >
 								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc" value="${record.xmmc }">
 							</td>
 						</tr>
 						<tr>
-							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
-							<td colspan="4" style="position:relative;">
+							<th>项目概况：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
+							</td>	
+							<th>建设规模：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
+							</td>
+						</tr>
+						<tr>
+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
+							</td>
+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>
+							<td style="position:relative;">
 								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
 								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid" value ="${jyr.id }">
 								<c:if test="${jyr.id == null }">
@@ -113,27 +122,28 @@
 							</td>
 						</tr>
 						<tr>
+							<th><span class="needwrite">*</span>行政区划：&nbsp;</th>
+							<td>
+								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">
+							</td>
 						    <th><span class="needwrite">*</span>所在地：&nbsp;</th>
 							<td>
 								<span id="szdsel">
 								</span>
 							</td>
+							
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>
 							<td >
 								<span id="gksel">
 								</span>
 							</td>
-						</tr>
-						<tr>
 					    	<th><span class="needwrite">*</span>所在港区：&nbsp;</th>
 							<td >
 								<span id="gqsel">
 								</span>
 							</td>
-							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmfr" value="${record.xmfr }">
-							</td>
 						</tr>
 						<tr>
 						 <th>所属泊位：&nbsp;</th>
@@ -153,27 +163,17 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>建设规模：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
-							</td>
-							<th>投资类型：&nbsp;</th>
-							<td>
-								<span id="tzlxsel">
-								</span>
-							</td>
-						</tr>
-						<tr>
-						    <th>总投资（万元）：&nbsp;</th>
+					    	 <th>总投资（万元）：&nbsp;</th>
 							<td>
 								<input type="text" class="form-control" name="ztz" value="${record.ztz }">
 							</td>
-							<th>项目核准级别：&nbsp;</th>
+							<th>投资类型：&nbsp;</th>
 							<td>
-								<span id="xmhzjbsel">
+								<span id="tzlxsel">
 								</span>
 							</td>
 						</tr>
+						
 						<tr id="zftzDiv" style="display:none">
 						    <th>政府投资（万元）：&nbsp;</th>
 							<td >
@@ -185,69 +185,48 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>岸线审批级别：&nbsp;</th>
+							 <th>建成时间：&nbsp;</th>
+								<td>
+								<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+								</td>
+								<th>泊位个数：&nbsp;</th>
+								<td>
+								<input type="text" class="form-control" id="bwgs" value="${bwgs }">
+								</td>
+						</tr>
+						<tr>
+						   
+							<th>项目核准级别：&nbsp;</th>
 							<td>
-								<span id="axspjbsel">
+								<span id="xmhzjbsel">
 								</span>
 							</td>
-							<th>岸线长度 （米）：&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
-							</td>
-						</tr>
-						<tr>
-					    	
 							<th><span class="needwrite">*</span>通过能力（万吨）：&nbsp;</th>
 							<td>
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
-					
-					 	    <th>泊位用途：&nbsp;</th>
-                        <td>
-	                        <span id="bwytsel"></span>
-                        </td>
-                       
-                     
 						</tr>
+						
 						<tr>
-							<th>水域类型：&nbsp;</th>
-							<td >
-								<div id="sylxsel"></div>
-							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
-							</td>
-						</tr>
-						<!-- <tr>
-						    <th>泊位个数：&nbsp;</th>
+					    	<th>岸线审批级别：&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="bwgs" value="" readonly="readonly">
+								<span id="axspjbsel">
+								</span>
 							</td>
-							<th></th>
+							<th>岸线长度 （米）：&nbsp;</th>
 							<td >
-							</td>
-						</tr> -->
-					<%-- 	<tr>
-						    <th>码头前沿位置_上端点X：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="sddx" value="${record.sddx }">
-							</td>
-						    <th>码头前沿位置_上端点Y：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="sddy" value="${record.sddy }">
+								<input type="text" class="form-control" name="axcd" value="${record.axcd }">
 							</td>
 						</tr>
+						
 						<tr>
-					    	<th>码头前沿位置_下端点X：&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="xddx" value="${record.xddx }">
-							</td>
-							<th>码头前沿位置_下端点Y：&nbsp;</th>
-							<td colspan="3">
-								<input type="text" class="form-control" name="xddy" value="${record.xddy }">
+							<th>水域类型：&nbsp;</th>
+							<td >
+								<div id="sylxsel"></div>
 							</td>
-						</tr> --%>
+						   
+						</tr>
+						
 				
 					</table>
 					

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

@@ -52,46 +52,56 @@
  <form  id="addform" method="post" enctype="multipart/form-data"> 		
 					<table class="apply" cellpadding="0" cellspacing="0">
 						<tr>
-							<th>行政区划：&nbsp;</th>
-							<td >
-								${xzqhname}
-							</td>
 							<th>项目编码：&nbsp;</th>
 							<td >
 								${record.xmbm }
 							</td>
-						</tr>
-						<tr>
 							<th>项目名称：&nbsp;</th>
-							<td colspan="4" >
+							<td>
 								${record.xmmc }
 							</td>
 						</tr>
 						<tr>
-							<th>所属单位：&nbsp;</th>
+							<th>项目概况：&nbsp;</th>
+							<td >
+								${record.xmgk }
+							</td>
+							<th>建设规模：&nbsp;</th>
+							<td >
+								${record.jsgm }
+							</td>
+						</tr>
+						<tr>
+							<th>项目法人：&nbsp;</th>
+							<td >
+								${record.xmfr }
+							</td>
+							<th>建设单位：&nbsp;</th>
 							<td colspan="4" >
 								${jyr.gkjyr }
 							</td>
 						</tr>
 						<tr>
+							<th>行政区划：&nbsp;</th>
+							<td >
+								${xzqhname}
+							</td>
 						    <th>所在地：&nbsp;</th>
 							<td >
 								${record.szddzw }
 							</td>
+							
+						</tr>
+						<tr>
 							<th>所在港口：&nbsp;</th>
 							<td>
 								${record.szgkzw }
 							</td>
-						</tr>
-						<tr>
 						    <th>所在港区：&nbsp;</th>
 							<td >
 								${record.szgqzw }
 							</td>
-							<th>项目法人：&nbsp;</th>
-							<td >
-								${record.xmfr }
-							</td>
+							
 						</tr>
 						<tr>
 						 <th>所属泊位：&nbsp;</th>
@@ -110,32 +120,42 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>建设规模：&nbsp;</th>
-							<td >
-								${record.jsgm }
+						    <th>总投资 （万元）：&nbsp;</th>
+							<td>
+								${record.ztz }
 							</td>
 							<th>投资类型：&nbsp;</th>
 							<td>
 								${record.tzlxzw }
 							</td>
 						</tr>
+						<tr id="zftzDiv" style="display:none">
+						    <th>政府投资（万元）：&nbsp;</th>
+							<td >
+								${record.zftze }
+							</td>
+							<th>政府投资占比（%）：&nbsp;</th>
+							<td id="zftzTd"></td>
+						</tr>
 						<tr>
-					    	<th>总投资 （万元）：&nbsp;</th>
+					    	<th>建成时间：&nbsp;</th>
 							<td>
-								${record.ztz }
+								${fn:substring(record.jcsj,0,10)}
 							</td>
+							<th>泊位个数：&nbsp;</th>
+							<td>
+								${bwgs }
+							</td>
+						</tr>
+						<tr>
 							<th>项目核准级别：&nbsp;</th>
 							<td>
 								${record.xmhzjbzw }
 							</td>
-						</tr>
-						<tr id="zftzDiv" style="display:none">
-						    <th>政府投资（万元）：&nbsp;</th>
+							<th>通过能力（万吨）：&nbsp;</th>
 							<td >
-								${record.zftze }
+								${record.tgnl }
 							</td>
-							<th>政府投资占比（%）：&nbsp;</th>
-							<td id="zftzTd"></td>
 						</tr>
 						<tr>
 						    <th>岸线审批级别：&nbsp;</th>
@@ -147,49 +167,14 @@
 								${record.axcd }
 							</td>
 						</tr>
-						<tr>
-						   
-							<th>通过能力（万吨）：&nbsp;</th>
-							<td >
-								${record.tgnl }
-							</td>
-					    	<th>泊位用途：</th>
-                            <td>
-                             ${record.bwytzw }
-                            </td>
-                          
-                       </tr>
+						
 						<tr>
 							<th>水域类型：&nbsp;</th>
 							<td >
 								${record.sylxzw }
 							</td>
-						    <th>建成时间：&nbsp;</th>
-							<td>
-								${fn:substring(record.jcsj,0,10)}
-							</td>
-						</tr>
-						<%-- <tr>
-					    	<th>码头前沿位置_上端点X：&nbsp;</th>
-							<td>
-								${record.sddx }
-							</td>
-					    	<th>码头前沿位置_上端点Y：&nbsp;</th>
-							<td >
-								${record.sddy }
-							</td>
+						    
 						</tr>
-						<tr>
-					    	<th>码头前沿位置_下端点X：&nbsp;</th>
-							<td>
-								${record.xddx }
-							</td>
-							<th>码头前沿位置_下端点Y：&nbsp;</th>
-							<td>
-								${record.xddy }
-							</td>
-						</tr> --%>
-				
 					</table>
 </form>