Jelajahi Sumber

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

ld_xuhx 9 tahun lalu
induk
melakukan
b1381eba5d
22 mengubah file dengan 1460 tambahan dan 142 penghapusan
  1. 29 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgadd.jsp
  2. 328 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsadd.jsp
  3. 242 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsedit.jsp
  4. 180 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsmain.jsp
  5. 301 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsview.jsp
  6. 53 11
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgedit.jsp
  7. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgmain.jsp
  8. 43 9
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgview.jsp
  9. 52 22
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp
  10. 0 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjmain.jsp
  11. 34 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjview.jsp
  12. 35 6
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgladd.jsp
  13. 29 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp
  14. 31 23
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglview.jsp
  15. 29 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglxiugai.jsp
  16. 20 18
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgladd.jsp
  17. 26 24
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgledit.jsp
  18. 14 13
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglview.jsp
  19. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqaddmain.jsp
  20. 6 0
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdgldetail.js
  21. 1 1
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/xmxxgl/xmxxgldetail.js
  22. 4 3
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgdetail.js

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

@@ -86,6 +86,7 @@
 			<div class="apply_fill">
  <form  id="addform" method="post" enctype="multipart/form-data"> 			
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
+  <input type="hidden" class="form-control"  name="xmid" id="xmid" value="${record.id }">
 					<table class="apply" cellpadding="0" cellspacing="0">
 					<tr>
 							<th><span class="needwrite">*</span>项目编码:&nbsp;</th>
@@ -221,7 +222,34 @@
 							</td>
 						</tr>
 					</table>
-				
+					 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a href="#" onclick="jsjdbg.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>			
 					<div  id="buttons">
                     	<a class="btn btn-default btn-sm" href="#" onclick="jsjdbg.detail.save()">
 							   <i class="glyphicon glyphicon-floppy-disk"></i> 

+ 328 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsadd.jsp

