anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改合同终止模板带出之前的模板和邮件校验添加安鹏公司邮件格式

Browse Source
This commit is contained in:
tangfutang 2018-10-10 16:14:17 +08:00
parent d6e2d94c19
commit 076e41193e
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
WebContent/Frame/resources/js/jquery/plugins/jquery.validate.extend.js
View File

@ -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<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>չ*/
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;
});
//通过远程赋值
//ͨ<EFBFBD><EFBFBD>Զ<EFBFBD≯<EFBFBD>ֵ
function setItemValueFromRemote(dwname,rowindex,fieldName,javaClassName,params){
var sValue = remoteFetch(dwname,rowindex,javaClassName,params);
if(sValue!=null)
setItemValue(dwname,rowindex,fieldName,sValue);
}
//远程获取数据
//Զ<EFBFBD>̻<EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD>
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','<EFBFBD>޷<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӷ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'];
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, "<EFBFBD>ѡա<EFBFBD>");
}
}
$.ajax({
@ -157,7 +157,7 @@ function remoteFetch(dwname,rowindex,javaClassName,params){
if(result[0]=='success')
return result[1];
else{
alert('远程获取出错：'+ result[1]);
alert('Զ<EFBFBD>̻<EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD>?'+ 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, "<EFBFBD>ѡա<EFBFBD>");
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, "<EFBFBD>ѡա<EFBFBD>");
param += "&"+sParamName+"=" + sParamValue;
}
}
@ -266,7 +266,7 @@ jQuery.validator.addMethod("classcheck",function(value,element,params,index){
});
return result;
});
//如果是保存则验证非空,如果暂存则不验证
//<EFBFBD><EFBFBD><EFBFBD><EFBFBD>DZ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD>ǿ<EFBFBD>,<2C><><EFBFBD><EFBFBD>ݴ<EFBFBD><DDB4><EFBFBD><EFBFBD><EFBFBD>֤
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(',<EFBFBD><EFBFBD><EFBFBD><EFBFBD>'));
return false;
}
else
@ -358,7 +358,7 @@ function isSpecialCharacter(value){
}
function addSpecialCharacterValidate(id2name){
return; // 关闭特殊校验请打开行首注释
return; // <EFBFBD>ر<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><EFBFBD>
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]+"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD>!#$%^&*()[]{}<><3E><>";
if(!_user_validator[0]["messages"][id2name[i][0]]){
_user_validator[0]["messages"][id2name[i][0]] = {"SpecialCharacter":message};
}else{

7
WebContent/Tenwa/Lease/Flow/RentNotify/TriditionSuspensionList.jsp
View File

@ -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();
}

7
src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java
View File

@ -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);