Explorar o código

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

ld_xuhx %!s(int64=9) %!d(string=hai) anos
pai
achega
9398469dcf

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

@@ -120,7 +120,8 @@
 				<table class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
 						<th width="4%">序号</th>	
-						<th width="10%">项目名称</th>
+						<th width="10%">项目编码</th>
+						<th width="20%">项目名称</th>
 						<th width="10%">所在港口</th>
 						<th width="10%">所在港区</th>
 						<th width="10%">项目法人</th>
@@ -132,6 +133,7 @@
 					 <c:forEach items="${list}" var="jsjdcbsj" varStatus="status">
 						<tr class="tr_bg">
 							<td>${status.index+1 }</td>
+							<td>${jsjdcbsj.xmbm }</td>
 							<td>${jsjdcbsj.xmmc }</td>
 							<td>${jsjdcbsj.szgkzw }</td>
 							<td>${jsjdcbsj.szgqzw }</td>

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

@@ -177,7 +177,8 @@
 				<table class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
 						<th width="5%">序号</th>	
-						<th width="40%">项目名称</th>
+						<th width="10%">项目编码</th>
+						<th width="30%">项目名称</th>
 						<th width="15%">项目法人</th>
 						<th width="10%">所在港区</th>
 						<th width="15%">当前状态</th>
@@ -187,6 +188,7 @@
 					 <c:forEach items="${list}" var="jsjdgl" varStatus="status">
 						<tr class="tr_bg">
 							<td>${status.index+1 }</td>
+							<td>${jsjdgl.xmbm }</td>
 							<td>${jsjdgl.xmmc }</td>
 							<td>${jsjdgl.xmfr }</td>
 							<td>${jsjdgl.szgqzw }</td>

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

@@ -22,7 +22,7 @@
 				    $.post($.app+"/xmxxgl/selectXzqh?pid="+'${jyr.szgk.xzqh}',{
 					},function(data) {
 						 var str = "";
-						 str+="<select class='xzqhselectpicker' id='xzqh' onchange='checkxzqh()' >";
+						 str+="<select class='xzqhselectpicker' id='xzqh' name='xzqh'  >";
 						 str+="<option></option>";
 						 if(data){
 							for(var i=0;i<data.length;i++){
@@ -34,7 +34,7 @@
 							$("#xzqhsel").append(str);
 							
 							$('.xzqhselectpicker').selectpicker({
-								width:'92.5%%'
+								width:'92.5%'
 							});
 						}
 						}, "json");
@@ -63,21 +63,6 @@
 			}) */
 		});
 		
-		function checkxzqh(){
-		    $.ajax({
-		         url:$.app+"/xmxxgl/getXmbh",
-		         data:{xzqh:$('#xzqh').val()},
-		         type:"post",
-		         dataType:"json",
-		         success:function(data){//ajax返回的数据
-			           if (data.success) {
-			               $('#xmbm').val(data.attrs.xmbm);
-			           }else {
-				           
-			           }
-			     }
-		    }); 
-		}
 		
 		function showgk(){
 			initgkSelect('gksel',xmxxgl.detail.gk,$('.szdselectpicker').val(),"showgq",'80%');
@@ -119,7 +104,7 @@
 			<div class="apply_fill">
  <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">
+					<table class="apply" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 						<tr>
 						    <th><span class="needwrite">*</span>行政区划:&nbsp;</th>
 							<td colspan="3">

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

@@ -80,7 +80,7 @@
  <form  id="addform" method="post" enctype="multipart/form-data"> 		
  <input type="hidden" name="id" value="${record.id }">		
  <input type="hidden" name="fjids" id="fjids">	
-					<table class="apply" cellpadding="0" cellspacing="0">
+					<table class="apply" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 						<tr>
 							<th><span class="needwrite">*</span>行政区划:&nbsp;</th>
 							<td>
@@ -188,26 +188,18 @@
 							</td>
 						</tr>
 						<tr>
-					    	<%-- <th>泊位吨级(吨):&nbsp;</th>
-							<td>
-								<input type="text" class="form-control" name="bwdj" value="${record.bwdj }">
-							</td> --%>
+					    	
 							<th><span class="needwrite">*</span>通过能力(万吨):&nbsp;</th>
-							<td colspan="1">
+							<td>
 								<input type="text" class="form-control" name="tgnl" value="${record.tgnl }">
 							</td>
-						<!-- </tr>
-						
-						<tr> -->
+					
 					 	    <th>泊位用途:&nbsp;</th>
                         <td>
 	                        <span id="bwytsel"></span>
                         </td>
                        
-                      <!--   <th>专业化泊位分类:&nbsp;</th>
-                        <td>
-	                        <span id="zyhbwflsel"></span>
-                        </td> -->
+                     
 						</tr>
 						<tr>
 							<th>水域类型:&nbsp;</th>

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

@@ -129,6 +129,7 @@
 				<table class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
 						<th width="3%">序号</th>	
+						<th width="16%">项目编码</th>
 						<th width="16%">项目名称</th>
 						<th width="8%">所在港口</th>
 						<th width="8%">所在港区</th>
@@ -140,6 +141,7 @@
 					 <c:forEach items="${list}" var="xmxxgl" varStatus="status">
 						<tr class="tr_bg">
 							<td>${status.index+1 }</td>
+							<td>${xmxxgl.xmbm }</td>
 							<td>${xmxxgl.xmmc }</td>
 							<td>${xmxxgl.szgkzw }</td>
 							<td>${xmxxgl.szgqzw }</td>
@@ -150,12 +152,14 @@
 								<a class="btn btn-default btn-xs" href="#" onclick="xmxxgl.main.view('${xmxxgl.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							            </a>
+							       <c:if test="${xmxxgl.recordStatus==1 }">
 								 <a class="btn btn-default btn-xs" href="#"  onclick="xmxxgl.main.edit('${xmxxgl.id}')" title="修改">
 									   <i class="glyphicon glyphicon-wrench"></i> 
 									          </a>
 									          <a class="btn btn-default btn-xs" href="#" onclick="xmxxgl.main.del('${xmxxgl.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         </a>
+									         </c:if>
 									<input type="hidden" id="flag" value="${xmxxgl.flag}">	
 									<c:if test="${xmxxgl.showjsjd=='Y' }">        
 							            <a class="btn btn-default btn-xs" href="#"