@@ -0,0 +1,328 @@
+
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>江苏省港口建设与经营管理信息系统</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <%@ include file="../../common.jsp"%>
+	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jsjdbg/jsjdbgdsdetail.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			jsjdbgds.detail.init();
+			var id = '${jyr.id}';
+			if(!isEmpty(id)){
+				jsjdbgds.detail.szd ='${jyr.szd.id}';
+				jsjdbgds.detail.gq ='${jyr.szgq.id}';
+				jsjdbgds.detail.gk ='${jyr.szgk.id}';
+			}else{
+				jsjdbgds.detail.szd ='${sz}';
+				jsjdbgds.detail.gk ='${gk}';
+				
+			}
+			//水域类型
+			initSylxSelect('sylxsel','${record.sylx }','80%');
+			//项目类型默认新建
+				initXmlxSelect('xmlxsel','${record.xmlx }','80%');
+			//投资类型默认企业投资
+				initTzlxSelect('tzlxsel','${record.tzlx}','80%');
+				initXmhzjbSelect('xmhzjbsel','${record.xmhzjb }','80%');
+				initAxspjbSelect('axspjbsel','${record.axspjb }','80%');
+				jsjdbgds.detail.initBwyt('bwytsel', '');
+				jsjdbgds.detail.initZyhbwfl('zyhbwflsel', '','');
+				initszdSelect('szdsel', jsjdbgds.detail.szd, 'showgk', '80%');
+				initgkSelect('gksel',jsjdbgds.detail.gk,jsjdbgds.detail.szd,'showgq','80%');
+				initgqSelect('gqsel',jsjdbgds.detail.gq,jsjdbgds.detail.szd,jsjdbgds.detail.gk,null,'80%');
+			/* $('.close').click(function(){
+				guanbi();
+			}) */
+		});
+		
+		function showgk(){
+			initgkSelect('gksel',jsjdbgds.detail.gk,$('.szdselectpicker').val(),"showgq",'80%');
+			showgq();
+		}
+
+		function showgq(){
+			initgqSelect('gqsel',jsjdbgds.detail.gq,$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
+		} 
+			 
+		function jyrSel(jyrid){
+			guanbipop();
+			$.post($.app + "/gkjyr/findById", {
+				id:jyrid
+		    }, function(data) {
+		    	//返回的是经营人实体,你可以在回掉中,进行任何其他字段的默认填写
+		    	$('#jyrid').val(data.id);
+		    	$('#jyrmc').val(data.gkjyr);
+		    	$('#xmfr').val(data.fddbr);
+		    	jsjdbgds.detail.szd =data.szd.id;
+				jsjdbgds.detail.gq =data.szgq.id;
+				jsjdbgds.detail.gk =data.szgk.id;
+				initszdSelect('szdsel', jsjdbgds.detail.szd, 'showgk', '80%');
+				initgkSelect('gksel',jsjdbgds.detail.gk,jsjdbgds.detail.szd,'showgq','80%');
+				initgqSelect('gqsel',jsjdbgds.detail.gq,jsjdbgds.detail.szd,jsjdbgds.detail.gk,null,'80%');
+		    }, "json");
+		}
+		
+		function ytsel(){
+			jsjdbgds.detail.initZyhbwfl('zyhbwflsel', '',$('.bwytselectpicker').val()+"");
+		}
+		function guanbitc(){
+			$('.theme-popover-mask-tc').fadeOut(100);
+			$('.theme-popover-tc').slideUp(0);
+		}
+	</script>
+</head>
+
+<body>
+<jsp:include page="../../jyrselect.jsp"></jsp:include>
+<jsp:include page="../../showbwview.jsp"></jsp:include>
+	<div class="box" >
+		<div class="box-content" >
+			<div class="apply_fill">
+ <form  id="addform" method="post" enctype="multipart/form-data"> 			
+ <input type="hidden" class="form-control"  name="fjids" id="fjids">
+  <input type="hidden" class="form-control"  name="xmid" id="xmid" value="${record.id }">
+					<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+							<th><span class="needwrite">*</span>项目编码:&nbsp;</th>
+							<td>
+								<input type="text"  readonly="readonly" class="form-control" name="xmbm" value="${record.xmbm }">
+							</td>
+							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
+							<td  style="position:relative;">
+								<input type="text" class="form-control" name="xmmc" value="${record.xmmc }">
+							<a class="btn btn-primary btn-sm" style="position:absolute;right:4px;top:4px;" href="#" onclick="jsjdbgds.detail.xmxxxz()">选择</a>
+							</td>
+						</tr>
+						<tr>
+						 <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="#"
+										 onclick="jyrselpop('jyrSel')"  
+										style="position:absolute;right:4px;top:4px;"> <i class="glyphicon"></i>选择
+									    </a>
+							    </c:if> 
+							</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>
+						    <th><span class="needwrite">*</span>所在港区:&nbsp;</th>
+						 	<td >
+								<div id="gqsel"></div>
+							</td>
+							
+						</tr>
+						<tr>
+						    <th><span class="needwrite">*</span>项目类型:&nbsp;</th>
+							<td >
+								<div id="xmlxsel"></div>
+							</td>
+							<th><span class="needwrite">*</span>建设地址:&nbsp;</th>
+							<td >
+								<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="ztz" value="${record.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>
+							<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"  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" value="${record.tgnl }">
+							</td>
+						</tr>
+						<tr>
+						    <th>岸线审批级别:&nbsp;</th>
+							<td >
+								<div id="axspjbsel"></div>
+							</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>
+						</tr>
+					</table>
+					 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a href="#" onclick="jsjdbgds.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>			
+					<div  id="buttons">
+                    	<a class="btn btn-default btn-sm" href="#" onclick="jsjdbgds.detail.save()">
+							   <i class="glyphicon glyphicon-floppy-disk"></i> 
+							            保存</a>
+							            
+							            <a class="btn btn-default btn-sm" href="#" onclick="jsjdbgds.detail.submit()">
+							   <i class="glyphicon glyphicon-share"></i> 
+							            提交</a>
+							            
+							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.detail.back()">
+							   <i class="glyphicon glyphicon-arrow-left"></i> 
+							           返回</a>
+							            
+          			</div>
+	</form>
+				</div>
+		</div>
+
+</div>
+
+<div class="theme-popover-tc" id="theme-popover-tc" style="width: 900px;height: 400px;">
+<div class="theme-poptit-tc">
+	          <div class="close-tc">
+	          		<a href="#" title="关闭" onclick="guanbitc()" >×</a>
+	          </div>
+	     </div>
+		<div class="popContent-tc" >
+	<div  style="background-color:#f4f4f4;">
+	<table class="search_table" cellpadding="0" cellspacing="0">
+					<tr>
+						<th width="10%"></th>
+						<th width="25%"></th>	
+						<th width="10%"></th>
+						<th width="25%"></th>
+						<th width="10%"></th>
+						<th width="20%"></th>
+					</tr>
+					<tr>
+						<td class="right">项目名称:</td>
+						<td class="right"><input type="text" class="form-control"  id="xmcx" name="xmcx"  value="${xmcx }"></td>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td align="center"> <a class="btn btn-default btn-sm" href="#" onclick="jsjdbgds.detail.xmxxxz()">
+							   <i class="glyphicon glyphicon-search"></i> 
+							            查询</a>
+						</td>	
+					</tr>
+				</table>
+				<table  class="main_table" cellpadding="0" cellspacing="0">
+                     <tr>
+						<th width="10%">序号</th>	
+						<th width="10%">项目名称</th>
+						<th width="10%">港口</th>
+						<th width="10%">港区</th>
+						<th width="10%">项目法人</th>
+						<th width="10%">建设地址</th>
+						<th width="15%">项目类型</th>
+						<th width="15%">操作</th>
+					</tr>
+					<tbody id="xmxxtb"></tbody>
+				</table>
+				<!-- 分页处 -->
+			    <jsp:include page="../../pageinfoforjyr.jsp"></jsp:include>
+			</div>
+		<div id="buttons">
+            <a class="btn btn-default btn-sm" href="#"  onclick="guanbitc()">
+           关闭</a>
+  		</div>
+		</div>
+	</div>
+	<div class="theme-popover-mask-tc" id="theme-popover-mask-tc"></div>
+</body>
+
+</html>

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

@@ -0,0 +1,242 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>江苏省港口建设与经营管理信息系统</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <%@ include file="../../common.jsp"%>
+	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jsjdbg/jsjdbgdsdetail.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			jsjdbgds.detail.init();
+			var id = '${jyr.id}';
+			if(!isEmpty(id)){
+				jsjdbgds.detail.szd ='${jyr.szd.id}';
+				jsjdbgds.detail.gq ='${jyr.szgq.id}'
+				jsjdbgds.detail.gk ='${jyr.szgk.id}'
+			}
+			initSylxSelect('sylxsel', '${record.sylx }', '80%');
+			initXmlxSelect('xmlxsel', '${record.xmlx }', '80%');
+			initTzlxSelect('tzlxsel', '${record.tzlx }', '80%');
+			initXmhzjbSelect('xmhzjbsel', '${record.xmhzjb }', '80%');
+			initAxspjbSelect('axspjbsel', '${record.axspjb }', '80%');
+			initszdSelect('szdsel', jsjdbgds.detail.szd, 'showgk', '80%');
+			initgkSelect('gksel',jsjdbgds.detail.gk,jsjdbgds.detail.szd,'showgq','80%');
+			initgqSelect('gqsel',jsjdbgds.detail.gq,jsjdbgds.detail.szd,jsjdbgds.detail.gk,null,'80%');
+			jsjdbgds.detail.initBwyt('bwytsel', '${record.bwyt }');
+			jsjdbgds.detail.initZyhbwfl('zyhbwflsel', '${record.zyhbwfl }','${record.bwyt }');
+		});
+		function jyrSel(jyrid){
+			guanbipop();
+			$.post($.app + "/gkjyr/findById", {
+				id:jyrid
+		    }, function(data) {
+		    	//返回的是经营人实体,你可以在回掉中,进行任何其他字段的默认填写
+		    	$('#jyrid').val(data.id);
+		    	$('#jyrmc').val(data.gkjyr);
+		    	$('#xmfr').val(data.fddbr);
+		    	jsjdbgds.detail.szd =data.szd.id;
+				jsjdbgds.detail.gq =data.szgq.id;
+				jsjdbgds.detail.gk =data.szgk.id;
+				initgkSelect('gksel',jsjdbgds.detail.gk,$('.szdselectpicker').val(),'showgq','80%');
+				initgqSelect('gqsel',jsjdbgds.detail.gq,$('.szdselectpicker').val(),$('.gkselectpicker').val(),$('.gkselectpicker').val(),null,'100%');
+		    }, "json");
+		}
+		
+		function showgk(){
+			initgkSelect('gksel','${record.szgk }',$('.szdselectpicker').val(),"showgq",'80%');
+			showgq();
+		}
+
+		function showgq(){
+			initgqSelect('gqsel','${record.szgq }',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
+		}
+		
+		function guanbipop(){
+			$('.theme-popover-mask').fadeOut(100);
+			$('.theme-popover').slideUp(0);
+		}
+		function ytsel(){
+			jsjdbgds.detail.initZyhbwfl('zyhbwflsel', '',$('.bwytselectpicker').val()+"");
+		}
+	</script>
+
+</head>
+
+<body>
+<jsp:include page="../../showRy.jsp"></jsp:include>
+	<div class="box" >
+		<div class="box-content" >
+			<div class="apply_fill">
+ <form  id="addform" method="post" enctype="multipart/form-data"> 		
+ <input type="hidden" name="id" value="${record.id }">		
+<input type="hidden" name="xmid" value="${record.xmid }">	
+<input type="hidden" id="userids"	name="userids"/>	
+ <input type="hidden" class="form-control"  name="roleCode" id="roleCode" value="${roleCode }">
+ <input type="hidden" name="fjids" id="fjids">	
+					<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+							<th><span class="needwrite">*</span>项目编码:&nbsp;</th>
+							<td >
+								<input type="text"  class="form-control" name="xmbm" readonly="readonly" 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>项目概况:&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 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 }">
+							</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>
+						
+					    	<th><span class="needwrite">*</span>所在港区:&nbsp;</th>
+							<td >
+								<span id="gqsel">
+								</span>
+							</td>
+						</tr>
+						<tr>
+						    <th><span class="needwrite">*</span>项目类型:&nbsp;</th>
+							<td >
+								<span id="xmlxsel">
+								</span>
+							</td>
+							<th><span class="needwrite">*</span>建设地址:&nbsp;</th>
+							<td >
+								<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="ztz" value="${record.ztz }">
+							</td>
+							<th>投资类型:&nbsp;</th>
+							<td>
+								<span id="tzlxsel">
+								</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>
+							<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"  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>
+						
+						<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  colspan="3">
+								<div id="sylxsel"></div>
+							</td>
+						   
+						</tr>
+				
+					</table>
+					
+
+					<div  id="buttons">
+					
+					
+                    	<a class="btn btn-default btn-sm" href="#" onclick="jsjdbgds.detail.save()">
+							   <i class="glyphicon glyphicon-floppy-disk"></i> 
+							            保存</a>
+							  <a class="btn btn-default btn-sm" href="#" onclick="jsjdbgds.detail.submit()">
+							   <i class="glyphicon glyphicon-share"></i> 
+							            提交</a>
+						
+						
+							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.detail.back()">
+							   <i class="glyphicon glyphicon-arrow-left"></i> 
+							            返回</a>
+					</div>		              
+	</form>							            
+          			</div>
+			
+			</div>
+		</div>
+	
+</body>
+
+</html>

