diff --git a/WebContent/Frame/resources/js/jquery/plugins/jquery.validate.extend.js b/WebContent/Frame/resources/js/jquery/plugins/jquery.validate.extend.js
index 0d058e960..65eb9f1b0 100644
--- a/WebContent/Frame/resources/js/jquery/plugins/jquery.validate.extend.js
+++ b/WebContent/Frame/resources/js/jquery/plugins/jquery.validate.extend.js
@@ -5,7 +5,7 @@ function isShortDate(value){
 	return /^[0-9]{4}\/[0-9]{2}\/[0-9]{2}$/g.test(value);
 }
 function isEmail(value){
-	return /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/g.test(value);
+	return /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[-|_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/g.test(value);
 }
 function isEmpty(value){
 	//alert("isEmpty");
@@ -75,7 +75,7 @@ jQuery.validator.prototype.showLabel = function(element,message){
 	}
 	this.toShow = this.toShow.add(label);
 };
-/*jquery.validate.js¹¦ÄÜÀ©Õ¹*/
+/*jquery.validate.js������չ*/
 jQuery.validator.addMethod("maxlength",function(value,element,params){
 	if(!value) value = "";
 	var cArr = value.match(/[^\x00-\xff]/ig);
@@ -108,21 +108,21 @@ jQuery.validator.addMethod("maxx",function(value,element,params){
 		return false;
 });
 
-//ͨ¹ýÔ¶³Ì¸³Öµ
+//ͨ��Զ�̸�ֵ
 function setItemValueFromRemote(dwname,rowindex,fieldName,javaClassName,params){
 	var sValue = remoteFetch(dwname,rowindex,javaClassName,params);
 	if(sValue!=null)
 		setItemValue(dwname,rowindex,fieldName,sValue);
 }
 
-//Ô¶³Ì»ñÈ¡Êý¾Ý
+//Զ�̻�ȡ���
 function remoteFetch(dwname,rowindex,javaClassName,params){
 	if(!isNaN(dwname))dwname = "myiframe" + dwname;
 	var dwindex = dwname.substring(8);
 	
 	var sUrl = sWebRootPath  + "/Frame/page/ow/RemoteFetch.jsp";
 	var param = "ClassName=" + javaClassName + "&rand="+Math.random();
-	var result = ['error','ÎÞ·¨Á¬½Ó·þÎñÆ÷'];
+	var result = ['error','�޷����ӷ�����'];
 	for(var i=0;i<params.length;i++){
 		if(params[i] && params[i]!=''){
 			var sParamName = params[i];
@@ -135,7 +135,7 @@ function remoteFetch(dwname,rowindex,javaClassName,params){
 			else
 				sParamValue = getItemValue(dwindex,rowindex,sParamName.toUpperCase());
 			if(sParamValue==undefined)sParamValue = "";
-			param += "&"+sParamName+"=" + sParamValue.replace(/&/g, "¡Ñ¡Õ¡õ");
+			param += "&"+sParamName+"=" + sParamValue.replace(/&/g, "�ѡա�");
 		}
 	}
 	$.ajax({
@@ -157,7 +157,7 @@ function remoteFetch(dwname,rowindex,javaClassName,params){
 	if(result[0]=='success')
 		return result[1];
 	else{
-		alert('Ô¶³Ì»ñÈ¡³ö´í£º'+ result[1]);
+		alert('Զ�̻�ȡ���?'+ result[1]);
 		return null;
 	}
 }
@@ -221,7 +221,7 @@ jQuery.validator.addMethod("classcheck",function(value,element,params,index){
 	//var sUrl = sWebRootPath  + "/Frame/page/ow/ValidClass.jsp";
 	var sUrl = sWebRootPath + params[0];
 	//alert("sUrl=" + sUrl);
-	var param = "ClassName=" + params[1] + "&rand="+Math.random()+"&Value=" + value.replace(/&/g, "¡Ñ¡Õ¡õ");
+	var param = "ClassName=" + params[1] + "&rand="+Math.random()+"&Value=" + value.replace(/&/g, "�ѡա�");
 	var result = false;
 	for(var i=3;i<=params.length;i++){
 		if(params[i] && params[i]!=''){
@@ -241,7 +241,7 @@ jQuery.validator.addMethod("classcheck",function(value,element,params,index){
 			}
 				
 			if(sParamValue==undefined)sParamValue = "";
-			if(sParamValue.length>0)sParamValue=sParamValue.replace(/&/g, "¡Ñ¡Õ¡õ");
+			if(sParamValue.length>0)sParamValue=sParamValue.replace(/&/g, "�ѡա�");
 			param += "&"+sParamName+"=" + sParamValue;
 		}
 	}
@@ -266,7 +266,7 @@ jQuery.validator.addMethod("classcheck",function(value,element,params,index){
 	});
 	return result;
 });
-//Èç¹ûÊDZ£´æÔòÑéÖ¤·Ç¿Õ,Èç¹ûÔÝ´æÔò²»ÑéÖ¤
+//����DZ�������֤�ǿ�,����ݴ�����֤
 jQuery.validator.addMethod("required0",function(value,element,param){
 	//alert(value +"|" + element.type + "|" + element.name + "|" +element.outerHTML);
 	if(SAVE_TMP==true){
@@ -325,7 +325,7 @@ jQuery.validator.addMethod("expressions",function(value,element,expressions,inde
 	}
 	if(errorInfos.length>0){
 		//alert(element.parentNode.innerHTML);
-		element.setAttribute("errorInfo",errorInfos.join(',²¢ÇÒ'));
+		element.setAttribute("errorInfo",errorInfos.join(',����'));
 		return false;
 	}
 	else
@@ -358,7 +358,7 @@ function isSpecialCharacter(value){
 }
 
 function addSpecialCharacterValidate(id2name){
-	return; // ¹Ø±ÕÌØÊâУÑéÇë´ò¿ªÐÐÊ××¢ÊÍ
+	return; // �ر�����У���������ע��
 	if(!window._user_validator){
 		window._user_validator = new Array();
 	}
@@ -375,7 +375,7 @@ function addSpecialCharacterValidate(id2name){
 		}else{
 			_user_validator[0]["rules"][id2name[i][0]]["SpecialCharacter"] = true;
 		}
-		var message = id2name[i][1]+"²»ÔÊÐíÌØÊâ×Ö·û¡¾!#$%^&*()[]{}<>¡¿";
+		var message = id2name[i][1]+"�����������ַ�!#$%^&*()[]{}<>��";
 		if(!_user_validator[0]["messages"][id2name[i][0]]){
 			_user_validator[0]["messages"][id2name[i][0]] = {"SpecialCharacter":message};
 		}else{
diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp
index d15e35ac8..757800d58 100644
--- a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp
@@ -30,6 +30,7 @@
 		dwTemp.ReadOnly = "1";
 		dwTemp.setPageSize(50);
 // 		dwTemp.genHTMLObjectWindow(docname+","+contract_id);
+		dwTemp.genHTMLObjectWindow(flowunid);
 
 		//0¡¢ÊÇ·ñչʾ 1¡¢	ȨÏÞ¿ØÖÆ  2¡¢ չʾÀàÐÍ 3¡¢°´Å¥ÏÔʾÃû³Æ 4¡¢°´Å¥½âÊÍÎÄ×Ö 5¡¢°´Å¥´¥·¢Ê¼þ´úÂë	6¡¢	7¡¢	8¡¢	9¡¢Í¼±ê£¬CSS²ãµþÑùʽ 10¡¢·ç¸ñ
 		String sButtons[][] =null;
@@ -120,7 +121,7 @@
 			tempParam["OBJECTTYPE"]="TriditionSuspension";
 			tempParam["FLOW_UNID"]="<%=flowunid%>";
 			tempParam["PROJ_ID"]="<%=projid%>";
-			tempParam["contract_id"]="<%=contract_id%>";
+			tempParam["CONTRACT_ID"]="<%=contract_id%>";
 			//Éú³ÉÄ£°å¹Ì¶¨²ÎÊý
 			tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
 			tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
@@ -131,11 +132,11 @@
 				  if(sparam.length>0){sparam+=",";}
 				   sparam+=key+"="+param[key];
 			}
-// 			var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentNotinyDeleteAction","deletequtation","plan_number="+plan_number+",plan_list="+plan_list);
+			var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentNotinyDeleteAction","deletequtation","plan_number=<%=flowunid%>,plan_list=TriditionSuspension");
 			var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
 			//wordתpdf
 			var id = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","FlowUnid=<%=flowunid%>,PLAN_LIST=TriditionSuspension");
-			
+			alert("Éú³É³É¹¦£¡£¡£¡");
 			reloadSelf();
 
 		}
diff --git a/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java b/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java
index 53d583993..8da410a8d 100644
--- a/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java
+++ b/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java
@@ -44,7 +44,12 @@ public class RentNotinyDeleteAction {
 	//¸ù¾Ýǰ̨²ÎÊýÉú³ÉÎĵµ
 	public void deletequtation(JBOTransaction tx) throws Exception{
 	    BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
-	    BizObject DOCRELATIVE=bom.createQuery("plan_number=:plan_number and plan_list=:plan_list").setParameter("plan_number",plan_number).setParameter("plan_list", plan_list).getSingleResult(false);
+	    BizObject DOCRELATIVE=null;
+	    if("TriditionSuspension".equals(plan_list)){
+	    	DOCRELATIVE=bom.createQuery("FLOW_UNID=:flowunid and OBJECTTYPE=:objecttype").setParameter("flowunid",plan_number).setParameter("objecttype", plan_list).getSingleResult(false);
+	    }else{
+	    	DOCRELATIVE=bom.createQuery("plan_number=:plan_number and plan_list=:plan_list").setParameter("plan_number",plan_number).setParameter("plan_list", plan_list).getSingleResult(false);
+	    }
 	   if(DOCRELATIVE!=null){
 		   String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString();
 		   BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);