Эх сурвалжийг харах

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

ld_jiangxf 8 жил өмнө
parent
commit
b218478982

+ 6 - 6
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp

@@ -20,15 +20,15 @@
 				jgsq.detail.gq ='${jyr.szgq.id}'
 				jgsq.detail.gk ='${jyr.szgk.id}'
 			}
-			//if('${ssFlag}' == '0'){
-			//	initszdSelect('szdsel', jgsq.detail.szd, 'showgk', '80%',true);
-			//	initgkSelect('gksel',jgsq.detail.gk,jgsq.detail.szd,'showgq','80%',true);
-			//	initgqSelect('gqsel',jgsq.detail.gq,jgsq.detail.szd,jgsq.detail.gk,null,'80%',true);
-			//}else{
+			if('${ssFlag}' == '0'){
+				jgsq.detail.initszdSelect('szdsel', jgsq.detail.szd, 'showgk', '80%',true);
+				jgsq.detail.initgkSelect('gksel',jgsq.detail.gk,jgsq.detail.szd,'showgq','80%',true);
+				jgsq.detail.initgqSelect('gqsel',jgsq.detail.gq,jgsq.detail.szd,jgsq.detail.gk,null,'80%',true);
+			}else{
 				initszdSelect('szdsel', jgsq.detail.szd, 'showgk', '80%');
 				initgkSelect('gksel',jgsq.detail.gk,jgsq.detail.szd,'showgq','80%');
 				initgqSelect('gqsel',jgsq.detail.gq,jgsq.detail.szd,jgsq.detail.gk,null,'80%');
-			//}
+			}
 			//水域类型
 			initSylxSelect('sylxsel', '${record.sylx }', '80%');
 			initXmlxSelect('xmlxsel', '${record.xmlx }', '80%');

+ 6 - 6
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgedit.jsp

@@ -20,15 +20,15 @@
 				jsjdbg.detail.gq ='${jyr.szgq.id}'
 				jsjdbg.detail.gk ='${jyr.szgk.id}'
 			}
-			//if('${ssFlag}' == '0'){
-				//initszdSelect('szdsel', jsjdbg.detail.szd, 'showgk', '80%',true);
-				//initgkSelect('gksel',jsjdbg.detail.gk,jsjdbg.detail.szd,'showgq','80%',true);
-				//initgqSelect('gqsel',jsjdbg.detail.gq,jsjdbg.detail.szd,jsjdbg.detail.gk,null,'80%',true);
-			//}else{
+			if('${ssFlag}' == '0'){
+				jsjdbg.detail.initszdSelect('szdsel', jsjdbg.detail.szd, 'showgk', '80%',true);
+				jsjdbg.detail.initgkSelect('gksel',jsjdbg.detail.gk,jsjdbg.detail.szd,'showgq','80%',true);
+				jsjdbg.detail.initgqSelect('gqsel',jsjdbg.detail.gq,jsjdbg.detail.szd,jsjdbg.detail.gk,null,'80%',true);
+			}else{
 				initszdSelect('szdsel', jsjdbg.detail.szd, 'showgk', '80%');
 				initgkSelect('gksel',jsjdbg.detail.gk,jsjdbg.detail.szd,'showgq','80%');
 				initgqSelect('gqsel',jsjdbg.detail.gq,jsjdbg.detail.szd,jsjdbg.detail.gk,null,'80%');
-			//}
+			}
 			initSylxSelect('sylxsel', '${record.sylx }', '80%');
 			initXmlxSelect('xmlxsel', '${record.xmlx }', '80%');
 			initTzlxSelect('tzlxsel', '${record.tzlx }', '80%');

+ 9 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp

@@ -20,12 +20,16 @@
 				jsjdcbsj.detail.gq ='${jyr.szgq.id}';
 				jsjdcbsj.detail.gk ='${jyr.szgk.id}';
 			}