+ 180 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsmain.jsp

@@ -0,0 +1,180 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>江苏省港口建设与经营管理信息系统</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <%@ include file="../../common.jsp"%>
+	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jsjdbg/jsjdbgdsmain.js"></script>
+	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jsjdbg/jsjdbgdsdetail.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			jsjdbgds.main.init();
+			initXmhzjbSelect('xmhzjbsel','${xmhzjbid }','80%');
+			initszdSelect('szdsel','${szd }', 'showgk', '80%');
+			initgkSelect('gksel','${szgk }','${szd }','showgq','80%');
+			initgqSelect('gqsel','${szgq }','${szd }','${szgk }',null,'80%');
+			jsjdbgds.main.initSfyzjbzsel('sfyzjbz','${sfyzjbz}','80%');
+			iFrameHeightIframe('${menuid}');//自适应高度
+		});
+		
+		function showgk(){
+			initgkSelect('gksel','${szgk }',$('.szdselectpicker').val(),"showgq",'80%');
+			showgq();
+		}
+
+		function showgq(){
+			initgqSelect('gqsel','${szgq }',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
+		}
+	</script>
+</head>
+
+<body>
+	<div class="box" >
+		<div class="box-content" >
+<form action="${app }/jsjdbgds/main" id="jsjdbgdsform" method="post"> 
+<input type="hidden" name="menuid" value="${menuid }">		
+
+			<div >
+				<table class="search_table" cellpadding="0" cellspacing="0">
+				    <tr>
+							<th width="12%"></th>
+						<th width="22%"></th>	
+						<th width="11%"></th>
+						<th width="22%"></th>
+						<th width="11%"></th>
+						<th width="22%"></th>
+					</tr>
+                    <tr>
+                        <td class="right">
+                         	项目名称:&nbsp;
+                         </td>
+                        <td >
+	                        	<input type="text" class="form-control" name="xmmc"  value="${xmmc }">
+                        </td>
+                   
+                        <td class="right">
+                         	项目法人:&nbsp;
+                        </td>
+                        <td>
+	                        	<input type="text" class="form-control" name="xmfr"  value="${xmfr }">
+                        </td>
+                        <td class="right">
+                         	项目核准级别:&nbsp;
+                        </td>
+						<td>
+			            	<span id="xmhzjbsel">
+							</span>
+			            </td>
+                        
+                     </tr>
+                     <tr>
+                        <td class="right">
+                         	所在地:&nbsp;
+                        </td>
+						<td>
+			            	<span id="szdsel">
+							</span>
+			            </td>
+                        <td class="right">
+                         	所在港口:&nbsp;
+                        </td>
+						<td>
+			            	<span id="gksel">
+							</span>
+			            </td>
+			            <td class="right">
+                         	所在港区:&nbsp;
+                        </td>
+						<td>
+			            	<span id="gqsel">
+							</span>
+			            </td>
+                       
+                    </tr>
+                    <tr>
+                   		<td class="right"></td>
+						<td>
+						</td>
+							<td class="right"></td>
+							<td></td>
+                     <td class="right" colspan="2">
+                         			 <a class="btn btn-default btn-sm" href="#" onclick="jsjdbgds.main.search()">
+							   <i class="glyphicon glyphicon-search"></i> 
+							            查询</a>
+							         <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.main.add()">
+							   <i class="glyphicon glyphicon-plus"></i> 
+							            新增</a>
+                     </td>
+                         
+                    </tr>
+				</table>
+			</div>
+			<!-- 列表 -->
+			<div  style="background-color:#f4f4f4;">
+				<table class="main_table" cellpadding="0" cellspacing="0">
+					<tr>
+						<th width="4%">序号</th>	
+						<th width="10%">项目名称</th>
+						<th width="10%">所在港口</th>
+						<th width="10%">所在港区</th>
+						<th width="10%">项目法人</th>
+						<th width="10%">项目类型</th>
+						<th width="10%">流程状态</th>	
+						<th width="1%" class="operatetd">操作</th>
+					</tr>
+					 <c:forEach items="${list}" var="jsjdbgds" varStatus="status">
+						<tr class="tr_bg">
+							<td>${status.index+1 }</td>
+							<td>${jsjdbgds.xmmc }</td>
+							<td>${jsjdbgds.szgkzw }</td>
+							<td>${jsjdbgds.szgqzw }</td>
+							<td>${jsjdbgds.xmfr }</td>
+						    <td>${jsjdbgds.xmlxzw }</td>
+						    <td>${jsjdbgds.currentname }</td>
+							<td class="operatetd">
+								<a class="btn btn-default btn-xs" href="#" onclick="jsjdbgds.main.view('${jsjdbgds.id}')" title="查看">
+							            <i class="glyphicon glyphicon-search"></i> 
+							            </a>
+							             <c:if test="${jsjdbgds.recordStatus == 1 }">
+								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbgds.main.edit('${jsjdbgds.id}')" title="编辑">
+									   <i class="glyphicon glyphicon-pencil"></i> 
+									          </a>
+									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdbgds.main.del('${jsjdbgds.id}')" title="删除">
+									   <i class="glyphicon glyphicon-trash"></i> 
+									        </a>
+									         </c:if>
+									<c:if test="${ jsjdbgds.recordStatus  > 1 }">
+									<a class="btn btn-default btn-xs" href="#"
+									onclick="hisList('${jsjdbgds.id}','jsjdbgds')" title="流程历史"> <i
+										class="glyphicon glyphicon-retweet"></i>
+									</a>
+								</c:if>
+					        
+							 <c:if test="${jsjdbgds.taskState =='Y'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbgds.main.banli('${jsjdbgds.id}')" title="办理">
+									   <i class="glyphicon glyphicon-check"></i> 
+									          </a>
+							 </c:if>
+							  <c:if test="${jsjdbgds.taskState =='TH'}">
+							 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbgds.main.back('${jsjdbgds.id}')" title="办理">
+									   <i class="glyphicon glyphicon-check"></i> 
+									          </a>
+							 </c:if>
+							</td>
+						</tr>
+					</c:forEach>
+				</table>
+			</div>
+			<!-- 分页 -->
+			<jsp:include page="../../pageinfo.jsp"></jsp:include>
+			</form>	
+		</div>
+	<jsp:include page="../../showHistory.jsp"></jsp:include>
+	</div>
+</body>
+</html>

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

@@ -0,0 +1,301 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>江苏省港口建设与经营管理信息系统</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <%@ include file="../../common.jsp"%>
+	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jsjdbg/jsjdbgdsdetail.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			jsjdbgds.detail.opflag="${opflag}"
+			jsjdbgds.detail.taskKey="${taskKey}";
+			jsjdbgds.detail.hqflag ="${hqflag}";
+			jsjdbgds.detail.init();
+			$('.close').click(function(){
+				guanbi();
+			})
+				if('${record.tzlx }' == "1903") {
+				$("#zftzDiv").css("display","table-row");
+				var ztz = '${record.ztz}';
+				var zftze = '${record.zftze}';
+				if(isEmpty(ztz) || isEmpty(zftze)) {
+					return;
+				}
+				if(isFDS(ztz) && isFDS(zftze)) {
+					var rate = (zftze/ztz)*100;
+					$("#zftzTd").html(rate.toFixed(2));
+				}
+			} else {
+				$("#zftzDiv").css("display","none");
+			}
+		});
+		
+		function tanchu(){
+			//此处可以先进行ajax请求获取数据,然后再回掉中再显示弹出框
+			$('.theme-popover-mask').fadeIn(100);
+			$('.theme-popover').slideDown(0);
+		}
+		function guanbi(){
+			$('.theme-popover-mask').fadeOut(100);
+			$('.theme-popover').slideUp(0);
+		}
+		
+		function showRy(){
+			$('#selectrydiv').fadeIn(100);
+       		$('#selectry2div').slideDown(0);
+		}
+		
+		function showYj(){
+			$('#selectyjdiv').fadeIn(100);
+       		$('#selectyj2div').slideDown(0);
+		}
+	</script>
+
+</head>
+
+<body>
+	<div class="box" >
+		<div class="box-content" >
+			<div class="apply_fill">
+ <form  id="addform" method="post" enctype="multipart/form-data"> 	
+ <input type="hidden" id="userids"	name="userids"/>
+  <input type="hidden" id="yj"	name="yj"/>
+  <input type="hidden" id="accids" name="accids"/>
+  <input type="hidden" id="roleKey" name="roleKey" value="" />
+   <input	type="hidden" id="yj" name="yj" /> 
+					<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+							<th>项目编码:&nbsp;</th>
+							<td>
+								${record.xmbm }
+							</td>
+							<th>项目名称:&nbsp;</th>
+							<td >
+								${record.xmmc }
+							</td>
+						</tr>
+						<tr>
+							 <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>
+						    <th>所在港区:&nbsp;</th>
+							<td >
+								${record.szgqzw }
+							</td>
+							
+						</tr>
+						<tr>
+						    <th>项目类型:&nbsp;</th>
+							<td >
+								${record.xmlxzw }
+							</td>
+							<th>建设地址:&nbsp;</th>
+							<td >
+								${record.jsdd }
+							</td>
+						</tr>
+						
+						<tr>
+					    	<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>
+							<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.sylxzw }
+							</td>
+						   
+						</tr>
+						</table>
+							 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a href="#" onclick="jsjdbgds.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>			
+						
+						<table class="apply" cellpadding="0" cellspacing="0">
+                       <tr>
+                       		<th>专家评审附件:&nbsp;</th>
+                       		<td colspan="3">
+                       		
+                       		 <c:if test="${ taskKey == 'zjps'  }"> 
+	                        	<a href="#" class="file">上传<input type="file" name="file" id="fjid" onchange="jsjdbgds.detail.submitFile()"/></a>
+	                         </c:if> 
+		                       		 
+							<table  id="tableId" style="width: 100%">
+								<tr align="center">
+								<td style="width:40%;text-align: center;">上传附件名称</td>
+								   <c:if test="${ taskKey == 'zjps'  }"> 
+								<td style="width:15%;text-align: center;">操作</td>
+								</c:if>
+								</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>
+								  <c:if test="${ taskKey == 'zjps'  }"> 
+								<td><a class="btn btn-default btn-xs" href="#" onclick="jsjdbgds.detail.delFj('${fj.id}',this)">删除</a></td>
+								</c:if>
+								</tr>
+								</c:forEach>
+                       		</table>
+                       		</td>
+                       </tr>
+                       
+                       <c:forEach items="${list}" var="list" begin="1" varStatus="status">
+                       <tr>
+                       <th> ${list.currName }:&nbsp;</th>
+                       
+                       		<td colspan="3">${list.yj }</td>
+                      
+                       </tr>
+                       </c:forEach>
+					</table>
+</form>
+
+					<div  id="buttons">
+					
+				
+					<c:if test="${flag=='audit' }">
+						<c:if test="${roleCode != 'Y' && hqflag == true }">
+							<a class="btn btn-default btn-sm" href="#" onclick="showRy()">
+								<i class="glyphicon glyphicon-check"></i> 选择人员
+							</a>
+						</c:if>
+					<a class="btn btn-default btn-sm" href="#"  onclick="showYj()">
+							   <i class="glyphicon glyphicon-check"></i> 
+							            意见</a>
+							          
+					 <a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.detail.saveTbzt('${record.id}')">
+												   <i class="glyphicon glyphicon-ok-sign"></i> 
+												    转报省级</a>
+					<c:if test="${record.flowstatus != '0' }"> 
+					 <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.detail.audit('Y','${record.id}')">
+							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							            同意</a>
+							 </c:if>
+						<a class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.detail.audit('N','${record.id}')">
+							   <i class="glyphicon glyphicon-ban-circle"></i> 
+							            退回</a>
+				          
+					</c:if>
+					
+							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbgds.detail.back()">
+							   <i class="glyphicon glyphicon-arrow-left"></i> 
+							            返回</a>
+							           
+          			</div>
+			
+			</div>
+		</div>
+</div>
+<jsp:include page="../../showRy.jsp"></jsp:include>
+<jsp:include page="../../showViewOption.jsp"></jsp:include>
+<jsp:include page="../../showbwview.jsp"></jsp:include>
+</body>
+
+</html>

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

