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

gkjsjy/trunk/WebContent/static/biz/js/gkjcxx/xzdwxxgl/xzglryxx/xzglrymain.js

@@ -74,8 +74,8 @@ xzglry.main.inittable=function(data){
         		str+=code.phone==null?'':code.phone;
         		str+="</td>";
         		str+="<td class='operatetd'> " +
-        				"<a class='btn btn-default btn-xs' href='#'  title='修改' onclick=\"xzglry.main.edit('"+code.id+"')\">"+
-							"<i class='glyphicon glyphicon-wrench'></i></a> "+
+        				"<a class='btn btn-default btn-xs' href='#'  title='编辑' onclick=\"xzglry.main.edit('"+code.id+"')\">"+
+							"<i class='glyphicon glyphicon-pencil'></i></a> "+
 									"<a class='btn btn-default btn-xs' href='#' title='删除'  onclick=\"xzglry.main.del('"+code.id+"','"+code.ssbm+"')\">"+
 							"<i class='glyphicon glyphicon-trash'></i></a> "+
 										          "</td>";
@@ -202,7 +202,7 @@ xzglry.main.edit=function(id){
 	    	$('#editdzyx').val(data.dzyx);
 	    	$('#editcz').val(data.cz);
 	    	$('#editphone').val(data.phone);
-	    	$('#act2').text("修改");
+	    	$('#act2').text("编辑");
 	    	xzglry.main.show();
         } 
     }, "json");
@@ -285,7 +285,7 @@ xzglry.main.edit1=function(id){
 	    	$('#editsortno').val(data.sortno);
 	    	$('#editaddress').val(data.address);
 	    	$('#editemail').val(data.email);
-	    	$('#act1').text("修改");
+	    	$('#act1').text("编辑");
 	    	xzglry.main.show1();
         } 
     }, "json");

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/xmxxgl/xmxxgldetail.js

@@ -419,3 +419,80 @@ function ratesub() {
 				    }, "json");
 				}
 				 
+ xmxxgl.detail.initBw=function(divid, existVal,jyrid){
+	 $.post($.app+"/bw/selBw", {
+		 jyrid:jyrid
+   }, function(data) {
+       if (data) {
+       	var existValArr = existVal.split(",");
+  	 	var str = "";
+  		str+="<select multiple='multiple' onchange='selbw()' class='bwselectpicker' name='bwids' id='bwids' >";
+  			for(var i=0;i<data.length;i++){
+  				var flag = false;
+  				var bw = data[i];
+  				for(var j = 0; j < existValArr.length; j++){
+  					if(bw.id==existValArr[j]){
+  						flag = true;
+      					str+=" <option selected='selected' value='"+bw.id+"' >"+bw.bwmc+"</option>";
+      					break;
+      				} else {
+      					flag = false;
+      				}
+  				}
+  				if(!flag){
+  					str+=" <option value='"+bw.id+"' >"+bw.bwmc+"</option>";
+  				}
+  			}
+  		str+="</select>";
+  		$("#"+divid).empty();
+  		$("#"+divid).append(str);
+  		
+  		$('.bwselectpicker').selectpicker({
+  			width: '92%'
+      		});
+       } else {
+      	
+       }
+       selbw();
+   }, "json");
+};	
+
+function selbw(){
+	var bwids =$('.bwselectpicker').val() ;
+	if(!isEmpty(bwids)){
+		$.post($.app + "/bw/bwList",{
+			 bwids : ""+bwids
+		}, function(data) {
+	     if (data) {
+	    	 $('#bwtableID tr:gt(0)').each(function(){
+	  				$(this).remove();
+	  			});
+	    	 for(var i=0;i<data.length;i++){
+	  			var bw = data[i];
+	  			var str = "<tr>";
+	  			str+="<td>"+(i+1)+"</td>";
+	  			str +="<td ><a onclick=\"xmxxgl.detail.viewBw(\'"+bw.id+"\')\">"+bw.bwmc+"</td>";
+	  			str +="<td >"+bw.ssjyrzw+"</td>";
+	  			str +="<td >"+bw.ssmtzw+"</td>";
+	  			str +="<td >"+bw.szgkzw+"</td>";
+	  			str +="<td >"+bw.szgqzw+"</td>";
+	  			str +="<td >"+bw.bwytzw+"</td>";
+	  			str +="<td >"+bw.wxpbwzw+"</td>";
+	  			str +="<td >"+bw.sfdwkfzw+"</td>";
+		        str +="</tr>"
+		        $('#bwtableID').append(str);
+	    	 }	  	
+	     } 
+	 }, "json");
+	}else{
+		 $('#bwtableID tr:gt(0)').each(function(){
+				$(this).remove();
+			});
+	}
+}
+
+xmxxgl.detail.viewBw=function(id){
+	$('#selectbwdiv').fadeIn(100);
+	$('#selectbw2div').slideDown(0);
+	showBw(id);
+}

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/ry/rydetail.js

