Home Explore Help
Register Sign In
hs
/
jsgkj
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

ld_xuhx 8 years ago
parent
2a7c3c5c91
commit
9b402396c6
4 changed files with 53 additions and 43 deletions
Split View Show Diff Stats
  1. 42 40
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjpro.jsp
  2. 9 1
      gkjsjy/trunk/WebContent/static/biz/js/common.js
  3. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/ctl/TzjhglCtl.java
  4. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

+ 42 - 40
gkjsjy/trunk/WebContent/WEB-INF/pages/gkyxtjyfx/hxhbtj/hxhbtjpro.jsp
View File 

@@ -136,14 +136,11 @@
 
 </head>

 

 <body>

-	<div class="box" >

-		<div class="box-content">

-		<h1 align="center" style="margin-top:0px;"><font style="font-size:25px;color:#196794;font-family:微软雅黑;font-weight: bold;">全省港口集装箱航线航班月度统计表（${rq }月）</font></h1>

-		<form action="${app }/hxhbtjpro/main" id="hxhbtjproform" method="post"> 

-		<input type="hidden" name="menuid" value="${menuid }">		

-		<input type="hidden" name="flag" value="" id="flag">	

-		<div>

-   				   <table class="search_table" cellpadding="0" cellspacing="0">

+<form action="${app }/hxhbtjpro/main" id="hxhbtjproform" method="post"> 

+	<div class="box" >			

+	<div class="box-content" >

+		<div class="searchdiv">

+				 <table class="search_table" cellpadding="0" cellspacing="0">

    				   	   <tr>

 							<th width="10%"></th>

 							<th width="24%"></th>	

@@ -188,18 +185,22 @@
 
 	                        </td>

 	                    </tr>

                     </table>

-          		</div>

-				<!-- 列表 -->

+				

+		</div>

+	

+		    <!-- 列表 -->

+	 <div  style="background-color:#f4f4f4;">

+			   <!-- 列表 -->

 				<c:if test="${dq == null}">

-			    <div  style="background-color:#f4f4f4;">

+			  

 				    <table class="main_table" cellpadding="0" cellspacing="0">

 					  

 						    <tr>

-				    			<th width="10%" rowspan="2">地区</th>

-				        		<th width="20%" colspan="2">远洋航线</th>

-								<th width="20%" colspan="2">近洋航线</th>

-								<th width="20%" colspan="2">外贸内支线</th>

-								<th width="20%" colspan="2">内贸航线</th>

+				    			<th width="12%" rowspan="2">地区</th>

+				        		<th width="22%" colspan="2">远洋航线</th>

+								<th width="22%" colspan="2">近洋航线</th>

+								<th width="22%" colspan="2">外贸内支线</th>

+								<th width="22%" colspan="2">内贸航线</th>

 						    </tr>

 					   

 					    	<tr>

@@ -215,33 +216,33 @@
 
 						  <c:forEach items="${volist}" var="volist" varStatus="status">

 						  <tr>

 						  		<td><input type="hidden" name="szd" value="${volist.id}">${volist.szd }</td>

-						  		<td><input type="text" name="yyhxts" value='${volist.yyhxts }' onblur="sum()" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>

-						  		<td><input type="text" name="yyhxhbs" value='${volist.yyhxhbs }' onblur="sum()" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>

-						  		<td><input type="text" name="jyhxts" value='${volist.jyhxts }' onblur="sum()" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>

-						  		<td><input type="text" name="jyhxhbs" value='${volist.jyhxhbs }' onblur="sum()" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>

-						  		<td><input type="text" name="nzxts" value='${volist.nzxts }' onblur="sum()" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>

-						  		<td><input type="text" name="nzxhbs" value='${volist.nzxhbs }' onblur="sum()" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>

-						  		<td><input type="text" name="nmhxts" value='${volist.nmhxts }' onblur="sum()" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>

-						  		<td><input type="text" name="nmhxhbs" value='${volist.nmhxhbs }' onblur="sum()" onkeyup="value=value.replace(/[^\-?\d.]/g,'')"></td>

+						  		<td><input type="text" style="width: 80%" name="yyhxts" value='${volist.yyhxts }' onblur="sum()" onkeyup="num(this)"></td>

+						  		<td><input type="text" style="width: 80%" name="yyhxhbs" value='${volist.yyhxhbs }' onblur="sum()" onkeyup="num(this)"></td>

+						  		<td><input type="text" style="width: 80%" name="jyhxts" value='${volist.jyhxts }' onblur="sum()" onkeyup="num(this)"></td>

+						  		<td><input type="text" style="width: 80%" name="jyhxhbs" value='${volist.jyhxhbs }' onblur="sum()" onkeyup="num(this)"></td>

+						  		<td><input type="text" style="width: 80%" name="nzxts" value='${volist.nzxts }' onblur="sum()" onkeyup="num(this)"></td>

+						  		<td><input type="text" style="width: 80%" name="nzxhbs" value='${volist.nzxhbs }' onblur="sum()" onkeyup="num(this)"></td>