@@ -68,12 +68,16 @@
 </head>
 
 <body>
-<jsp:include page="../../jyrselect.jsp"></jsp:include>
+<jsp:include page="../../showRy.jsp"></jsp:include>
+<jsp:include page="../../showbwview.jsp"></jsp:include>
 	<div class="box" >
 		<div class="box-content" >
 			<div class="apply_fill">
  <form  id="addform" method="post" enctype="multipart/form-data"> 		
  <input type="hidden" name="id" value="${record.id }">		
+<input type="hidden" name="xmid" value="${record.xmid }">	
+<input type="hidden" id="userids"	name="userids"/>	
+ <input type="hidden" class="form-control"  name="roleCode" id="roleCode" value="${roleCode }">
  <input type="hidden" name="fjids" id="fjids">	
 					<table class="apply" cellpadding="0" cellspacing="0">
 					<tr>
@@ -204,35 +208,73 @@
 						
 							<tr>
 							<th>水域类型:&nbsp;</th>
-							<td  colspan="3">
+							<td>
 								<div id="sylxsel"></div>
 							</td>
 						   
 						</tr>
 				
 					</table>
-					
+						 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a href="#" onclick="jsjdbg.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>			
 
 					<div  id="buttons">
-                    	<a class="btn btn-default btn-sm" href="#" onclick="jsjdbg.detail.save()">
-							   <i class="glyphicon glyphicon-floppy-disk"></i> 
-							            保存</a>
+					
+					<c:if test="${ssFlag ==0 }">
+					 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
+							   <i class="glyphicon glyphicon-check"></i> 
+							            选择人员</a>
 							            
