Browse Source

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

ld_xuhx 9 years ago
parent
commit
19e4334a9e
20 changed files with 636 additions and 202 deletions
  1. 31 13
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgadd.jsp
  2. 32 9
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgedit.jsp
  3. 42 10
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgview.jsp
  4. 31 13
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqadd.jsp
  5. 31 8
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp
  6. 42 10
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp
  7. 32 17
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxadd.jsp
  8. 31 8
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxedit.jsp
  9. 43 11
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxview.jsp
  10. 32 14
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgadd.jsp
  11. 30 9
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgedit.jsp
  12. 41 9
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgview.jsp
  13. 36 15
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjadd.jsp
  14. 31 9
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp
  15. 5 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjmain.jsp
  16. 43 13
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjview.jsp
  17. 31 14
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxadd.jsp
  18. 31 10
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxedit.jsp
  19. 40 8
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxview.jsp
  20. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglview.jsp

+ 31 - 13
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgadd.jsp

@@ -23,6 +23,8 @@
 				jgbg.detail.gk ='${gk}';
 				
 			}
+			//水域类型
+			initSylxSelect('sylxsel','1902','80%');
 			//项目类型默认新建
 				initXmlxSelect('xmlxsel','2201','80%');
 			//投资类型默认企业投资
@@ -81,6 +83,12 @@
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
 					<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>
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4">
 								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc">
@@ -149,6 +157,16 @@
 							   <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()">
+							</td>
+							<th>政府投资占比(%):&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" readonly="readonly" id="zftzezb">
+							</td>
+						</tr>
 						<tr>
 						    <th>岸线审批级别:&nbsp;</th>
 							<td >
@@ -160,26 +178,26 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="bwdj">
-							</td>
+						    
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								<input type="text" class="form-control" name="tgnl">
 							</td>
-						</tr>
 						
-						<tr>
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+                        <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="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+							</td>
 						</tr>
 						
 					</table>

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

@@ -19,6 +19,8 @@
 				jgbg.detail.gq ='${jyr.szgq.id}'
 				jgbg.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%');
@@ -75,6 +77,12 @@
  <input type="hidden" name="id" value="${record.id }">		
  <input type="hidden" name="fjids" id="fjids">	
 					<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>
+						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -150,6 +158,16 @@
 								</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>
@@ -161,24 +179,29 @@
 								<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="bwdj" value="${record.bwdj }">
-							</td>
+					<tr>
+					    	
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
-						</tr>
 						
-						<tr>
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+                        <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>
 						
 				
 					</table>

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

@@ -18,6 +18,20 @@
 			$('.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(){
@@ -52,6 +66,11 @@
   <input type="hidden" id="yj"	name="yj"/>
   <input type="hidden" id="accids" name="accids"/>
 					<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+							<th>项目编码:&nbsp;</th>
+							<td colspan="4">
+								${record.xmbm }
+							</td>
 						<tr>
 							<th>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -114,6 +133,14 @@
 								${record.xmhzjbzw }
 							</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 >
@@ -124,25 +151,30 @@
 								${record.axcd }
 							</td>
 						</tr>
-						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								${record.bwdj }
-							</td>
+							<tr>
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								${record.tgnl }
 							</td>
-						</tr>
-						
-						<tr>
+					
 					    	<th>泊位用途:&nbsp;</th>
-                            <td colspan="3">
+                            <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>
                        		<td colspan="3">
                        		

+ 31 - 13
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqadd.jsp

@@ -23,6 +23,8 @@
 				jgsq.detail.gk ='${gk}';
 				
 			}
+			//水域类型
+			initSylxSelect('sylxsel','1902','80%');
 			//项目类型默认新建
 				initXmlxSelect('xmlxsel','2201','80%');
 			//投资类型默认企业投资
@@ -81,6 +83,12 @@
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
 					<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>
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4">
 								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc">
@@ -149,6 +157,16 @@
 							   <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()">
+							</td>
+							<th>政府投资占比(%):&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" readonly="readonly" id="zftzezb">
+							</td>
+						</tr>
 						<tr>
 						    <th>岸线审批级别:&nbsp;</th>
 							<td >
@@ -160,26 +178,26 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="bwdj">
-							</td>
+						   
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								<input type="text" class="form-control" name="tgnl">
 							</td>
-						</tr>
 						
-						<tr>
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+                        <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="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+							</td>
 						</tr>
 						
 					</table>

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

@@ -19,6 +19,8 @@
 				jgsq.detail.gq ='${jyr.szgq.id}'
 				jgsq.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%');
@@ -75,6 +77,12 @@
  <input type="hidden" name="id" value="${record.id }">		
  <input type="hidden" name="fjids" id="fjids">	
 					<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>
+						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -150,6 +158,16 @@
 								</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>