+						  		<td><input type="text" style="width: 80%" name="nmhxts" value='${volist.nmhxts }' onblur="sum()" onkeyup="num(this)"></td>

+						  		<td><input type="text" style="width: 80%" name="nmhxhbs" value='${volist.nmhxhbs }' onblur="sum()" onkeyup="num(this)"></td>

 						  </tr>

 						  </c:forEach>

 					   	<tr >

 					   		<td>合计</td>

-					   		<td align="left"><input type="text" readonly="readonly" id="a1" value="${a1 }"></td>

-					   		<td align="left"><input type="text" readonly="readonly" id="a2" value="${a2 }"></td>

-					   		<td align="left"><input type="text" readonly="readonly" id="a3" value="${a3 }"></td>

-					   		<td align="left"><input type="text" readonly="readonly" id="a4" value="${a4 }"></td>

-					   		<td align="left"><input type="text" readonly="readonly" id="a5" value="${a5 }"></td>

-					   		<td align="left"><input type="text" readonly="readonly" id="a6" value="${a6 }"></td>

-					   		<td align="left"><input type="text" readonly="readonly" id="a7" value="${a7 }"></td>

-					   		<td align="left"><input type="text" readonly="readonly" id="a8" value="${a8 }"></td>

+					   		<td align="left"><input type="text" style="width: 80%" readonly="readonly" id="a1" value="${a1 }"></td>

+					   		<td align="left"><input type="text" style="width: 80%" readonly="readonly" id="a2" value="${a2 }"></td>

+					   		<td align="left"><input type="text" style="width: 80%" readonly="readonly" id="a3" value="${a3 }"></td>

+					   		<td align="left"><input type="text" style="width: 80%" readonly="readonly" id="a4" value="${a4 }"></td>

+					   		<td align="left"><input type="text" style="width: 80%" readonly="readonly" id="a5" value="${a5 }"></td>

+					   		<td align="left"><input type="text" style="width: 80%" readonly="readonly" id="a6" value="${a6 }"></td>

+					   		<td align="left"><input type="text" style="width: 80%" readonly="readonly" id="a7" value="${a7 }"></td>

+					   		<td align="left"><input type="text" style="width: 80%" readonly="readonly" id="a8" value="${a8 }"></td>

 					   	</tr>

 				    </table>

-				</div>

+				

 				</c:if>

 				<c:if test="${dq != null}">

 				<!-- 列表 -->

-			    <div  style="background-color:#f4f4f4;">

+			  

 				    <table class="main_table" cellpadding="0" cellspacing="0">

 					    <thead>

 						    <tr>

@@ -274,14 +275,15 @@
 
 						    </tr>

 					    </c:forEach>

 				    </table>

-				</div>

+				

 	  			<!-- 分页 -->

 	  			<jsp:include page="../../pageinfo.jsp"></jsp:include>

 				</c:if>

-				</form>

-				<form id="hxhbtjproform2" method="post"></form>

-		</div>

-			

-		</div>

+	</div>

+   	</div>	

+   	</div>	

+</form>				

+ 

+

 </body>

 </html>

+ 9 - 1
gkjsjy/trunk/WebContent/static/biz/js/common.js
View File 

@@ -1052,4 +1052,12 @@ function resetSrchForm() {
 
 	//$("#"+formId).find(":select").not(":button,:submit,:reset,:hidden").removeAttr("selected");
 
 	//$("select").val().removeAttr("selected");
 
 	//$("[name='checkbox']").attr("checked",'true');//全选 
-}
 
+}
 
+
 
+function num(obj){
 
+	obj.value = obj.value.replace(/[^\d.]/g,""); //清除"数字"和"."以外的字符
 
+	obj.value = obj.value.replace(/^\./g,""); //验证第一个字符是数字
 
+	obj.value = obj.value.replace(/\.{2,}/g,"."); //只保留第一个, 清除多余的
 
+	obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
 
+	obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d).*$/,'$1$2.$3'); //只能输入两个小数
 
+	}

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/ctl/TzjhglCtl.java
View File 

@@ -238,7 +238,7 @@ public class TzjhglCtl extends BaseWebCtl {
 
 				String flag = "";

 

 				if (entity.getXmid() != null) {

-					if (entity.getXmid().getRecordStatus() == 8) {

+					if (entity.getXmid().getRecordStatus() == 8 || entity.getXmid().getRecordStatus() == 3) {

 						flag = "1";

 					}

 				}

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java
View File 

@@ -254,7 +254,7 @@ public class XmxxglCtl extends BaseWebCtl {
 
 				vo.setAxspjb(entity.getAxspjb() != null ? entity.getAxspjb().getId() : "");

 				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");

 				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");

-				if (entity.getRecordStatus() == 8) {

+				if (entity.getRecordStatus() == 8 || entity.getRecordStatus() == 3) {

 					vo.setShowjsjd("Y");

 				} else {

 					vo.setShowjsjd("N");