-							<c:if test="${flag == '' || flag == null}">
+							            <c:if test="${flag == '' || flag == null}">
   
 					      <a class="btn btn-default btn-sm" href="#" onclick="jsjdbg.detail.submit()">
 							   <i class="glyphicon glyphicon-share"></i> 
 							            提交</a>
 						</c:if>
 						<c:if test="${flag=='th'}">
-						<a class="btn btn-default btn-sm" href="#"  onclick="jsjdbg.detail.submitAudit()">
+						<a class="btn btn-default btn-sm" href="#"  onclick="jsjdbg.detail.submit()">
 						   <i class="glyphicon glyphicon-share"></i> 
 						            提交</a>
-						</c:if>     
-						
-						<a class="btn btn-default btn-sm" href="#"  onclick="jsjdbg.detail.audit('N','${record.id}')">
+						            
+						            <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbg.detail.audit('N','${record.id}')">
 							   <i class="glyphicon glyphicon-ban-circle"></i> 
 							            退回</a>
+						</c:if>     
+					</c:if>
+					<c:if test="${ssFlag ==1 }">
+                    	<a class="btn btn-default btn-sm" href="#" onclick="jsjdbg.detail.save()">
+							   <i class="glyphicon glyphicon-floppy-disk"></i> 
+							            保存</a>
+						</c:if>	            
+							
+						
+						
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdbg.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>

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

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

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