@@ -162,23 +180,28 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>泊位吨级(吨):&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="bwdj" value="${record.bwdj }">
-							</td>
+					    	
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
-						</tr>
 						
-						<tr>
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+                        <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>
 						
 				
 					</table>

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

@@ -18,6 +18,20 @@
 			$('.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(){
@@ -52,6 +66,12 @@
   <input type="hidden" id="yj"	name="yj"/>
   <input type="hidden" id="accids" name="accids"/>
 					<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+							<th>项目编码:&nbsp;</th>
+							<td colspan="4">
+								${record.xmbm }
+							</td>
+						</tr>
 						<tr>
 							<th>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -114,6 +134,14 @@
 								${record.xmhzjbzw }
 							</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 >
@@ -124,25 +152,29 @@
 								${record.axcd }
 							</td>
 						</tr>
-						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								${record.bwdj }
-							</td>
+							<tr>
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								${record.tgnl }
 							</td>
-						</tr>
-						
-						<tr>
+					
 					    	<th>泊位用途:&nbsp;</th>
-                            <td colspan="3">
+                            <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>
                        		<td colspan="3">
                        		

+ 32 - 17
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgzx/jgzxadd.jsp

@@ -23,6 +23,8 @@
 				jgzx.detail.gk ='${gk}';
 				
 			}
+			//水域类型
+			initSylxSelect('sylxsel','1902','80%');
 			//项目类型默认新建
 				initXmlxSelect('xmlxsel','2201','80%');
 			//投资类型默认企业投资
@@ -81,6 +83,12 @@
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
 					<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>
+						</tr>
+						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4">
 								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc">
@@ -149,6 +157,16 @@
 							   <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()">
+							</td>
+							<th>政府投资占比(%):&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" readonly="readonly" id="zftzezb">
+							</td>
+						</tr>
 						<tr>
 						    <th>岸线审批级别:&nbsp;</th>
 							<td >
@@ -160,28 +178,25 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="bwdj">
-							</td>
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								<input type="text" class="form-control" name="tgnl">
 							</td>
-						</tr>
-						
-						<tr>
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
-	                        <span id="bwytsel"></span>
-                        </td>
-                       
-                        <!-- <th>专业化泊位分类:&nbsp;</th>
-                        <td>
-	                        <span id="zyhbwflsel"></span>
-                        </td> -->
+	                        <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>
 				
 					<div  id="buttons">

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

@@ -19,6 +19,8 @@
 				jgzx.detail.gq ='${jyr.szgq.id}'
 				jgzx.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%');
@@ -75,6 +77,12 @@
  <input type="hidden" name="id" value="${record.id }">		
  <input type="hidden" name="fjids" id="fjids">	
 					<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>
+						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -150,6 +158,16 @@
 								</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>
@@ -162,23 +180,28 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>泊位吨级(吨):&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="bwdj" value="${record.bwdj }">
-							</td>
+					    	
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
-						</tr>
 						
-						<tr>
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+                        <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>
 						
 				
 					</table>

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

@@ -18,6 +18,20 @@
 			$('.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(){
@@ -52,6 +66,12 @@
   <input type="hidden" id="yj"	name="yj"/>
   <input type="hidden" id="accids" name="accids"/>
 					<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+							<th>项目编码:&nbsp;</th>
+							<td colspan="4">
+								${record.xmbm }
+							</td>
+						</tr>
 						<tr>
 							<th>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -114,6 +134,14 @@
 								${record.xmhzjbzw }
 							</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 >
@@ -124,25 +152,29 @@
 								${record.axcd }
 							</td>
 						</tr>
-						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								${record.bwdj }
-							</td>
+							<tr>
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								${record.tgnl }
 							</td>
-						</tr>
-						
-						<tr>
-					    	<th>泊位用途:</th>
-                            <td colspan="3">
+					
+					    	<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>专家评审附件</th>
                        		<td colspan="3">
                        		

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

@@ -23,6 +23,8 @@
 				jsjdbg.detail.gk ='${gk}';
 				
 			}
+			//水域类型
+			initSylxSelect('sylxsel','1902','80%');
 			//项目类型默认新建
 				initXmlxSelect('xmlxsel','2201','80%');
 			//投资类型默认企业投资
@@ -80,6 +82,12 @@
  <form  id="addform" method="post" enctype="multipart/form-data"> 			
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
 					<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>
+						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4">
@@ -149,6 +157,16 @@
 							   <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()">
+							</td>
+							<th>政府投资占比(%):&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" readonly="readonly" id="zftzezb">
+							</td>
+						</tr>
 						<tr>
 						    <th>岸线审批级别:&nbsp;</th>
 							<td >
@@ -160,28 +178,28 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="bwdj">
-							</td>
+						  
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								<input type="text" class="form-control" name="tgnl">
 							</td>