@@ -152,7 +152,7 @@ ry.detail.savezs=function(){
 		       		    	}
 		       		    	str+='<td>' +
 		       		    			'<a class="btn btn-default btn-xs" href="#"  data-toggle="modal" data-target="#myModal" onclick="ry.main.editzs(\''+data.message+'\')">' +
-		       		    			'<i class="glyphicon glyphicon-wrench"></i>修改</a>' +
+		       		    			'<i class="glyphicon glyphicon-pencil"></i>编辑</a>' +
 		       		    			'<a class="btn btn-default btn-xs" href="#" onclick="ry.main.delzs(\''+data.message+'\')">' +
 		       		    			'<i class="glyphicon glyphicon-trash"></i>删除</a>'+
 		       		    		 '</td>';

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkbg/xkzbgdetail.js

@@ -490,7 +490,7 @@ xkzbg.detail.jydyxz = function(){
 			'<a class="btn btn-default btn-xs" href="#" onclick="xkzbg.detail.del(\''+jyzl.id+'\')">' +
 			'<i class="glyphicon glyphicon-trash"></i>删除</a>'+
 			'<a class="btn btn-default btn-xs" href="#" onclick="xkzbg.detail.editjydy(\''+jyzl.id+'\')">' +
-			'<i class="glyphicon glyphicon-trash"></i>修改</a>'+
+			'<i class="glyphicon glyphicon-pencil"></i>编辑</a>'+
 			'</td>';
 		}
 		str+="</tr></table>";