@@ -14,6 +14,7 @@
 		$(document).ready(function () {
 			jsjdbg.detail.opflag="${opflag}"
 			jsjdbg.detail.taskKey="${taskKey}";
+			jsjdbg.detail.hqflag ="${hqflag}";
 			jsjdbg.detail.init();
 			$('.close').click(function(){
 				guanbi();
@@ -65,7 +66,9 @@
  <input type="hidden" id="userids"	name="userids"/>
   <input type="hidden" id="yj"	name="yj"/>
   <input type="hidden" id="accids" name="accids"/>
-					<table class="apply" cellpadding="0" cellspacing="0">
+  <input type="hidden" id="roleKey" name="roleKey" value="" />
+   <input	type="hidden" id="yj" name="yj" /> 
+					<table class="apply3" cellpadding="0" cellspacing="0">
 					<tr>
 							<th>项目编码:&nbsp;</th>
 							<td>
@@ -180,13 +183,44 @@
 						</tr>
                          <tr>
 							<th>水域类型:&nbsp;</th>
-							<td colspan="3">
+							<td>
 								${record.sylxzw }
 							</td>
 						   
 						</tr>
+					</table>
+						 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a href="#" onclick="jsjdbg.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>			
+							<table class="apply3" cellpadding="0" cellspacing="0">
+							
                        <tr>
-                       		<th>专家评审附件:&nbsp;</th>
+                       		<th width="21.5%">专家评审附件:&nbsp;</th>
                        		<td colspan="3">
                        		
                        		 <c:if test="${ taskKey == 'zjps'  }"> 
@@ -225,14 +259,13 @@
 
 					<div  id="buttons">
 					
-					<c:if test="${opflag == 5 || opflag == 9}">
 				
-					 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
-							   <i class="glyphicon glyphicon-check"></i> 
-							            选择科室人员</a>
-					</c:if>
 					<c:if test="${flag=='audit' }">
-					
+						<c:if test="${roleCode != 'Y' && hqflag == true }">
+							<a class="btn btn-default btn-sm" href="#" onclick="showRy()">
+								<i class="glyphicon glyphicon-check"></i> 选择人员
+							</a>
+						</c:if>
 					<a class="btn btn-default btn-sm" href="#"  onclick="showYj()">
 							   <i class="glyphicon glyphicon-check"></i> 
 							            意见</a>
@@ -257,6 +290,7 @@
 </div>
 <jsp:include page="../../showRy.jsp"></jsp:include>
 <jsp:include page="../../showViewOption.jsp"></jsp:include>
+<jsp:include page="../../showbwview.jsp"></jsp:include>
 </body>
 
 </html>

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

@@ -71,6 +71,7 @@
 <body>
 <jsp:include page="../../jyrselect.jsp"></jsp:include>
 <jsp:include page="../../showRy.jsp"></jsp:include>
+<jsp:include page="../../showbwview.jsp"></jsp:include>
 	<div class="box" >
 		<div class="box-content" >
 			<div class="apply_fill">
@@ -94,30 +95,30 @@
 						<tr>
 							<th>项目概况:&nbsp;</th>
 							<td colspan="3">
-								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
+								<input type="text" style="width: 92.5%;" readonly 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 }">
+								<input type="text"  style="width: 92.5%;" readonly 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 }">
+								<input type="text" readonly 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="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 }">
+								<%-- <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> 
+								</c:if>  --%>
 							</td>
 						</tr>
 						<tr>
@@ -152,13 +153,13 @@
 							</td>
 							<th><span class="needwrite">*</span>建设地址:&nbsp;</th>
 							<td >
-								<input type="text" class="form-control" name="jsdd" value="${record.jsdd }">
+								<input type="text" class="form-control" readonly name="jsdd" value="${record.jsdd }">
 							</td>
 						</tr>
 						<tr>
 					    	 <th>总投资(万元):&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="ztz" value="${record.ztz }">
+								<input type="text" class="form-control" readonly name="ztz" value="${record.ztz }">
 							</td>
 							<th>投资类型:&nbsp;</th>
 							<td>
@@ -218,6 +219,36 @@
 							</td>
 						    
 						</tr>
+					</table>
+					 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a href="#" onclick="jsjdcbsj.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>			
+					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 				<tr>
 							<th>地市附件与专家评审附件:&nbsp;</th>
 							<td colspan="3">
@@ -288,6 +319,9 @@
 								</table>
 							</td>
 						</tr>
+						
+					
+					
 						<c:forEach items="${list}" var="list" begin="1" varStatus="status">
 							<tr>
 								<th>${list.currName }:&nbsp;</th>
@@ -304,29 +338,25 @@
 					 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
 							   <i class="glyphicon glyphicon-check"></i> 
 							            选择人员</a>
-					</c:if>
-                    	<a class="btn btn-default btn-sm" href="#" onclick="jsjdcbsj.detail.save()">
-							   <i class="glyphicon glyphicon-floppy-disk"></i> 
-							            保存</a>
-					<c:if test="${ssFlag ==0 }">            
-							<c:if test="${flag == '' || flag == null}">
+					
   
 					      <a class="btn btn-default btn-sm" href="#" onclick="jsjdcbsj.detail.submit()">
 							   <i class="glyphicon glyphicon-share"></i> 
 							            提交</a>
-						</c:if>
-					
-						<c:if test="${flag=='th'}">
-						<a class="btn btn-default btn-sm" href="#"  onclick="jsjdcbsj.detail.submitAudit()">
-						   <i class="glyphicon glyphicon-share"></i> 
-						            提交</a>
+						
+				
 						
 					
 						<a class="btn btn-default btn-sm" href="#"  onclick="jsjdcbsj.detail.audit('N','${record.id}')">
 							   <i class="glyphicon glyphicon-ban-circle"></i> 
 							            退回</a>
-							</c:if>		
-							</c:if>            
+								
+							</c:if> 
+						<c:if test="${ssFlag ==1 }">   
+						<a class="btn btn-default btn-sm" href="#" onclick="jsjdcbsj.detail.save()">
+							   <i class="glyphicon glyphicon-floppy-disk"></i> 
+							            保存</a>        
+							      </c:if>
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdcbsj.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>

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

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

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

@@ -181,13 +181,44 @@
 							<th>岸线长度 (米):&nbsp;</th>
 							<td>${record.axcd }</td>
 						</tr>
-						
-						
 						<tr>
 							<th>水域类型:&nbsp;</th>
 							<td>${record.sylxzw }</td>
 							
 						</tr>
+					</table>
+						
+					 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a href="#" onclick="jsjdcbsj.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>		
+							
+					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
+					
 						<tr>
 							<th>地市附件与专家评审附件:&nbsp;</th>
 							<td colspan="3">
@@ -467,6 +498,7 @@
 	</div>
 	<jsp:include page="../../showRy.jsp"></jsp:include>
 	<jsp:include page="../../showViewOption.jsp"></jsp:include>
+	<jsp:include page="../../showbwview.jsp"></jsp:include>
 	</form>
 </body>
 

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

@@ -69,7 +69,7 @@ text-align:center;
 }
 </style>
 </head>
-
+<jsp:include page="../../showbwview.jsp"></jsp:include>
 <body>
 	<div class="box">
 		<div class="box-content" >
@@ -78,7 +78,7 @@ text-align:center;
  <input type="hidden" class="form-control"  name="fjzdids" id="fjzdids">
  <input type="hidden" class="form-control"  name="accids" id="accids">
  <input type="hidden" class="form-control"  name="id" id="id" value="${record.id }">
-					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
+					<table class="apply" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th>项目编码:&nbsp;</th>
 							<td >
@@ -94,13 +94,13 @@ text-align:center;
 						
 							<th>项目概况:&nbsp;</th>
 							<td colspan="3">
-								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
+								<input type="text" style="width: 92%;" 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 }">
+								<input type="text" style="width: 92%;" class="form-control" name="jsgm" value="${record.jsgm }">
 							</td>
 						</tr>
 						<tr>
@@ -111,7 +111,7 @@ text-align:center;
 							<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 }">
+								<input type="text"  readonly class="form-control" id="jyrmc" value="${jyr.gkjyr }">
 							</td>
 						</tr>
 						
@@ -174,7 +174,7 @@ text-align:center;
 							</td>
 							 <th>泊位个数:&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="bwgs" value="" readonly="readonly">
+								<input type="text" class="form-control" name="bwgs" value="${bwgs }" readonly="readonly">
 							</td>
 						</tr>
 						<tr>
