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

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

@@ -135,7 +135,7 @@
 						<th width="8%">所在港区</th>
 						<th width="10%">项目法人</th>
 						<th width="8%">项目类型</th>
-						<th width="10%">是否有资金补助</th>	
+						<th width="10%">总投资（万元）</th>	
 						<th width="1%" class="operatetd">操作</th>
 					</tr>
 					 <c:forEach items="${list}" var="xmxxgl" varStatus="status">
@@ -147,7 +147,7 @@
 							<td>${xmxxgl.szgqzw }</td>
 							<td>${xmxxgl.xmfr }</td>
 						    <td>${xmxxgl.xmlxzw }</td>
-						    <td>${xmxxgl.sfyzjbz }</td>
+						    <td>${xmxxgl.ztz }</td>
 							<td class="operatetd">
 								<a class="btn btn-default btn-xs" href="#" onclick="xmxxgl.main.view('${xmxxgl.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/xkzfz.jsp

@@ -16,11 +16,11 @@
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+(i+1)+"</td>";
 					str+="<td>"+(xkzfz.fzsqh==null?"":xkzfz.fzsqh)+"</td>";
-					str+="<td>"+xkzfz.ssjyrzw+"</td>";
+					/* str+="<td>"+xkzfz.ssjyrzw+"</td>"; */
 					str+="<td>"+(xkzfz.wxhwpm==null?"":xkzfz.wxhwpm)+"</td>";
 					str+="<td>"+xkzfz.yxqkssjfmt+"</td>";
 					str+="<td>"+xkzfz.yxqjssjfmt+"</td>";
-					str+="<td>"+(xkzfz.recordStatus==1?'有效':'无效')+"</td>";
+					/* str+="<td>"+(xkzfz.recordStatus==1?'有效':'无效')+"</td>"; */
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"xkzfzview('"+xkzfz.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";
 					str+="</td>";
@@ -37,14 +37,14 @@
 	<table class="main_table"  cellpadding="0" cellspacing="0">
 		
 	     <tr>
-	    	<th width="5%">序号</th>
-			<th width="15%">证书编号</th>
-       		<th width="15%">港口经营人</th>
-   			<th width="15%">作业危险品名</th>
-			<th width="15%">发证日期</th>
-			<th width="15%">有效日期</th>
-			<th width="15%">证书状态</th>
-	        <th width="20%">操作</th>
+	    	<th width="4%">序号</th>
+			<th width="20%">证书编号</th>
+       		<!-- <th width="15%">港口经营人</th> -->
+   			<th width="40%">作业危险品名</th>
+			<th width="13%">发证日期</th>
+			<th width="13%">有效日期</th>
+			<!-- <th width="15%">证书状态</th> -->
+	        <th width="10%">操作</th>
          </tr>
          <tbody id="xkzfzdiv"></tbody>
 	</table>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxmain.jsp

@@ -145,6 +145,7 @@
 		                </td>
 		                <td>
 			            	<select class='sfyxselectpicker' name="sfyx" id="sfyx">
+			            	<option value="">请选择</option>
 			            	<option selected="selected" value="1">有效</option>
 			            	<option value="2">无效</option>
 			                </select>
@@ -197,12 +198,14 @@
 							<th width="8%">有效期至</th>
 							<th width="12%">发证机关</th>
 							<th width="8%">发证日期</th>
-							<th width="8%">证件状态</th>
+							<!-- <th width="8%">证件状态</th> -->
 					        <th width="1%" class="operatetd">操作</th>
 					    </tr>
 				    </thead>
 				    <c:forEach items="${list}" var="xkzxx" varStatus="status">
-					    <tr id="xkzxx${status.count }">
+				    	<c:if test="${xkzxx.sfyx=='1'}"> <tr id="xkzxx${status.count }"></c:if>
+						<c:if test="${xkzxx.sfyx!='1'}"> <tr id="xkzxx${status.count }" style="background-color: rgb(204, 204, 204);></c:if>
+					    <%-- <tr id="xkzxx${status.count }"> --%>
 					        <input type="hidden" id="sfred${status.count }" value="${xkzxx.sfred }">	
 					    	<td >${status.count }</td>
 					    	<td >${xkzxx.gkjyxkzh }</td>
@@ -213,11 +216,11 @@
 							<td ><fmt:formatDate value='${xkzxx.yxqz }' pattern="yyyy-MM-dd" type="date" dateStyle="long" /></td>
 							<td >${xkzxx.fzjg }</td>
 							<td ><fmt:formatDate value='${xkzxx.fzrq }' pattern="yyyy-MM-dd" type="date" dateStyle="long" /></td>
-							<td >
+							<%-- <td >
 								<c:if test="${xkzxx.sfyx=='1'}">有效</c:if>
 								<c:if test="${xkzxx.sfyx!='1'}">无效</c:if>
-								<%-- <c:if test="${xkzxx.sfyx == '3' }">注销</c:if> --%>
-							</td>
+								<c:if test="${xkzxx.sfyx == '3' }">注销</c:if>
+							</td> --%>
 					        <td class="operatetd">
 						        <a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.view('${xkzxx.id}')" title="详情">
 						            <i class="glyphicon glyphicon-search"></i>

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -303,7 +303,8 @@ public class XmxxglCtl extends BaseWebCtl {
 		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
 		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));
 		model.addAttribute("xmhzjbid", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmhzjbid"));
-		model.addAttribute("sfyzjbz", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyzjbzid"));
+//		model.addAttribute("sfyzjbz", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyzjbzid"));
+		model.addAttribute("ztz", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ztz"));
 		model.addAttribute("menuid", menuid);
 
 		// 翻页共通