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

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxhbgl/hxhbgladd.jsp

@@ -30,6 +30,7 @@
 				var jsonJyr = $.parseJSON(jyr);
 				$('#xzjyr').val(jsonJyr.gkjyr);
 		    	$('#xzjyrid').val(jsonJyr.id);
+		    	$('#ssgkglbm').val(jsonJyr.ssgkglbmzw);
 		    	$('#ajyrselect').css('display','none');//把选择经营人按钮隐藏
 			}else if(jyrid!=null&&jyrid!=''){
 				guanbipop();
@@ -39,7 +40,7 @@
 			    	//返回的是经营人实体，你可以在回掉中，进行任何其他字段的默认填写
 			    	$('#xzjyr').val(data.gkjyr);
 			    	$('#xzjyrid').val(data.id);
-			    	$('#ssgkglbm').val(data.ssgkglbm.gkglbmqc);
+			    	$('#ssgkglbm').val(data.ssgkglbmzw);
 			    }, "json");
 			}
 		}
@@ -65,11 +66,11 @@
 					<tr>
 						<th>所属港口管理部门 ：&nbsp;</th>
 						<td colspan="3">
-							<input type="text" class="form-control" id="ssgkglbm" readOnly = "true" style="width: 92.2%">
+							<input type="text" class="form-control" id="ssgkglbm" readOnly = "true" value="" style="width: 92.2%">
 						</td>
 					</tr>
 					<tr>
-			            <th>日期 ： &nbsp;</th> 
+			            <th><span class="needwrite">*</span>日期 ： &nbsp;</th> 
 			            <td colspan="3">
 			            <input class="Wdate" name="rq" id="rq" type="text" style="width: 92.2%" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM'})">
                         </td>
@@ -77,23 +78,23 @@
 					<tr>
 						<th>内贸集装箱吞吐量（TEU）：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="nmjzxttl" >
+							<input type="text" class="form-control" name="nmjzxttl" onkeyup="num(this)" maxlength="6" >
 						</td>
 						<th>外贸集装箱吞吐量（TEU）：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="wmjzxttl">
+							<input type="text" class="form-control" name="wmjzxttl" onkeyup="num(this)" maxlength="6">
 						</td>
 					</tr>
 					<tr>
 						<th>远洋航线条数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="yyhxts" 
+							<input type="text" class="form-control" name="yyhxts" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 						</td>
 						<th>远洋航线航班数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="yyhxhbs" 
+							<input type="text" class="form-control" name="yyhxhbs" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 						</td>
@@ -107,13 +108,13 @@
 					<tr>
 						<th>近洋航线条数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="jyhxts" 
+							<input type="text" class="form-control" name="jyhxts" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 						</td>
 						<th>近洋航线航班数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="jyhxhbs" 
+							<input type="text" class="form-control" name="jyhxhbs" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 						</td>
@@ -127,13 +128,13 @@
 					<tr>
 						<th>外贸内支线条数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="nzxts" 
+							<input type="text" class="form-control" name="nzxts" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 						</td>
 						<th>外贸内支线航班数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="nzxhbs" 
+							<input type="text" class="form-control" name="nzxhbs" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 						</td>
@@ -147,13 +148,13 @@
 					<tr>
 						<th>内贸航线条数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="nmhxts" 
+							<input type="text" class="form-control" name="nmhxts" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 						</td>
 						<th>内贸航线航班数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="nmhxhbs" 
+							<input type="text" class="form-control" name="nmhxhbs" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 						</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxhbgl/hxhbgledit.jsp

@@ -60,7 +60,7 @@
 						</td>
 					</tr>
 					<tr>
-			            <th>日期 ： &nbsp;</th> 
+			            <th><span class="needwrite">*</span>日期 ： &nbsp;</th> 
 			            <td colspan="3">
 			            <input class="Wdate" name="rq" id="rq" type="text" style="width: 92.2%" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM'})" value="${record.rq }">
                         </td>
@@ -68,24 +68,24 @@
 					<tr>
 						<th>内贸集装箱吞吐量（TEU）：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="nmjzxttl" value="${record.nmjzxttl }">
+							<input type="text" class="form-control" name="nmjzxttl" value="${record.nmjzxttl }" onkeyup="num(this)" maxlength="6">
 						</td>
 						<th>外贸集装箱吞吐量（TEU）：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="wmjzxttl" value="${record.wmjzxttl }">
+							<input type="text" class="form-control" name="wmjzxttl" value="${record.wmjzxttl }" onkeyup="num(this)" maxlength="6">
 						</td>
 					</tr>
 					<tr>
 						<th>远洋航线条数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="yyhxts" 
+							<input type="text" class="form-control" name="yyhxts" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))"
 							value="${record.yyhxts }">
 						</td>
 						<th>远洋航线航班数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="yyhxhbs" 