-						</tr>
-						
-						<tr>
+					
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+                        <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="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+							</td>
+						</tr>
 					</table>
 				
 					<div  id="buttons">

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

@@ -19,6 +19,7 @@
 				jsjdbg.detail.gq ='${jyr.szgq.id}'
 				jsjdbg.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%');
@@ -75,6 +76,12 @@
  <input type="hidden" name="id" value="${record.id }">		
  <input type="hidden" name="fjids" id="fjids">	
 					<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>
+						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -150,6 +157,16 @@
 								</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>
@@ -162,24 +179,28 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>泊位吨级(吨):&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="bwdj" value="${record.bwdj }">
-							</td>
+						
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
-						</tr>
-						
-						<tr>
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+                        <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>
 				
 					</table>
 					

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

@@ -18,6 +18,20 @@
 			$('.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(){
@@ -52,6 +66,12 @@
   <input type="hidden" id="yj"	name="yj"/>
   <input type="hidden" id="accids" name="accids"/>
 					<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+							<th>项目编码:&nbsp;</th>
+							<td colspan="4">
+								${record.xmbm }
+							</td>
+						</tr>
 						<tr>
 							<th>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -114,6 +134,14 @@
 								${record.xmhzjbzw }
 							</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 >
@@ -125,23 +153,27 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								${record.bwdj }
-							</td>
+						   
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								${record.tgnl }
 							</td>
-						</tr>
 						
-						<tr>
 					    	<th>泊位用途:&nbsp;</th>
-                            <td colspan="3">
+                            <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>
                        		<td colspan="3">

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

@@ -26,7 +26,10 @@
 			}
 			//项目类型默认新建
 				initXmlxSelect('xmlxsel','2201','80%');
+				//水域类型
+				initSylxSelect('sylxsel','1902','80%');
 			//投资类型默认企业投资
+			
 				initTzlxSelect('tzlxsel','1902','80%');
 				initXmhzjbSelect('xmhzjbsel','','80%');
 				initAxspjbSelect('axspjbsel','','80%');
@@ -84,6 +87,12 @@
  <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">
+					<tr>
+							<th><span class="needwrite">*</span>项目编码:&nbsp;</th>
+							<td colspan="4">
+								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm">
+							</td>
+						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4">
@@ -146,13 +155,23 @@
 						<tr>
 						    <th>总投资 (万元):&nbsp;</th>
 							<td>
-								<input type="text" class="form-control" name="ztz">
+								<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 >
+								<input type="text" class="form-control" name="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 >
@@ -164,28 +183,30 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
+						  <!--   <th>泊位吨级 (吨):&nbsp;</th>
 							<td >
 								<input type="text" class="form-control" name="bwdj">
-							</td>
+							</td> -->
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td>
 								<input type="text" class="form-control" name="tgnl">
 							</td>
-						</tr>
-						
-						<tr>
-					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+							   <th>泊位用途:&nbsp;</th>
+                        <td >
 	                        <span id="bwytsel"></span>
-                        </td>
-                       
-                        <!-- <th>专业化泊位分类:&nbsp;</th>
-                        <td>
-	                        <span id="zyhbwflsel"></span>
-                        </td> -->
+	                        </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>
 				
 					<div  id="buttons">

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

@@ -19,6 +19,8 @@
 				jsjdcbsj.detail.gq ='${jyr.szgq.id}'
 				jsjdcbsj.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%');
@@ -77,6 +79,12 @@
  <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">
+					<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>
+						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -152,6 +160,16 @@
 								</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>
@@ -164,24 +182,28 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>泊位吨级(吨):&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="bwdj" value="${record.bwdj }">
-							</td>
+					    	
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
-						</tr>
 						
-						<tr>
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+                        <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>
 				
 					</table>
 					

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

@@ -139,10 +139,14 @@
 						    <td>${jsjdcbsj.xmlxzw }</td>
 						    <td>${jsjdcbsj.currentname }</td>
 							<td class="operatetd">
+								
 								<a class="btn btn-default btn-xs" href="#" onclick="jsjdcbsj.main.view('${jsjdcbsj.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
-							             <c:if test="${jsjdcbsj.recordStatus == 1 }">
+							             <c:if test="${jsjdcbsj.recordStatus == 1 && jsjdcbsj.tbzt == 'N'}">
+							     <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsj.main.submit('${jsjdcbsj.id}')" title="同步">
+						   <i class="glyphicon glyphicon-share"></i> 
+						            </a>
 								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsj.main.edit('${jsjdcbsj.id}')" title="修改">
 									   <i class="glyphicon glyphicon-wrench"></i> 
 									          </a>

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