-			if('${ssFlag}' == '0'){
-				$("#jcsj").attr('disabled','disabled');
+			if(jsjdcbsj.detail.ssFlag == '0'){
+				jsjdcbsj.detail.initszdSelect('szdsel', jsjdcbsj.detail.szd, 'showgk', '80%',true);
+				jsjdcbsj.detail.initgkSelect('gksel',jsjdcbsj.detail.gk,jsjdcbsj.detail.szd,'showgq','80%',true);
+				jsjdcbsj.detail.gqSelect('gqsel',jsjdcbsj.detail.gq,jsjdcbsj.detail.szd,jsjdcbsj.detail.gk,null,'80%',true);
+			}else{
+				initszdSelect('szdsel', jgsq.detail.szd, 'showgk', '80%');
+				initgkSelect('gksel',jgsq.detail.gk,jgsq.detail.szd,'showgq','80%');
+				initgqSelect('gqsel',jgsq.detail.gq,jgsq.detail.szd,jgsq.detail.gk,null,'80%');
 			}
-			initszdSelect('szdsel', jsjdcbsj.detail.szd, 'showgk', '80%');
-			initgkSelect('gksel',jsjdcbsj.detail.gk,jsjdcbsj.detail.szd,'showgq','80%');
-			initgqSelect('gqsel',jsjdcbsj.detail.gq,jsjdcbsj.detail.szd,jsjdcbsj.detail.gk,null,'80%');
+			
 			//水域类型
 			initSylxSelect('sylxsel', '${record.sylx }', '80%');
 			initXmlxSelect('xmlxsel', '${record.xmlx }', '80%');

+ 18 - 1
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdetail.js

@@ -343,6 +343,7 @@ jgsq.detail.submit=function(){
 	 
 	 
 	 $(".btn").attr("disabled",true);
+	 removeDisabled();
 	 $.ajax({
         url:$.app+"/jgsq/submit",
         data:$("#addform").serialize(),
@@ -418,7 +419,9 @@ if(data){
 str+="</select>";
 $("#"+divid).empty();
 $("#"+divid).append(str);
-
+if(jgsq.detail.ssFlag == '0'){
+	$('#tzlxid').attr('disabled',true);
+}
 $('.tzlxselectpicker').selectpicker({
 		width:width
 	});
@@ -902,4 +905,18 @@ function showRy() {
 function showYj() {
 	$('#selectyjdiv').fadeIn(100);
 	$('#selectyj2div').slideDown(0);
+}
+
+function removeDisabled(){
+	$('#szgkid').removeAttr('disabled');
+	$('#szdid').removeAttr('disabled');
+	$('#szgqid').removeAttr('disabled');
+	$('#sylxid').removeAttr('disabled');
+	$('#tzlxid').removeAttr('disabled');
+	$('#xmlxid').removeAttr('disabled');
+	$('#axspjbid').removeAttr('disabled');
+	$('#xmhzjbid').removeAttr('disabled');
+	$("#szgkid").removeAttr('disabled');
+	$("#szgqid").removeAttr('disabled');
+	$("#szdid").removeAttr('disabled');
 }

+ 18 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdbg/jsjdbgdetail.js

@@ -357,6 +357,7 @@ jsjdbg.detail.submit=function(){
 			}
 	 }
 	 $(".btn").attr("disabled",true);
+	 removeDisabled();
 	 $.ajax({
         url:$.app+"/jsjdbg/submit",
         data:$("#addform").serialize(),
@@ -432,6 +433,9 @@ if(data){
 str+="</select>";
 $("#"+divid).empty();
 $("#"+divid).append(str);
+if(jsjdbg.detail.ssFlag == '0'){
+	$('#tzlxid').attr('disabled',true);
+}
 $('.tzlxselectpicker').selectpicker({
 		width:width
 	});
@@ -1068,4 +1072,18 @@ jsjdbg.detail.xmxxxz=function(){
 
 jsjdbg.detail.choose=function(data){
 	location.href=$.app+"/jsjdbg/choose?id="+data;
+}
+
+function removeDisabled(){
+	$('#szgkid').removeAttr('disabled');
+	$('#szdid').removeAttr('disabled');
+	$('#szgqid').removeAttr('disabled');
+	$('#sylxid').removeAttr('disabled');
+	$('#tzlxid').removeAttr('disabled');
+	$('#xmlxid').removeAttr('disabled');
+	$('#axspjbid').removeAttr('disabled');
+	$('#xmhzjbid').removeAttr('disabled');
+	$("#szgkid").removeAttr('disabled');
+	$("#szgqid").removeAttr('disabled');
+	$("#szdid").removeAttr('disabled');
 }

+ 29 - 2
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdcbsj/jsjdcbsjdetail.js

@@ -358,7 +358,7 @@ jsjdcbsj.detail.submit = function() {
 	 }
 	
 	
-	
+	removeDisabled();
 	$(".btn").attr("disabled", true);
 	$.ajax({
 		url : $.app + "/jsjdcbsj/submit",
@@ -467,7 +467,9 @@ function initTzlxSelect(divid, existVal, width) {
 		str += "</select>";
 		$("#" + divid).empty();
 		$("#" + divid).append(str);
-
+		if(jsjdcbsj.detail.ssFlag == '0'){
+			$('#tzlxid').attr('disabled',true);
+		}
 		$('.tzlxselectpicker').selectpicker({
 			width : width
 		});
@@ -1001,4 +1003,29 @@ function showRy() {
 function showYj() {
 	$('#selectyjdiv').fadeIn(100);
 	$('#selectyj2div').slideDown(0);
+}
+
+/*function setDisabled(){
+	$('#szgkid').attr('disabled',true);
+	$('#szdid').attr('disabled',true);
+	$('#szgqid').attr('disabled',true);
+	$('#sylxid').attr('disabled',true);
+	$('#tzlxid').attr('disabled',true);
+	$('#xmlxid').attr('disabled',true);
+	$('#axspjbid').attr('disabled',true);
+	$('#xmhzjbid').attr('disabled',true);
+	$("#jcsj").attr('disabled',true);
+}*/
+function removeDisabled(){
+	$('#szgkid').removeAttr('disabled');
+	$('#szdid').removeAttr('disabled');
+	$('#szgqid').removeAttr('disabled');
+	$('#sylxid').removeAttr('disabled');
+	$('#tzlxid').removeAttr('disabled');
+	$('#xmlxid').removeAttr('disabled');
+	$('#axspjbid').removeAttr('disabled');
+	$('#xmhzjbid').removeAttr('disabled');
+	$("#szgkid").removeAttr('disabled');
+	$("#szgqid").removeAttr('disabled');
+	$("#szdid").removeAttr('disabled');
 }