@@ -677,7 +677,7 @@ xkzbg.detail.savejydy = function(){
 	    			'<a class="btn btn-default btn-xs" href="#" onclick="xkzbg.detail.del(\''+id+'\')">' +
 	    			'<i class="glyphicon glyphicon-trash"></i>删除</a>'+
 	    			'<a class="btn btn-default btn-xs" href="#" onclick="xkzbg.detail.editjydy(\''+id+'\')">' +
-	    			'<i class="glyphicon glyphicon-trash"></i>修改</a>'+
+	    			'<i class="glyphicon glyphicon-pencil"></i>编辑</a>'+
 	    			'</td>';
        		    	str+="</tr>";
        		    	$("#tb").append(str);

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzksq/xkzsqdetail.js

@@ -455,7 +455,7 @@ xkzsq.detail.jydyxz = function() {
 										+ '<a class="btn btn-default btn-xs" href="#" onclick="xkzsq.detail.editjydy(\''
 										+ jyzl.id
 										+ '\')">'
-										+ '<i class="glyphicon glyphicon-trash"></i>修改</a>'
+										+ '<i class="glyphicon glyphicon-pencil"></i>编辑</a>'
 										+ '</td>';
 							}
 							str += "</tr></table>";
@@ -681,7 +681,7 @@ xkzsq.detail.savejydy = function() {
 								+ '<a class="btn btn-default btn-xs" href="#" onclick="xkzsq.detail.editjydy(\''
 								+ id
 								+ '\')">'
-								+ '<i class="glyphicon glyphicon-trash"></i>修改</a>'
+								+ '<i class="glyphicon glyphicon-pencil"></i>编辑</a>'
 								+ '</td>';
 						str += "</tr>";
 						$("#tb").append(str);

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkyx/xkzyxdetail.js

@@ -474,7 +474,7 @@ xkzyx.detail.jydyxz = function() {
 										+ '<a class="btn btn-default btn-xs" href="#" onclick="xkzyx.detail.editjydy(\''
 										+ jyzl.id
 										+ '\')">'
-										+ '<i class="glyphicon glyphicon-trash"></i>修改</a>'
+										+ '<i class="glyphicon glyphicon-pencil"></i>编辑</a>'
 										+ '</td>';
 							}
 							str += "</tr></table>";
@@ -684,7 +684,7 @@ xkzyx.detail.savejydy = function() {
 	    			'<a class="btn btn-default btn-xs" href="#" onclick="xkzyx.detail.del(\''+id+'\')">' +
 	    			'<i class="glyphicon glyphicon-trash"></i>删除</a>'+
 	    			'<a class="btn btn-default btn-xs" href="#" onclick="xkzyx.detail.editjydy(\''+id+'\')">' +
-	    			'<i class="glyphicon glyphicon-trash"></i>修改</a>'+
+	    			'<i class="glyphicon glyphicon-pencil"></i>编辑</a>'+
 	    			'</td>';
        		    	str+="</tr>";
        		    	$("#tb").append(str);

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgdetail.js

@@ -9,13 +9,22 @@ lhbg.detail.selData=null;
 lhbg.detail.szdData=null;
 lhbg.detail.gk = null;
 lhbg.detail.gq = null;
-
+lhbg.detail.taskKey=null;
 lhbg.detail.init = function() {
 	initgkSelect('gksel', '', lhbg.detail.szdData,'showgq', 300);
 	initgqSelect('gqsel','','','',null,300);
 	initzyqSelect('zyqsel','','',null,300);
 }
 
+function showRy() {
+	$('#selectrydiv').fadeIn(100);
+	$('#selectry2div').slideDown(0);
+}
+
+function showYj() {
+	$('#selectyjdiv').fadeIn(100);
+	$('#selectyj2div').slideDown(0);
+}
 
 lhbg.detail.delData=function(data){
 	$.confirm({
@@ -147,6 +156,16 @@ lhbg.detail.save = function(){
 
 //保存
 lhbg.detail.submit = function(){
+	if (isEmpty($('#userids').val())) {
+		$.alert({
+			title : '提示',
+			content : "请选择人员办理！！！",
+			confirm : function() {
+				$(".btn").attr("disabled", false);
+			}
+		});
+		return false;
+	}
 	//验证必填字段是否为空
 	if(vae($('#addform input[name=jyrmc]'),"港口经营人名称")==false){return false;}
 	//验证必填字段是否为空
@@ -271,6 +290,21 @@ lhbg.detail.delFj = function(accid,tr){
 
 
 lhbg.detail.audit=function(auditpass,id){
+	if (auditpass == "Y" && lhbg.detail.taskKey != 'ldpz') {
+		if (isEmpty($('#userids').val())) {
+			$.alert({
+				title : '提示',
+				content : "请选择人员办理！！！",
+				confirm : function() {
+					$(".btn").attr("disabled", false);
+				}
+			});
+			return false;
+		}
+	}
+	
+	
+	var shyj = $('#yj').val();
 	var opflag = $('#opflag').val();
 	var audit;
 	var shyj;
@@ -282,7 +316,8 @@ lhbg.detail.audit=function(auditpass,id){
 	$.post($.app + "/lhbg/audit", {
 		id:id,
         shyj:shyj,
-        flag:audit
+        flag:audit,
+        userids:$('#userids').val()
     }, function(data) {
     	if (data.success) {
     		
@@ -309,6 +344,16 @@ lhbg.detail.audit=function(auditpass,id){
 
 
 lhbg.detail.submitAudit=function(){
+	if (isEmpty($('#userids').val())) {
+		$.alert({
+			title : '提示',
+			content : "请选择人员办理！！！",
+			confirm : function() {
+				$(".btn").attr("disabled", false);
+			}
+		});
+		return false;
+	}
 	 $.ajax({
          url:$.app + "/lhbg/submitAudit",
          data:$("#addform").serialize(),

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhbg/lhbgmain.js

@@ -94,3 +94,26 @@ lhbg.main.view=function(data){
 	location.href=$.app+"/lhbg/view?id="+data;
 }
 
+lhbg.main.submit=function(data){
+	 $.post($.app + "/lhbg/saveTbzt", {
+       id : data
+   }, function(data) {
+       if (data.success) {
+      	 $.alert({
+      		    title: '提示',
+      		    content: '转办省级成功',
+      		    confirm: function(){
+      		    	 $("#lhbgform").submit();
+      		    }
+      	 });
+       } else {
+      	 $.alert({
+   		    title: '提示',
+   		    content: data.message,
+   		    confirm: function(){
+   		        
+   		    }
+   	 });
+       }
+   }, "json");
+}

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhsq/lhsqdetail.js

@@ -10,12 +10,20 @@ lhsq.detail.szdData = null;
 lhsq.detail.gk = null;
 lhsq.detail.gq = null;
 lhsq.detail.path = null;
-
+lhsq.detail.taskKey=null;
 lhsq.detail.init = function() {
 	
 }
 
+function showRy() {
+	$('#selectrydiv').fadeIn(100);
+	$('#selectry2div').slideDown(0);
+}
 
+function showYj() {
+	$('#selectyjdiv').fadeIn(100);
+	$('#selectyj2div').slideDown(0);
+}
 
 
 //返回
@@ -56,7 +64,7 @@ lhsq.detail.save = function() {
 					title : '提示',
 					content : data.message,
 					confirm : function() {
-
+						$(".btn").attr("disabled",false);
 					}
 				});
 			}
@@ -66,6 +74,16 @@ lhsq.detail.save = function() {
 
 //保存
 lhsq.detail.submit = function() {
+	if (isEmpty($('#userids').val())) {
+		$.alert({
+			title : '提示',
+			content : "请选择人员办理！！！",
+			confirm : function() {
+				$(".btn").attr("disabled", false);
+			}
+		});
+		return false;
+	}
 	$(".btn").attr("disabled",true);
 	$.ajax({
 		url : $.app + "/lhsq/submit",
@@ -86,7 +104,7 @@ lhsq.detail.submit = function() {
 					title : '提示',
 					content : data.message,
 					confirm : function() {
-
+						$(".btn").attr("disabled",false);
 					}
 				});
 			}
@@ -116,7 +134,7 @@ lhsq.detail.delData=function(data){
              		    title: '提示',
              		    content: data.message,
              		    confirm: function(){
-             		        
+             		    	$(".btn").attr("disabled",false);
              		    }
              	 });
                  }
@@ -228,7 +246,21 @@ function deltr(tr){
 }
 
 lhsq.detail.audit=function(auditpass,id){
-	var shyj="";
+	if (auditpass == "Y" && lhsq.detail.taskKey != 'ldpz') {
+		if (isEmpty($('#userids').val())) {
+			$.alert({
+				title : '提示',
+				content : "请选择人员办理！！！",
+				confirm : function() {
+					$(".btn").attr("disabled", false);
+				}
+			});
+			return false;
+		}
+	}
+	
+	
+	var shyj = $('#yj').val();
 	
 	var audit;
 	if(auditpass=="Y"){
@@ -239,7 +271,8 @@ lhsq.detail.audit=function(auditpass,id){
 	$.post($.app + "/lhsq/audit", {
 		id:id,
         shyj:shyj,
-        flag:audit
+        flag:audit,
+        userids:$('#userids').val()
     }, function(data) {
     	if (data.success) {
     		
@@ -266,6 +299,16 @@ lhsq.detail.audit=function(auditpass,id){
 
 
 lhsq.detail.submitAudit=function(){
+	if (isEmpty($('#userids').val())) {
+		$.alert({
+			title : '提示',
+			content : "请选择人员办理！！！",
+			confirm : function() {
+				$(".btn").attr("disabled", false);
+			}
+		});
+		return false;
+	}
 	 $.ajax({
          url:$.app + "/lhsq/submitAudit",
          data:$("#addform").serialize(),

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhsq/lhsqmain.js

@@ -90,3 +90,28 @@ lhsq.main.add = function() {
 lhsq.main.banli=function(data){
 	location.href=$.app+"/lhsq/view?flag=audit&id="+data;
 }
+
+
+lhsq.main.submit=function(data){
+	 $.post($.app + "/lhsq/saveTbzt", {
+        id : data
+    }, function(data) {
+        if (data.success) {
+       	 $.alert({
+       		    title: '提示',
+       		    content: '转办省级成功',
+       		    confirm: function(){
+       		    	 $("#lhsqform").submit();
+       		    }
+       	 });
+        } else {
+       	 $.alert({
+    		    title: '提示',
+    		    content: data.message,
+    		    confirm: function(){
+    		        
+    		    }
+    	 });
+        }
+    }, "json");
+}

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhyx/lhyxdetail.js

@@ -9,13 +9,24 @@ lhyx.detail.selData=null;
 lhyx.detail.szdData=null;
 lhyx.detail.gk = null;
 lhyx.detail.gq = null;
-
+lhyx.detail.taskKey=null;
 lhyx.detail.init = function() {
 	initgkSelect('gksel', '', lhyx.detail.szdData,'showgq', 300);
 	initgqSelect('gqsel','','','',null,300);
 	initzyqSelect('zyqsel','','',null,300);
 }
 
+function showRy() {
+	$('#selectrydiv').fadeIn(100);
+	$('#selectry2div').slideDown(0);
+}
+
+function showYj() {
+	$('#selectyjdiv').fadeIn(100);
+	$('#selectyj2div').slideDown(0);
+}
+
+
 
 lhyx.detail.delData=function(data){
 	$.confirm({
@@ -136,6 +147,17 @@ lhyx.detail.save = function(){
 
 //保存
 lhyx.detail.submit = function(){
+	if (isEmpty($('#userids').val())) {
+		$.alert({
+			title : '提示',
+			content : "请选择人员办理！！！",
+			confirm : function() {
+				$(".btn").attr("disabled", false);
+			}
+		});
+		return false;
+	}
+	
 	//验证必填字段是否为空
 	if(vae($('#addform input[name=jyrmc]'),"港口经营人名称")==false){return false;}
 	//验证必填字段是否为空
@@ -248,7 +270,19 @@ lhyx.detail.delFj = function(accid,tr){
 
 
 lhyx.detail.audit=function(auditpass,id){
-	var shyj="";
+	if (auditpass == "Y" && lhyx.detail.taskKey != 'ldpz') {
+		if (isEmpty($('#userids').val())) {
+			$.alert({
+				title : '提示',
+				content : "请选择人员办理！！！",
+				confirm : function() {
+					$(".btn").attr("disabled", false);
+				}
+			});
+			return false;
+		}
+	}
+	var shyj=$('#yj').val();
 	
 	var audit;
 	if(auditpass=="Y"){
@@ -259,7 +293,8 @@ lhyx.detail.audit=function(auditpass,id){
 	$.post($.app + "/lhyx/audit", {
 		id:id,
         shyj:shyj,
-        flag:audit
+        flag:audit,
+        userids:$('#userids').val()
     }, function(data) {
     	if (data.success) {
     		
@@ -286,6 +321,16 @@ lhyx.detail.audit=function(auditpass,id){
 
 
 lhyx.detail.submitAudit=function(){
+	if (isEmpty($('#userids').val())) {
+		$.alert({
+			title : '提示',
+			content : "请选择人员办理！！！",
+			confirm : function() {
+				$(".btn").attr("disabled", false);
+			}
+		});
+		return false;
+	}
 	 $.ajax({
          url:$.app + "/lhyx/submitAudit",
          data:$("#addform").serialize(),

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gklhxkgl/gkjylhyx/lhyxmain.js

@@ -8,89 +8,109 @@ lhyx.main.szd = null;
 lhyx.main.szgq = null;
 lhyx.main.szgk = null;
 
-
 lhyx.main.init = function() {
-	
+
 	lhyx.main.sel();
 	// 把form传入，构造翻页控件
 	pageinfo($("#lhyxform"));
 }
 
-lhyx.main.sel = function(){
+lhyx.main.sel = function() {
 	initszdSelect('szdsel', lhyx.main.szd, 'showgk', '80%');
-	initgkSelect('gksel', lhyx.main.szgk,  lhyx.main.szd,'showgq', '80%');
-	initgqSelect('gqsel', lhyx.main.szgq,  lhyx.main.szd,lhyx.main.szgk, null, '80%');
+	initgkSelect('gksel', lhyx.main.szgk, lhyx.main.szd, 'showgq', '80%');
+	initgqSelect('gqsel', lhyx.main.szgq, lhyx.main.szd, lhyx.main.szgk, null,
+			'80%');
 }
 
 function showgk() {
-	initgqSelect('gqsel','','','',null,200);
+	initgqSelect('gqsel', '', '', '', null, 200);
 	initgkSelect('gksel', lhyx.main.szgk, $('.szdselectpicker').val(),
 			'showgq', '80%');
 }
 
 function showgq() {
-	initgqSelect('gqsel', lhyx.main.szgq, $('.szdselectpicker').val(),
-			$('.gkselectpicker').val(), null, '80%');
+	initgqSelect('gqsel', lhyx.main.szgq, $('.szdselectpicker').val(), $(
+			'.gkselectpicker').val(), null, '80%');
 }
 
-
-//新增
+// 新增
 lhyx.main.add = function() {
-	
-	location.href=$.app+"/lhyx/add";
-			
-	
+
+	location.href = $.app + "/lhyx/add";
+
 }
 
-lhyx.main.search=function(){
+lhyx.main.search = function() {
 	$("#lhyxform").submit();
 }
 
-lhyx.main.del=function(data){
+lhyx.main.del = function(data) {
 	$.confirm({
-	    title: '确认框',
-	    content: '确认删除吗',
-	    confirm: function(){
-	    	 $.post($.app + "/lhyx/delete", {
-                 id : data
-             }, function(data) {
-                 if (data.success) {
-                	 $.alert({
-                		    title: '提示',
-                		    content: '删除成功',
-                		    confirm: function(){
-                		    	$("#lhyxform").submit();
-                		    }
-                	 });
-                 } else {
-                	 $.alert({
-             		    title: '提示',
-             		    content: data.message,
-             		    confirm: function(){
-             		        
-             		    }
-             	 });
-                 }
-             }, "json");
-	    },
-	    cancel: function(){
-	    }
+		title : '确认框',
+		content : '确认删除吗',
+		confirm : function() {
+			$.post($.app + "/lhyx/delete", {
+				id : data
+			}, function(data) {
+				if (data.success) {
+					$.alert({
+						title : '提示',
+						content : '删除成功',
+						confirm : function() {
+							$("#lhyxform").submit();
+						}
+					});
+				} else {
+					$.alert({
+						title : '提示',
+						content : data.message,
+						confirm : function() {
+
+						}
+					});
+				}
+			}, "json");
+		},
+		cancel : function() {
+		}
 	});
 }
 
-lhyx.main.edit=function(data){
-	location.href=$.app+"/lhyx/edit?id="+data;
+lhyx.main.edit = function(data) {
+	location.href = $.app + "/lhyx/edit?id=" + data;
 }
 
-lhyx.main.back=function(data){
-	location.href=$.app+"/lhyx/edit?flag=th&id="+data;
+lhyx.main.back = function(data) {
+	location.href = $.app + "/lhyx/edit?flag=th&id=" + data;
 }
 
-lhyx.main.banli=function(data){
-	location.href=$.app+"/lhyx/view?flag=audit&id="+data;
+lhyx.main.banli = function(data) {
+	location.href = $.app + "/lhyx/view?flag=audit&id=" + data;
 }
 
-lhyx.main.view=function(data){
-	location.href=$.app+"/lhyx/view?id="+data;
+lhyx.main.view = function(data) {
+	location.href = $.app + "/lhyx/view?id=" + data;
 }
+lhyx.main.submit = function(data) {
+	$.post($.app + "/lhyx/saveTbzt", {
+		id : data
+	}, function(data) {
+		if (data.success) {
+			$.alert({
+				title : '提示',
+				content : '转办省级成功',
+				confirm : function() {
+					$("#lhyxform").submit();
+				}
+			});
+		} else {
+			$.alert({
+				title : '提示',
+				content : data.message,
+				confirm : function() {
 
+				}
+			});
+		}
+	}, "json");
+}

gkjsjy/trunk/WebContent/static/biz/js/set/code/codemain.js

@@ -39,8 +39,8 @@ code.main.inittable=function(data){
         		str+="<td >"+gc+"</td>";
         		str+="<td >"+code.sortno+"</td>";
         		str+="<td class='operatetd'> " +
-        				"<a class='btn btn-default btn-xs' href='#' title='修改'  onclick=\"code.main.edit('"+code.id+"')\">"+
-							"<i class='glyphicon glyphicon-wrench'></i></a> "+
+        				"<a class='btn btn-default btn-xs' href='#' title='编辑'  onclick=\"code.main.edit('"+code.id+"')\">"+
+							"<i class='glyphicon glyphicon-pencil'></i></a> "+
 									"<a class='btn btn-default btn-xs' href='#' title='删除'  onclick=\"code.main.del('"+code.id+"','"+code.pid+"')\">"+
 							"<i class='glyphicon glyphicon-trash'></i></a> "+
 										          "</td>";

gkjsjy/trunk/WebContent/static/biz/js/set/menu/menumain.js

@@ -57,8 +57,8 @@ menu.main.initmenutable=function(data){
         		str+="<td >"+iconcls+"</td>";
         		str+="<td >"+menu.sortno+"</td>";
         		str+="<td class='operatetd'> " +
-        				"<a class='btn btn-default btn-xs' href='#'  title='修改' onclick=\"menu.main.menuedit('"+menu.id+"')\">"+
-							"<i class='glyphicon glyphicon-wrench'></i></a> "+
+        				"<a class='btn btn-default btn-xs' href='#'  title='编辑' onclick=\"menu.main.menuedit('"+menu.id+"')\">"+
+							"<i class='glyphicon glyphicon-pencil'></i></a> "+
 									"<a class='btn btn-default btn-xs' href='#'  title='删除' onclick=\"menu.main.menudel('"+menu.id+"','"+menu.pid+"')\">"+
 							"<i class='glyphicon glyphicon-trash'></i></a> "+
 										          "</td>";
@@ -234,7 +234,7 @@ menu.main.initfunctable=function(data){
         		str+="<td >"+func.sortno+"</td>";
         		str+="<td > " +
         				"<a class='btn btn-default btn-xs' href='#'  onclick=\"menu.main.funcedit('"+func.id+"')\">"+
-							"<i class='glyphicon glyphicon-wrench'></i>修改</a> "+
+							"<i class='glyphicon glyphicon-pencil'></i>编辑</a> "+
 									"<a class='btn btn-default btn-xs' href='#'  onclick=\"menu.main.funcdel('"+func.id+"','"+func.mid+"')\">"+
 							"<i class='glyphicon glyphicon-wrench'></i>删除</a> "+
 										          "</td>";

gkjsjy/trunk/WebContent/static/biz/js/set/org/orgmain.js

@@ -36,8 +36,8 @@ org.main.inittable=function(data){
         		str+="<td >"+org.remark+"</td>";
         		str+="<td >"+org.sortno+"</td>";
         		str+="<td class='operatetd'> " +
-        				"<a class='btn btn-default btn-xs' href='#'  title='修改' onclick=\"org.main.edit('"+org.id+"')\">"+
-							"<i class='glyphicon glyphicon-wrench'></i></a> "+
+        				"<a class='btn btn-default btn-xs' href='#'  title='编辑' onclick=\"org.main.edit('"+org.id+"')\">"+
+							"<i class='glyphicon glyphicon-pencil'></i></a> "+
 									"<a class='btn btn-default btn-xs' href='#'  title='删除' onclick=\"org.main.del('"+org.id+"','"+org.pid+"')\">"+
 							"<i class='glyphicon glyphicon-wrench'></i></a> "+
 										          "</td>";

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/vo/LhyxVo.java

@@ -22,28 +22,54 @@ public class LhyxVo extends BaseVo {
 	// 联系人
 	private String lxr = null;
 
-	private String zcdz=null;
-	private String fddbr=null;
-	private String gsyyzzbh=null;
-	private String zczb=null;
-	private String lxdh=null;
-	private String jydy=null;
-	private Date yxrq = null; 
+	private String zcdz = null;
+	private String fddbr = null;
+	private String gsyyzzbh = null;
+	private String zczb = null;
+	private String lxdh = null;
+	private String jydy = null;
+	private Date yxrq = null;
 	private String ygzs = null;
 	private String lhys = null;
-	private String yysr=null;
-	private String lhl=null;
-	private String lxl=null;
-	private String yysrr=null;
-	private String lhll= null;
-	private String lxll= null;
+	private String yysr = null;
+	private String lhl = null;
+	private String lxl = null;
+	private String yysrr = null;
+	private String lhll = null;
+	private String lxll = null;
 	// 审批经办人
 	private String spry = null;
 	private String taskState = null;
-	
-	private String oneyear =null;
+
+	private String oneyear = null;
 	private String twoyear = null;
-	
+	private String sftb = null;
+	private String tbzt = null;
+	private String currentname = null;
+
+	public String getSftb() {
+		return sftb;
+	}
+
+	public void setSftb(String sftb) {
+		this.sftb = sftb;
+	}
+
+	public String getTbzt() {
+		return tbzt;
+	}
+
+	public void setTbzt(String tbzt) {
+		this.tbzt = tbzt;
+	}
+
+	public String getCurrentname() {
+		return currentname;
+	}
+
+	public void setCurrentname(String currentname) {
+		this.currentname = currentname;
+	}
 
 	public String getOneyear() {
 		return oneyear;
@@ -64,147 +90,193 @@ public class LhyxVo extends BaseVo {
 	public String getId() {
 		return id;
 	}
+
 	public void setId(String id) {
 		this.id = id;
 	}
+
 	public String getJyrid() {
 		return jyrid;
 	}
+
 	public void setJyrid(String jyrid) {
 		this.jyrid = jyrid;
 	}
+
 	public String getJyrmc() {
 		return jyrmc;
 	}
+
 	public void setJyrmc(String jyrmc) {
 		this.jyrmc = jyrmc;
 	}
+
 	public GkEntity getSzgk() {
 		return szgk;
 	}
+
 	public void setSzgk(GkEntity szgk) {
 		this.szgk = szgk;
 	}
+
 	public GqEntity getSzgq() {
 		return szgq;
 	}
+
 	public void setSzgq(GqEntity szgq) {
 		this.szgq = szgq;
 	}
+
 	public String getXkzbh() {
 		return xkzbh;
 	}
+
 	public void setXkzbh(String xkzbh) {
 		this.xkzbh = xkzbh;
 	}
+
 	public String getLxr() {
 		return lxr;
 	}
+
 	public void setLxr(String lxr) {
 		this.lxr = lxr;
 	}
+
 	public String getZcdz() {
 		return zcdz;
 	}
+
 	public void setZcdz(String zcdz) {
 		this.zcdz = zcdz;
 	}
+
 	public String getFddbr() {
 		return fddbr;
 	}
+
 	public void setFddbr(String fddbr) {
 		this.fddbr = fddbr;
 	}
+
 	public String getGsyyzzbh() {
 		return gsyyzzbh;
 	}
+
 	public void setGsyyzzbh(String gsyyzzbh) {
 		this.gsyyzzbh = gsyyzzbh;
 	}
+
 	public String getZczb() {
 		return zczb;
 	}
+
 	public void setZczb(String zczb) {
 		this.zczb = zczb;
 	}
+
 	public String getLxdh() {
 		return lxdh;
 	}
+
 	public void setLxdh(String lxdh) {
 		this.lxdh = lxdh;
 	}
+
 	public String getJydy() {
 		return jydy;
 	}
+
 	public void setJydy(String jydy) {
 		this.jydy = jydy;
 	}
+
 	public Date getYxrq() {
 		return yxrq;
 	}
+
 	public void setYxrq(Date yxrq) {
 		this.yxrq = yxrq;
 	}
+
 	public String getYgzs() {
 		return ygzs;
 	}
+
 	public void setYgzs(String ygzs) {
 		this.ygzs = ygzs;
 	}
+
 	public String getLhys() {
 		return lhys;
 	}
+
 	public void setLhys(String lhys) {
 		this.lhys = lhys;
 	}
+
 	public String getYysr() {
 		return yysr;
 	}
+
 	public void setYysr(String yysr) {
 		this.yysr = yysr;
 	}
+
 	public String getLhl() {
 		return lhl;
 	}
+
 	public void setLhl(String lhl) {
 		this.lhl = lhl;
 	}
+
 	public String getLxl() {
 		return lxl;
 	}
+
 	public void setLxl(String lxl) {
 		this.lxl = lxl;
 	}
+
 	public String getYysrr() {
 		return yysrr;
 	}
+
 	public void setYysrr(String yysrr) {
 		this.yysrr = yysrr;
 	}
+
 	public String getLhll() {
 		return lhll;
 	}
+
 	public void setLhll(String lhll) {
 		this.lhll = lhll;
 	}
+
 	public String getLxll() {
 		return lxll;
 	}
+
 	public void setLxll(String lxll) {
 		this.lxll = lxll;
 	}
+
 	public String getSpry() {
 		return spry;
 	}
+
 	public void setSpry(String spry) {
 		this.spry = spry;
 	}
+
 	public String getTaskState() {
 		return taskState;
 	}
+
 	public void setTaskState(String taskState) {
 		this.taskState = taskState;
 	}
 
-	
 }

gkjsjy/trunk/src/com/xt/jygl/workflow/dao/TaskInfoDao.java

@@ -40,7 +40,7 @@ public interface TaskInfoDao extends SecRepository<TaskInfoEntity, String> {
 	@Query("from TaskInfoEntity where busId = ?1 and busKey = ?2 and state = 3")
 	public List<TaskInfoEntity> findByBusIdAndBusKeyAndRecordStatus(String busId, String busKey);
 
-	@Query(value = "select t.*  from GK_OPERATION_JSJY_TASK t where t.bus_id = ?1 and t.bus_key = ?2 and t.state=3 and t.step = (select max(to_number(step)) from GK_OPERATION_JSJY_TASK where bus_id = ?1 and bus_key = ?2)", nativeQuery = true)
+	@Query(value = "select t.*  from GK_OPERATION_JSJY_TASK t where t.bus_id = ?1 and t.bus_key = ?2 and t.state=3 and t.step = (select max(to_number(step)) from GK_OPERATION_JSJY_TASK where bus_id = ?1 and bus_key = ?2 and state = 3)", nativeQuery = true)
 	public TaskInfoEntity findByStep(String busId, String busKey);
 
 	@Query("from TaskInfoEntity where busId = ?1 and taskKey = ?2 and sfth is null")