diff --git a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp index 783a3b65b..68987a448 100644 --- a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp +++ b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp @@ -40,13 +40,19 @@ var docList="<%=docList%>"; myleft.width=1; if("SingleRow"=="<%=type%>"){ - if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"||"ProjectRecreditFlow"=="<%=sFlowNo%>"||"ProjectSupportFlow"=="<%=sFlowNo%>"||"ProjectApprovalFlow"=="<%=sFlowNo%>"||"FundPaymentFlow"=="<%=sFlowNo%>"||"ProjectCancelFlow"=="<%=sFlowNo%>"||"ContractApprovalFlow"=="<%=sFlowNo%>"){ + if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"||"ProjectRecreditFlow"=="<%=sFlowNo%>"||"ProjectSupportFlow"=="<%=sFlowNo%>"||"ProjectApprovalFlow"=="<%=sFlowNo%>"||"FundPaymentFlow"=="<%=sFlowNo%>"||"ProjectCancelFlow"=="<%=sFlowNo%>"){ AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right",""); + }else if("ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractApprovalFlow"=="<%=sFlowNo%>"){ + AsControl.OpenView("/Tenwa/Comm/DocList/PayDocListTradition.jsp","docList="+docList,"right",""); }else{ AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right",""); } }else{ - AsControl.OpenView("/Tenwa/Comm/DocList/CustomerDocTab.jsp","docList="+docList,"right",""); + if("ContractApprovalFlow"=="<%=sFlowNo%>"||"ContractChangeFlow"=="<%=sFlowNo%>"||"ProjectChangeFlow"=="<%=sFlowNo%>"){ + AsControl.OpenView("/Tenwa/Comm/DocList/PayDocListTradition.jsp","docList="+docList,"right",""); + }else{ + AsControl.OpenView("/Tenwa/Comm/DocList/CustomerDocTab.jsp","docList="+docList,"right",""); + } } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Comm/Document/LBDocumentInfo.jsp b/WebContent/Tenwa/Comm/Document/LBDocumentInfo.jsp index 2a86fbf1e..2342d7182 100644 --- a/WebContent/Tenwa/Comm/Document/LBDocumentInfo.jsp +++ b/WebContent/Tenwa/Comm/Document/LBDocumentInfo.jsp @@ -173,7 +173,7 @@ return o.submit(); } function CheckStr(str){ - var s="jpg,jpeg,png,pdf,doc,docx,xls,xlsx"; + var s="jpg,jpeg,png,pdf,doc,docx,xls,xlsx,rar,zip"; var flag="false"; var s2=s.split(","); for(var i=0;i&sqlString=save@"+id, "downloadTemplate"); } function upload(){ - deleteFile(); +// deleteFile(); var sparam="FlowUnid=<%=flowunid%>"+",ProjId=<%=projid%>"+",DocType=001,OneClassify=001003,DocName=¾¡Ö°µ÷²é±¨¸æ"; var library_id=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateContractOfficeAction","NewCreditLibraryId",sparam); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp index 09f4cc86a..631f08786 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp @@ -158,7 +158,7 @@ } function upload(){ - deleteFile(); +// deleteFile(); var sparam="FlowUnid=<%=flowunid%>"+",ProjId=<%=projid%>"+",DocType=001,OneClassify=001003,DocName=·ç¿Ø±¨¸æ"; var library_id=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateContractOfficeAction","NewCreditLibraryId",sparam); diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp index 5f882df95..1ab44d167 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp @@ -73,6 +73,10 @@ setItemNoRequired(0,i,"ACCOUNT"); setItemNoRequired(0,i,"ACC_NUMBER"); } + if("" == getItemValue(0,i,"ACCOUNTING_DATE")){ + var date = new Date().getFullYear()+"/"+(new Date().getMonth()+1)+"/"+new Date().getDate(); + document.getElementById('INPUT_myiframe0_ACCOUNTING_DATE_'+i+'_6').value=date; + } } } } diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp index 7b4c448a1..a66bd480d 100644 --- a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp @@ -29,7 +29,7 @@ dwTemp.Style = "1"; //--ÉèÖÃΪGrid·ç¸ñ-- 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 +120,7 @@ tempParam["OBJECTTYPE"]="AdjustmentNotice"; tempParam["FLOW_UNID"]="<%=flowunid%>"; tempParam["PROJ_ID"]="<%=projid%>"; - tempParam["contract_id"]="<%=contract_id%>"; + tempParam["CONTRACT_ID"]=getItemValue(0,getRow(),"ID"); //Éú³ÉÄ£°å¹Ì¶¨²ÎÊý tempParam["CurUserId"]="<%=CurUser.getUserID()%>"; tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>"; @@ -131,10 +131,10 @@ 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","Tdeletequtation","plan_number="+getItemValue(0,getRow(),"ID")); 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=AdjustmentNotice"); +<%-- var id = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","wordToPdfAnnex","FlowUnid=<%=flowunid%>,PLAN_LIST=AdjustmentNotice"); --%> reloadSelf(); diff --git a/WebContent/fileTemplate/租金支付通知书.docx b/WebContent/fileTemplate/租金支付通知书.docx index 50262ad7a..12367b7de 100644 Binary files a/WebContent/fileTemplate/租金支付通知书.docx and b/WebContent/fileTemplate/租金支付通知书.docx differ diff --git a/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java b/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java index 8a0abe5ae..53d583993 100644 --- a/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java +++ b/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java @@ -63,5 +63,29 @@ public class RentNotinyDeleteAction { } -} + } + + //¸ù¾Ýǰ̨²ÎÊýÉú³ÉÎĵµ + public void Tdeletequtation(JBOTransaction tx) throws Exception{ + BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE=bom.createQuery("CONTRACT_ID=:contractid and OBJECTTYPE='AdjustmentNotice' ").setParameter("contractid",plan_number).getSingleResult(false); + if(DOCRELATIVE!=null){ + String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); + String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString(); + BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME); + String DOCATTRIBUTEid=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("id").toString(); + Map condtion= new HashMap(); + condtion.put("id", DOCRELATIVEid); + DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME, condtion, tx); + condtion.clear(); + condtion.put("id", DOCLIBRARYid); + DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME, condtion, tx); + condtion.clear(); + condtion.put("id", DOCATTRIBUTEid); + DataOperatorUtil.deleteJBOByCondtion(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME, condtion, tx); + } + + + } } \ No newline at end of file diff --git a/src_tenwa/com/tenwa/flow/fund/flowpayment/ReplyWorkableObjectCheck.java b/src_tenwa/com/tenwa/flow/fund/flowpayment/ReplyWorkableObjectCheck.java new file mode 100644 index 000000000..4a72ac763 --- /dev/null +++ b/src_tenwa/com/tenwa/flow/fund/flowpayment/ReplyWorkableObjectCheck.java @@ -0,0 +1,45 @@ +package com.tenwa.flow.fund.flowpayment; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.com.tenwa.lease.comm.LB_REPLY_IMPLEMENT_TEMP; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CodeCache; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.template.check.DefaultBussinessCheck; + + +/** + * ¼ì²é¸¶¿îÉêÇëÅú¸´ÂäʵÇé¿ö + * + */ +public class ReplyWorkableObjectCheck extends DefaultBussinessCheck { + @Override + public Object run(Transaction Sqlca) throws Exception { + String flowunid=this.getAttribute("ObjectNo").toString(); + List bos = JBOFactory.getBizObjectManager(LB_REPLY_IMPLEMENT_TEMP.CLASS_NAME).createQuery("flowunid=:flowunid") + .setParameter("flowunid", flowunid).getResultList(false); + int mun = 0; + for (BizObject bo : bos) { + if("implement_condition02".equals(bo.getAttribute("REPLY_IMPLEMENT").getString())){ + mun++; + } + } + if(bos.size()==0){ + putMsg("ûÓÐÅú¸´ÂäʵÏî"); + setPass(true); + }else if(bos.size() == mun){ + putMsg("Åú¸´ÒÑÂäʵ£¡"); + setPass(true); + }else{ + putMsg("Åú¸´Î´Âäʵ£¡"); + setPass(false); + } + return null; + } +}