+							<input type="text" class="form-control" name="yyhxhbs" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))"
 							value="${record.yyhxhbs }">
@@ -100,14 +100,14 @@
 					<tr>
 						<th>近洋航线条数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="jyhxts" 
+							<input type="text" class="form-control" name="jyhxts" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))"
 							value="${record.jyhxts }">
 						</td>
 						<th>近洋航线航班数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="jyhxhbs" 
+							<input type="text" class="form-control" name="jyhxhbs" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))"
 							value="${record.jyhxhbs }">
@@ -122,14 +122,14 @@
 					<tr>
 						<th>外贸内支线条数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="nzxts" 
+							<input type="text" class="form-control" name="nzxts" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))"
 							value="${record.nzxts }">
 						</td>
 						<th>外贸内支线航班数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="nzxhbs" 
+							<input type="text" class="form-control" name="nzxhbs" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))"
 							value="${record.nzxhbs }">
@@ -144,14 +144,14 @@
 					<tr>
 						<th>内贸航线条数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="nmhxts" 
+							<input type="text" class="form-control" name="nmhxts" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))"
 							value="${record.nmhxts }">
 						</td>
 						<th>内贸航线航班数：&nbsp;</th>
 						<td >
-							<input type="text" class="form-control" name="nmhxhbs" 
+							<input type="text" class="form-control" name="nmhxhbs" onkeyup="num(this)" maxlength="6"
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))"
 							value="${record.nmhxhbs }">

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxhbgl/hxhbglmain.jsp

@@ -79,13 +79,13 @@
 		                 	航班录入&nbsp;&nbsp;<br>时间起：&nbsp;
 		                </td>
 		                <td >
-		                 	<input type="text"  class="form-control" name="hxlrsjq" value="${hxlrsjq }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd HH:mm:ss'})">
+		                 	<input type="text" id="d1" class="form-control" name="hxlrsjq" value="${hxlrsjq }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate: '#F{$dp.$D(\'d2\',{d:0})}'})">
 		                </td>
 		                <td class="right">
 		                 	航班录入&nbsp;&nbsp;<br>时间止：&nbsp;
 		                </td>
 		                <td >
-		                 	<input type="text"  class="form-control" name="hxlrsjz" value="${hxlrsjz }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd HH:mm:ss'})">
+		                 	<input type="text" id="d2"  class="form-control" name="hxlrsjz" value="${hxlrsjz }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd HH:mm:ss',minDate: '#F{$dp.$D(\'d1\',{d:0})}'})"">
 		                </td>
 		            </tr>
 	                <tr>

gkjsjy/trunk/WebContent/static/biz/js/ggfwxxgl/hxhbgl/hxhbgldetail.js

@@ -25,7 +25,7 @@ vae=function(area,name){
 hxhbgl.detail.save=function(){
 	// 必填非空验证
 	if(vae($('#xzjyrid'), "所属经营人")==false){return false;}
-	
+	if(vae($('#rq'), "日期")==false){return false;}
 	 $.ajax({
          url:$.app+"/hxhbgl/save",
          data:$("#addform").serialize(),

gkjsjy/trunk/WebContent/static/biz/js/ggfwxxgl/hxhbgl/hxhbglmain.js

@@ -21,7 +21,7 @@ hxhbgl.main.del=function(data){
 	    title: '确认框',
 	    content: '确认删除吗',
 	    confirm: function(){
-	    	 $.post($.app + "/ck/delete", {
+	    	 $.post($.app + "/hxhbgl/delete", {
                  id : data
              }, function(data) {
                  if (data.success) {
@@ -29,7 +29,7 @@ hxhbgl.main.del=function(data){
                 		    title: '提示',
                 		    content: '操作成功',
                 		    confirm: function(){
-                		    	$("#ckform").submit();
+                		    	location.href = $.app + "/hxhbgl/main";
                 		    }
                 	 });
                  } else {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -1058,7 +1058,8 @@ public class GkjyrCtl extends BaseWebCtl {
 			vo.setSzdzw(null != jyr.getSzd() ? jyr.getSzd().getText() : "");
 			vo.setSzgkzw(null != jyr.getSzgk() ? jyr.getSzgk().getGkmc() : "");
 			vo.setSzgqzw(null != jyr.getSzgq() ? jyr.getSzgq().getGqmc() : "");
-
+			vo.setSsgkglbmzw(null!= jyr.getSsgkglbm()?jyr.getSsgkglbm().getGkglbmqc():"");
+			vo.setSsgkglbm(null!=jyr.getSsgkglbm()? jyr.getSsgkglbm().getId():"");
 			vo.setSzd(null != jyr.getSzd() ? jyr.getSzd().getId() : "");
 			vo.setSzgk(null != jyr.getSzgk() ? jyr.getSzgk().getId() : "");
 			vo.setSzgq(null != jyr.getSzgq() ? jyr.getSzgq().getId() : "");