@@ -210,6 +210,35 @@ text-align:center;
 						</tr>
 					
 					</table>
+						 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a onclick="jsjdgl.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>
+				    <br/>
 <ul id="myTab" class="nav nav-tabs">
    <li class="active" style="width:12%;font-size:14px">
       <a href="#axlysp" data-toggle="tab">

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

@@ -199,7 +199,7 @@
 	</script>
 
 </head>
-
+<jsp:include page="../../showbwview.jsp"></jsp:include>
 <body>
 	<div class="box" >
 		<div class="box-content" >
@@ -344,7 +344,34 @@
 						</tr>
 						
 					</table>
-					
+						 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a onclick="jsjdgl.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>	
 <ul id="myTab" class="nav nav-tabs">
 
    <li  style="width:11%;font-size:14px;text-align:center" id="axlyspli">

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

@@ -77,7 +77,7 @@
 	</script>
 
 </head>
-
+<jsp:include page="../../showbwview.jsp"></jsp:include>
 <body>
 <form  id="addform" method="post" enctype="multipart/form-data"> 
 	<div class="box" >
@@ -85,6 +85,7 @@
 			<div class="apply_fill">
  
  		 <input type="hidden" class="form-control" id="id" value="${record.id }">
+ 		  <input type="hidden" class="form-control" id="spflag" value="${spflag }">
  		 <input type="hidden" class="form-control" id="opflag" value="${opflag }">
  		 <input type="hidden" class="form-control" id="xiazaibz" value="${xiazaibz }">
  		 <input type="hidden" id="fhbz"  value="${fhbz }">
@@ -210,29 +211,36 @@
 							</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>
 					
+					</table>
+					 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a href="#" onclick="jsjdgl.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>		
 <ul id="myTab" class="nav nav-tabs">
    <li style="width:11%;font-size:14px;text-align:center;" id="axlyspli">
       <a href="#axlysp" data-toggle="tab" onclick ="jsjdgl.detail.viewshow(1)">

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

@@ -80,7 +80,7 @@ text-align:center;
 }
 </style>
 </head>
-
+<jsp:include page="../../showbwview.jsp"></jsp:include>
 <body>
 	<div class="box" >
 		<div class="box-content" >
@@ -219,6 +219,34 @@ text-align:center;
 							</td>
 						</tr>
 					</table>
+					 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
+				     <thead>
+					    <tr>
+					    	<th width="5%">序号</th>
+			    			<th width="10%">泊位名称</th>
+			        		<th width="10%">港口经营人</th>
+							<th width="10%">码头名称</th>
+							<th width="10%">所在港口</th>
+							<th width="10%">所在港区</th>
+							<th width="15%">泊位用途</th>
+							<th width="5%">是否<br>危险品泊位</th>
+							<th width="5%">是否<br>对外开放泊位</th>
+					    </tr>
+				    </thead>
+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">
+					    <tr >
+					    	<td >${status.count }</td>
+							<td ><a href="#" onclick="jsjdgl.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>
+					        <td >${bw.ssjyrzw }</td>
+							<td >${bw.ssmtzw }</td>
+							<td >${bw.szgkzw }</td>
+							<td >${bw.szgqzw }</td>
+							<td >${bw.bwytzw }</td>
+							<td >${bw.wxpbwzw }</td>
+							<td >${bw.sfdwkfzw }</td>
+					    </tr>
+				    </c:forEach>
+				    </table>		
 <ul id="myTab" class="nav nav-tabs">
    <li class="active" style="width:12%;font-size:14px">
       <a href="#axlysp" data-toggle="tab">

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

@@ -120,13 +120,13 @@
 						<tr>
 							<th>项目概况:&nbsp;</th>
 							<td colspan="3">
-								<input type="text" class="form-control" name="xmgk">
+								<input type="text" style="width: 92%;" class="form-control" name="xmgk">
 							</td>
 						</tr>
 						<tr>
 						 	<th>建设规模:&nbsp;</th>
 							<td colspan="3">
-								<input type="text" class="form-control" name="jsgm">
+								<input type="text" style="width: 92%;" class="form-control" name="jsgm">
 							</td>
 						</tr>
 						<tr>
@@ -170,12 +170,7 @@
 							</td>
 						
 						</tr>
-						<tr>
-						 <th>所属泊位:&nbsp;</th>
-						 	<td colspan="3">
-								<div id="bwsel"></div>
-							</td>
-						</tr>
+						
 						<tr>
 						    <th><span class="needwrite">*</span>项目类型:&nbsp;</th>
 							<td >
@@ -245,18 +240,15 @@
 							</td>
 						   
 						</tr>
+						<tr>
+						 <th>所属泊位:&nbsp;</th>
+						 	<td colspan="3">
+								<div id="bwsel"></div>
+							</td>
+						</tr>
 					</table>
 				
-					<div  id="buttons">
-                    	<a class="btn btn-default btn-sm" href="#" onclick="xmxxgl.detail.save()">
-							   <i class="glyphicon glyphicon-floppy-disk"></i> 
-							            保存</a>
-							             <a class="btn btn-default btn-sm" href="#"  onclick="xmxxgl.detail.back()">
-							   <i class="glyphicon glyphicon-arrow-left"></i> 
-							           返回</a>
-							            
-          			</div>
-          			<br/>
+				
           			 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
 				     <thead>
 					    <tr>
@@ -272,6 +264,16 @@
 					    </tr>
 				    </thead>
 				    </table>
+				    <br>
+				    	<div  id="buttons">
+                    	<a class="btn btn-default btn-sm" href="#" onclick="xmxxgl.detail.save()">
+							   <i class="glyphicon glyphicon-floppy-disk"></i> 
+							            保存</a>
+							             <a class="btn btn-default btn-sm" href="#"  onclick="xmxxgl.detail.back()">
+							   <i class="glyphicon glyphicon-arrow-left"></i> 
+							           返回</a>
+							            
+          			</div>
 	</form>
 				</div>
 		</div>

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

@@ -91,17 +91,19 @@
 							</td>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td >
-								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc" value="${record.xmmc }">
+								<input type="text"  class="form-control" name="xmmc" value="${record.xmmc }">
 							</td>
 						</tr>
 						<tr>
 							<th>项目概况:&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
+							<td colspan="3">
+								<input type="text"  style="width: 92%;" class="form-control" name="xmgk" value="${record.xmgk }">
 							</td>	
+						</tr>
+						<tr>
 							<th>建设规模:&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
