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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp

@@ -42,6 +42,7 @@
 			xmxxgl.detail.initBwyt('bwytsel', '${record.bwyt }');
 			xmxxgl.detail.initZyhbwfl('zyhbwflsel', '${record.zyhbwfl }','${record.bwyt }');
 			jsjdgl.detail.opflag="${opflag}";
+			jsjdgl.detail.tempflag="${opflag}";
 			var opflag = "${opflag}";
 			var isjyr ='${isjyr}';
 			if(opflag == 2 || isjyr ==2){
@@ -231,13 +232,13 @@
 						
 							<th>项目概况：&nbsp;</th>
 							<td colspan="3">
-								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">
+								<input type="text" class="form-control" name="xmgk" id="xmgk" value="${record.xmgk }">
 							</td>
 						</tr>
 						<tr>
 						 	<th>建设规模：&nbsp;</th>
 							<td colspan="3">
-								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">
+								<input type="text" class="form-control" name="jsgm" id="jsgm" value="${record.jsgm }">
 							</td>
 						</tr>
 
@@ -308,7 +309,7 @@
 						<tr>
 						 	<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'})">
+							<input type="text" class="Wdate" name="jcsj" id="jcsj" value="${fn:substring(record.jcsj,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>
 							<th>泊位个数：&nbsp;</th>
 								<td>

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdgldetail.js

@@ -2,6 +2,7 @@
 $.namespace("jsjdgl.detail");
 
 jsjdgl.detail.opflag = null;
+jsjdgl.detail.tempflag = null;
 jsjdgl.detail.xiugaiflag=null;
 
 jsjdgl.detail.init=function(){
@@ -695,7 +696,9 @@ jsjdgl.detail.fhpd=function(opflag){
 jsjdgl.detail.show = function(sortno){
 	if(jsjdgl.detail.opflag != sortno){
 	//判断数据是否改变
-	jsjdgl.detail.pdsjsfgb();
+	if(jsjdgl.detail.opflag == jsjdgl.detail.tempflag){
+		jsjdgl.detail.pdsjsfgb();
+	}
 	//控件锁定
 	jsjdgl.detail.readonly("");
 	 $("#auditbt").hide();	
@@ -710,6 +713,7 @@ jsjdgl.detail.show = function(sortno){
 		 dataType:"json",
 		 success:function(data){
 		 if (data.success){
+			jsjdgl.detail.tempflag = sortno;
 			var xmxxfb = data.attrs.xmxxfb;
 			if(xmxxfb!=null){
 				$('#xmmc').val(xmxxfb.xmmc);	
@@ -738,13 +742,12 @@ jsjdgl.detail.show = function(sortno){
            	$.alert({
        		    title: '提示',
        		    content: data.message,
-       		    confirm: function(){
-       		    }
+       		    confirm: function(){}
            	});	 
-	 }
-	}
- });
-	}else{
+		 }
+		}
+	   });
+	 }else{
 		/*location.href=$.app+"/jsjdgl/edit?id="+$('#id').val()+"&flag=audit";*/
 		 $("#auditbt").show();	
 		 $("#tuihuibt").show();
@@ -760,6 +763,7 @@ jsjdgl.detail.show = function(sortno){
              dataType:"json",
              success:function(data){//ajax返回的数据
     	           if (data.success) {
+    	        	   	jsjdgl.detail.tempflag = sortno;
     	        	    var xmxxfb=data.attrs.vo;
     	        	    $('#xmmc').val(xmxxfb.xmmc);	
     					$('#xmfr').val(xmxxfb.xmfr);
@@ -802,7 +806,10 @@ jsjdgl.detail.readonly = function(data){
 	$('#tzlxid').attr("disabled",true);
 	$('#xmhzjbid').attr("disabled",true);
 	$('#axspjbid').attr("disabled",true);
+	$('#sylxid').attr("disabled",true);
 	$('#bwyt').attr("disabled",true);
+	$('#xmgk').attr("readonly","readonly");
+	$('#jcsj').attr("readonly","readonly");
 	}else{
 	$('#xmfr').removeAttr("readonly");
 	$('#jsdd').removeAttr("readonly");
@@ -822,6 +829,9 @@ jsjdgl.detail.readonly = function(data){
 	$('#xmhzjbid').removeAttr("disabled");
 	$('#axspjbid').removeAttr("disabled");
 	$('#bwyt').removeAttr("disabled");
+	$('#xmgk').removeAttr("readonly");
+	$('#jcsj').removeAttr("readonly");
+	$('#sylxid').removeAttr("disabled");
 	}
 }
 
@@ -836,18 +846,18 @@ jsjdgl.detail.pdsjsfgb = function(){
 		 data:{
 		 xmid:$('#id').val(),
 		 straddform:$("#addform").serialize(),
-		 sortno:$('#opflag').val()
+		 sortno:jsjdgl.detail.opflag
 		 },
 		 type:"post",
 		 dataType:"json",
 		 success:function(data){
 		 if (data){
 			var xmxx=data.attrs.vo;
-			if(xmxx.szd!=$("#szdid").val() ||xmxx.szgk!=$("#szgkid").val() ||xmxx.szgq!=$("#szgqid").val()
-			||xmxx.xmfr!=$("#xmfr").val() ||xmxx.jsdd!=$("#jsdd").val()	||xmxx.jsgm!=$("#jsgm").val() ||xmxx.tzlx!=$("#tzlxid").val()	
-			||xmxx.ztz!=$("#ztz").val()	||xmxx.xmhzjb!=$("#xmhzjbid").val() ||xmxx.axspjb!=$("#axspjbid").val()	||xmxx.axcd!=$("#axcd").val()	
-			||xmxx.bwdj!=$("#bwdj").val() ||xmxx.bwyt!=$("#bwyt").val() ||xmxx.tgnl!=$("#tgnl").val() ||xmxx.sddx!=$("#sddx").val() 
-			||xmxx.sddy!=$("#sddy").val()||xmxx.xddx!=$("#xddx").val() ||xmxx.xddy!=$("#xddy").val()){
+			var ztz = parseInt($("#ztz").val());
+			var axcd = parseInt($("#axcd").val());
+			if(xmxx.xmgk!=$("#xmgk").val()||xmxx.tzlx!=$("#tzlxid").val()||xmxx.sylx!=$("#sylxid").val()
+			||xmxx.jsdd!=$("#jsdd").val()||xmxx.jsgm!=$("#jsgm").val() ||xmxx.tzlx!=$("#tzlxid").val()	
+			||xmxx.ztz!=ztz	||xmxx.xmhzjb!=$("#xmhzjbid").val() ||xmxx.axspjb!=$("#axspjbid").val()	||xmxx.axcd!=axcd){
 				var form=data.attrs.straddform;
 				$.confirm({
 				    title: '提示框',

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -651,7 +651,6 @@ public class JsjdglCtl extends BaseWebCtl {
 		vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");
 		vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
 		vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");
-
 		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
 		vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");
 		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
@@ -2441,12 +2440,14 @@ public class JsjdglCtl extends BaseWebCtl {
 		XmxxglEntity entity = xmxxglService.findOne(xmid);
 		XmxxglVo vo = new XmxxglVo();
 		BeanUtils.copyProperties(entity, vo);
+		
 		vo.setJsgm(entity.getJsgm() != null ? entity.getJsgm() : "");
-		vo.setZtz(entity.getZtz() != null ? entity.getZtz() : 0);
-		vo.setAxcd(entity.getAxcd() != null ? entity.getAxcd() : 0);
-		vo.setBwdj(entity.getBwdj() != null ? entity.getBwdj() : 0);
+		vo.setXmgk(entity.getXmgk() != null ? entity.getXmgk() : "");
+		//vo.setZtz(entity.getZtz() != null ? entity.getZtz() : 0);
+		//vo.setAxcd(entity.getAxcd() != null ? entity.getAxcd() : 0);
+		//vo.setBwdj(entity.getBwdj() != null ? entity.getBwdj() : 0);
 		vo.setBwyt(entity.getBwyt() != null ? entity.getBwyt() : null);
-		vo.setTgnl(entity.getTgnl() != null ? entity.getTgnl() : 0);
+		//vo.setTgnl(entity.getTgnl() != null ? entity.getTgnl() : 0);
 		vo.setSddx(entity.getSddx() != null ? entity.getSddx() : "");
 		vo.setSddy(entity.getSddy() != null ? entity.getSddy() : "");
 		vo.setXddx(entity.getXddx() != null ? entity.getXddx() : "");
@@ -2457,7 +2458,12 @@ public class JsjdglCtl 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() : "");
-		vo.setSzd(entity.getSzd().getId());
+		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
+		vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");
+		vo.setJcsjstr(entity.getJcsj() != null ? new SimpleDateFormat("yyyy-MM-dd").format(entity.getJcsj()) : "");
+		vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");
+		vo.setAxspjb(entity.getAxspjb() != null ? entity.getAxspjb().getId() : "");
+		vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");
 		wr.setAttr("vo", vo);
 		wr.setAttr("jyr", entity.getJyrid());
 		wr.setAttr("straddform", straddform);