diff --git a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp index 3ad8c6347..810a210da 100644 --- a/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp +++ b/WebContent/Common/WorkFlow/FlowSubmitDialog.jsp @@ -171,7 +171,7 @@ if(vUser.length==1&&type=="radio"){ $("input[name=phaseaction"+cindex+"]:first").attr("checked",true); } - if((phase=="0010"&&flowNo=="FundPaymentCarFlow")||(phase=="0020"&&flowNo=="BusinessApplyFlow")){ + if((phase=="0010"&&flowNo=="FundPaymentCarFlow")||((phase=="0020"||phase=="0010")&&flowNo=="BusinessApplyFlow")){ actionSet.hide(); } } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp index bef0eb2ad..55edf8e58 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp @@ -168,7 +168,7 @@ var sParams="ProjectId=<%=projectId%>,customerType=<%=custtype%>,CurUserID=<%=CurUser.getUserID()%>"; var sReturn=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","contractSignStatus",sParams); AsDebug.showMessage("提示",sReturn,"","",true,'','','',function(){ - var sReturns = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","downloadDoc","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>"); +<%-- var sReturns = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","downloadDoc","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>"); --%> window.location.reload(); }); } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp index 9b82a0ec8..22f34e3da 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp @@ -67,6 +67,7 @@ setItemValue(0,0,'CERTID',sReturn[0]); setItemValue(0,0,'ACCOUNT',sReturn[1]); setItemValue(0,0,'CUSTTYPE',sReturn[2]); + setItemValue(0,0,'MOBILE',sReturn[3]); },"选择扣款卡名称"); } function checkMobile(){ diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfoForm.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfoForm.jsp index 8b9a5abb4..f92cb882d 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfoForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfoForm.jsp @@ -5,11 +5,18 @@ Content: 示例详情页面 History Log: */ + String ishistory = CurPage.getParameter("IsHistory"); String ContractId = CurPage.getParameter("ContractId"); String sPrevUrl = CurPage.getParameter("PrevUrl"); + String flowName = CurPage.getParameter("FlowName"); + String flowUnid = CurPage.getParameter("FlowUnid"); if(sPrevUrl == null) sPrevUrl = ""; String sTempletNo = "DebitCardInfoForm";//--模板号-- + if("扣款信息变更审核".equals(flowName)&& null!=ishistory&&ishistory.equals("true")){ + sTempletNo = "DebitCardInfoFormHis"; + ContractId = flowUnid; + } ASObjectModel doTemp = new ASObjectModel(sTempletNo); // doTemp.setColTips("", "测试"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 432780bfe..2bd79caaf 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -17,6 +17,7 @@ String sTempletNo = "BusinessProjectTempInfo";//--模板号-- BizObject bo=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT", "flow_unid=:flowunid").setParameter("flowunid",sFlowUnid).getSingleResult(false); String custype = CurPage.getParameter("CustomerType"); + String customertype = CurPage.getParameter("customertype"); ASObjectModel doTemp = new ASObjectModel(sTempletNo); //租赁形式set只读 if((null!=sPhaseNo&&sPhaseNo.equals("0010")) && ("BusinessApplyFlow".equals(FlowNo) ||"BusinessChangeFlow".equals(FlowNo))){ @@ -27,7 +28,7 @@ String userll=null; userll="/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp?CompClientID="; - if("01".equals(custype)){ + if("01".equals(custype)||"01".equals(customertype)){ userll="/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp?CompClientID="; } diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index c01378086..9a95d509e 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -1018,6 +1018,7 @@ public class ContractSignAction{ // 客户签署完成，合同制作过程为4 if ("REQUIRED".equals(signStatus)) { this.sign(tx); + downloadDoc(tx); keys.setAttributeValue("PROCESS", "4"); } contBom.saveObject(keys); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java index dc9d209c6..7a16f16f3 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java @@ -5,9 +5,12 @@ import java.util.List; import java.util.Map; import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT; +import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_HIS; import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT_TEMP; import jbo.app.tenwa.customer.CUSTOMER_FAMILY; import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP; +import jbo.app.tenwa.customer.CUSTOMER_PERSON; +import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP; import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT; import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; import jbo.com.tenwa.lease.comm.LB_EQUIPMENT; @@ -30,7 +33,16 @@ public class LBCustomerAccountChangeToFormalBusiness extends BaseBussiness{ public Object run(Transaction Sqlca) throws Exception { this.initBussinessParam(Sqlca); String flowunid = this.getAttribute("ObjectNo").toString(); + //如果是扣款卡信息变更从正式表倒到临时表中 + String flowname=(String)this.getAttribute("FlowName"); String ContractId = this.getAttribute("ContractId").toString(); + if("扣款信息变更审核".equals(flowname)){ + Map fromCond = new HashMap(); + fromCond.put(CUSTOMER_ACCOUNT.contract_id, ContractId); + Map toCond = new HashMap(); + toCond.put("flowunid", flowunid); + DataOperatorUtil.copyJBOSet(CUSTOMER_ACCOUNT.CLASS_NAME, fromCond, CUSTOMER_ACCOUNT_HIS.CLASS_NAME, null, toCond, null, Sqlca); + } Map fromCondtion = new HashMap(); fromCondtion.put("flowunid", flowunid); Map toCondtion = new HashMap();