+							<td colspan="3">
+								<input type="text" style="width: 92%;" class="form-control" name="jsgm" value="${record.jsgm }">
 							</td>
 						</tr>
 						<tr>
@@ -111,7 +113,7 @@
 							</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="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="#"
@@ -146,12 +148,6 @@
 							</td>
 						</tr>
 						<tr>
-						 <th>所属泊位:&nbsp;</th>
-						 	<td colspan="3">
-								<div id="bwsel"></div>
-							</td>
-						</tr>
-						<tr>
 						    <th><span class="needwrite">*</span>项目类型:&nbsp;</th>
 							<td >
 								<span id="xmlxsel">
@@ -226,20 +222,17 @@
 							</td>
 						   
 						</tr>
-						
+						<tr>
+						 <th>所属泊位:&nbsp;</th>
+						 	<td colspan="3">
+								<div id="bwsel"></div>
+							</td>
+						</tr>
 				
 					</table>
 					
 
-					<div  id="buttons">
-                    	<a class="btn btn-default btn-sm" href="#" onclick="xmxxgl.detail.save()">
-							   <i class="glyphicon glyphicon-floppy-disk"></i> 
-							            保存</a>
-							             <a class="btn btn-default btn-sm" href="#"  onclick="xmxxgl.detail.back()">
-							   <i class="glyphicon glyphicon-arrow-left"></i> 
-							            返回</a>
-					</div>		 
-					<br/>
+					 
           			 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
 				     <thead>
 					    <tr>
@@ -254,8 +247,17 @@
 							<th width="5%">是否<br>对外开放泊位</th>
 					    </tr>
 				    </thead>
-				    </table>             
-	</form>							            
+				    </table>
+	</form>
+	<br/>
+	<div  id="buttons">
+                    	<a class="btn btn-default btn-sm" href="#" onclick="xmxxgl.detail.save()">
+							   <i class="glyphicon glyphicon-floppy-disk"></i> 
+							            保存</a>
+							             <a class="btn btn-default btn-sm" href="#"  onclick="xmxxgl.detail.back()">
+							   <i class="glyphicon glyphicon-arrow-left"></i> 
+							            返回</a>
+					</div>									            
           			</div>
 			
 			</div>

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

@@ -104,12 +104,6 @@
 							
 						</tr>
 						<tr>
-						 <th>所属泊位:&nbsp;</th>
-						 	<td colspan="3">
-								${record.bwidszw }
-							</td>
-						</tr>
-						<tr>
 						    <th>项目类型:&nbsp;</th>
 							<td >
 								${record.xmlxzw }
@@ -175,16 +169,15 @@
 							</td>
 						    
 						</tr>
+						<tr>
+						 <th>所属泊位:&nbsp;</th>
+						 	<td colspan="3">
+								${record.bwidszw }
+							</td>
+						</tr>
 					</table>
 </form>
 
-					<div  id="buttons">
-							             <a class="btn btn-default btn-sm" href="#"  onclick="xmxxgl.detail.back()">
-							   <i class="glyphicon glyphicon-arrow-left"></i> 
-							            返回</a>
-							           
-          			</div>
-				<br/>
           			 <table id="bwtableID" class="main_table" cellpadding="0" cellspacing="0">
 				     <thead>
 					    <tr>
@@ -213,6 +206,14 @@
 					    </tr>
 				    </c:forEach>
 				    </table>
+				    <br/>
+					<div  id="buttons">
+							             <a class="btn btn-default btn-sm" href="#"  onclick="xmxxgl.detail.back()">
+							   <i class="glyphicon glyphicon-arrow-left"></i> 
+							            返回</a>
+							           
+          			</div>
+				
 			</div>
 		</div>
 </div>

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

@@ -283,7 +283,7 @@
 							<input type="hidden" id="zxjxids" name="zxjxids" value=""/>
 							<input type="hidden" id="jydyids" name="jydyids"> 
 							<input type="hidden" id="flag" name="flag" value="">
-							<table class="apply3" cellpadding="0" cellspacing="0">
+							<table class="apply" cellpadding="0" cellspacing="0">
 								<tr>
 									<th><span class="needwrite">*</span>港口经营人名称:&nbsp;</th>
 									<td colspan="3" style="position: relative;">

+ 6 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdgldetail.js

@@ -7,6 +7,12 @@ jsjdgl.detail.xiugaiflag=null;
 jsjdgl.detail.init=function(){
 }
 
+jsjdgl.detail.viewBw=function(id){
+	$('#selectbwdiv').fadeIn(100);
+	$('#selectbw2div').slideDown(0);
+	showBw(id);
+}
+
 jsjdgl.detail.back=function(){
 	if(jsjdgl.detail.path!=null&&jsjdgl.detail.path!=''){
 		var type=jsjdgl.detail.type;

+ 1 - 1
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/xmxxgl/xmxxgldetail.js

@@ -472,7 +472,7 @@ function selbw(){
 	  			var bw = data[i];
 	  			var str = "<tr>";
 	  			str+="<td>"+(i+1)+"</td>";
-	  			str +="<td ><a onclick=\"xmxxgl.detail.viewBw(\'"+bw.id+"\')\">"+bw.bwmc+"</td>";
+	  			str +="<td ><a href='#' onclick=\"xmxxgl.detail.viewBw(\'"+bw.id+"\')\">"+bw.bwmc+"</td>";
 	  			str +="<td >"+bw.ssjyrzw+"</td>";
 	  			str +="<td >"+bw.ssmtzw+"</td>";
 	  			str +="<td >"+bw.szgkzw+"</td>";

+ 4 - 3
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgdetail.js

@@ -302,7 +302,7 @@ lhbg.detail.audit=function(auditpass,id){
 			return false;
 		}
 	}
-	
+	$(".btn").attr("disabled", true);
 	
 	var shyj = $('#yj').val();
 	var opflag = $('#opflag').val();
@@ -334,7 +334,7 @@ lhbg.detail.audit=function(auditpass,id){
        		    title: '提示',
        		    content: data.message,
        		    confirm: function(){
-       		    	
+       		    	$(".btn").attr("disabled", false);
        		    }
            	});
        }
@@ -354,6 +354,7 @@ lhbg.detail.submitAudit=function(){
 		});
 		return false;
 	}
+	$(".btn").attr("disabled",true);
 	 $.ajax({
          url:$.app + "/lhbg/submitAudit",
          data:$("#addform").serialize(),
@@ -373,7 +374,7 @@ lhbg.detail.submitAudit=function(){
             		    title: '提示',
             		    content: data.message,
             		    confirm: function(){
-            		    	
+            		    	$(".btn").attr("disabled", false);
             		    }
                 	});
             }