@@ -18,6 +18,20 @@
 			$('.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(){
@@ -45,6 +59,12 @@
   <input type="hidden" id="yj"	name="yj"/>
   <input type="hidden" id="accids" name="accids"/>
 					<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+							<th>项目编码:&nbsp;</th>
+							<td colspan="4">
+								${record.xmbm }
+							</td>
+						</tr>
 						<tr>
 							<th>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -107,6 +127,14 @@
 								${record.xmhzjbzw }
 							</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 >
@@ -118,24 +146,28 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								${record.bwdj }
-							</td>
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								${record.tgnl }
 							</td>
-						</tr>
-						
-						<tr>
+					
 					    	<th>泊位用途:&nbsp;</th>
-                            <td colspan="3">
+                            <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>
                        		<td colspan="3">
                        		
@@ -174,13 +206,11 @@
 </form>
 
 					<div  id="buttons">
-					
+					 
+					<c:if test="${flag=='audit' }">
 					 <a class="btn btn-default btn-sm" href="#"  onclick="showRy()">
 							   <i class="glyphicon glyphicon-check"></i> 
 							            选择人员</a>
-					 
-					<c:if test="${flag=='audit' }">
-					
 					<a class="btn btn-default btn-sm" href="#"  onclick="showYj()">
 							   <i class="glyphicon glyphicon-check"></i> 
 							            意见</a>

+ 31 - 14
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxadd.jsp

@@ -23,6 +23,8 @@
 				jsjdzx.detail.gk ='${gk}';
 				
 			}
+			//水域类型
+			initSylxSelect('sylxsel','1902','80%');
 			//项目类型默认新建
 				initXmlxSelect('xmlxsel','2201','80%');
 			//投资类型默认企业投资
@@ -80,6 +82,12 @@
  <form  id="addform" method="post" enctype="multipart/form-data"> 			
  <input type="hidden" class="form-control"  name="fjids" id="fjids">
 					<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>
+						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4">
@@ -149,6 +157,16 @@
 							   <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()">
+							</td>
+							<th>政府投资占比(%):&nbsp;</th>
+							<td >
+								<input type="text" class="form-control" readonly="readonly" id="zftzezb">
+							</td>
+						</tr>
 						<tr>
 						    <th>岸线审批级别:&nbsp;</th>
 							<td >
@@ -160,28 +178,27 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								<input type="text" class="form-control" name="bwdj">
-							</td>
+						  
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td >
 								<input type="text" class="form-control" name="tgnl">
 							</td>
-						</tr>
 						
-						<tr>
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+                        <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="${jcsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
+							</td>
+						</tr>
 					</table>
 				
 					<div  id="buttons">

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

@@ -19,6 +19,8 @@
 				jsjdzx.detail.gq ='${jyr.szgq.id}'
 				jsjdzx.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%');
@@ -75,6 +77,12 @@
  <input type="hidden" name="id" value="${record.id }">		
  <input type="hidden" name="fjids" id="fjids">	
 					<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>
+						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -150,6 +158,16 @@
 								</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>
@@ -162,24 +180,27 @@
 							</td>
 						</tr>
 						<tr>
-					    	<th>泊位吨级(吨):&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="bwdj" value="${record.bwdj }">
-							</td>
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td>
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
-						</tr>
 						
-						<tr>
 					 	    <th>泊位用途:&nbsp;</th>
-                        <td colspan="3">
+                        <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>
+				
 				
 					</table>
 					

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

@@ -18,6 +18,20 @@
 			$('.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(){
@@ -52,6 +66,12 @@
   <input type="hidden" id="yj"	name="yj"/>
   <input type="hidden" id="accids" name="accids"/>
 					<table class="apply" cellpadding="0" cellspacing="0">
+					<tr>
+							<th>项目编码:&nbsp;</th>
+							<td colspan="4">
+								${record.xmbm }
+							</td>
+						</tr>
 						<tr>
 							<th>项目名称:&nbsp;</th>
 							<td colspan="4" >
@@ -114,6 +134,14 @@
 								${record.xmhzjbzw }
 							</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 >
@@ -125,23 +153,27 @@
 							</td>
 						</tr>
 						<tr>
-						    <th>泊位吨级 (吨):&nbsp;</th>
-							<td >
-								${record.bwdj }
-							</td>
 							<th>通过能力(万吨):&nbsp;</th>
-							<td colspan="3">
+							<td>
 								${record.tgnl }
 							</td>
-						</tr>
 						
-						<tr>
 					    	<th>泊位用途:&nbsp;</th>
-                            <td colspan="3">
+                            <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>
                        		<td colspan="3">

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

@@ -26,7 +26,7 @@
 				}
 				if(isFDS(ztz) && isFDS(zftze)) {
 					var rate = (zftze/ztz)*100;
-					$("#zftzTd").html(rate);
+					$("#zftzTd").html(rate.toFixed(2));
 				}
 			} else {
 				$("#zftzDiv").css("display","none");