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

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2

Browse Source
This commit is contained in:
zhouyahui 2018-09-29 19:44:33 +08:00
commit 81352278ae
11 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
View File

@ -22,7 +22,7 @@
}
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
ASDataObject ado = dwTemp.getDataObject();
ado.setHtmlEvent("establish_date", "onchange", "getOperationPeriod"); //根据成立日期动态计算营业期限（年）
ado.setHtmlEvent("establish_date,LICENSEMATURITY", "onchange", "getOperationPeriod"); //根据成立日期动态计算营业期限（年）
ado.setHtmlEvent("status", "onchange", "changeRegisterInfo"); //客户状态为正式时必填，其他时候非必填
dwTemp.Style = "2";//freeform
dwTemp.genHTMLObjectWindow(customerId);
@ -244,7 +244,15 @@
function getOperationPeriod(){
var establish_date=getItemValue(0,0,"establish_date"); //成立日期
var cur_date = new Date(new Date()).format("yyyy/MM/dd"); //获取当前日期 yyyy/mm/dd
// var cur_date = new Date(new Date()).format("yyyy/MM/dd"); //获取当前日期 yyyy/mm/dd
var cur_date = getItemValue(0,0,"LICENSEMATURITY");
if(establish_date!=""&&cur_date!=""){
if(establish_date>cur_date){
alert("营业执照到期日不能小于成立日期，请重新选择营业执照到期日！");
setItemValue(0,0,"LICENSEMATURITY","");
return;
}
}
var date1 = establish_date.split('/'); // 拆分年月日
date1 = parseInt(date1[0]) * 12 + parseInt(date1[1]); // 得到月数
var date2 = cur_date.split('/'); // 拆分年月日

1
WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp
View File

@ -35,6 +35,7 @@
<script type="text/javascript">
$(document).ready(function(){
init();
changeRegisterInfo();
})
function init(){

2
WebContent/Tenwa/Customer/Partner/Comm/Person/PartnerPersonViewInfo.jsp
View File

@ -94,7 +94,7 @@
var country = getItemValue(0,getRow(),"COUNTRY");
if(status == "status02"){
setItemRequired(0,"CUSTSOURCE",true);
setItemRequired(0,"CUSTKIND",true);
// setItemRequired(0,"CUSTKIND",true);
setItemRequired(0,"BIRTHDAY",true);
setItemRequired(0,"MARRIAGE",true);
setItemRequired(0,"OCCUPATION",true);

2
WebContent/Tenwa/Lease/Flow/AfterLeasingPatrol/AfterLeasingVisit/AfterLeasingVisitApplyList.jsp
View File

@ -14,7 +14,7 @@
var customername=sReturn[1];
var contract_id=sReturn[2];
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
sParams =sParams+",ProjectName=客户"+customername+"租后巡视,FlowKey="+customername+",CustomerId="+customerid+",ContractId="+contract_id;
sParams =sParams+",ProjectName=客户"+customername+"租后巡视,FlowKey="+customername+",CustomerId="+customerid+",ContractId="+contract_id+",customername="+customername;
var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.afterleasing.afterleasingvisit.AfterLeasingVisitStartAction","initFLow",sParams);
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
var sReturnInfos=sReturnInfo.split("@");

4
WebContent/Tenwa/Lease/Flow/AfterLeasingPatrol/AfterLeasingVisit/AfterLeasingVisitContractList.jsp
View File

@ -21,11 +21,11 @@
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<script type="text/javascript">
function afterSearch(){
/* function afterSearch(){
for(var i=0;i<getRowCount(0);i++){
getObj(0,i,"CONTRACT_NUMBER").innerHTML='<a class="box" onclick="javascript:showContractInfo()" style={color:#000;text-decoration:underline;}><font color="blue">'+getObj(0,i,"contract_number").innerHTML+'</font></a>';
}
}
} */
function showContractInfo(){
var sUrl = "/Tenwa/Lease/App/InformationTable/InfoView.jsp";
var contractid = getItemValue(0,getRow(0),'CONTRACT_ID');

7
WebContent/Tenwa/Lease/Flow/AfterLeasingPatrol/AfterLeasingVisit/AfterLeasingVisitInfo.jsp
View File

@ -10,6 +10,8 @@
String taskno=CurPage.getParameter("TaskNo");
if(taskno == null) taskno = "";
String ishistory=CurPage.getParameter("IsHistory");
String customername=CurPage.getParameter("customername");
String CustomerId=CurPage.getParameter("CustomerId");
String nodeNo=CurPage.getParameter("NodeNo");
if(ishistory == null) ishistory = "";
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
@ -29,6 +31,11 @@
};
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">
$(function(){
var customername="<%=customername%>";
var CustomerId="<%=CustomerId%>";
setItemValue(0,0,"customername",customername);
});
function saveRecord(){
as_save("myiframe0");
}

4
WebContent/Tenwa/Lease/Flow/Comm/LBChange/LBChangeInfo.jsp
View File

@ -39,6 +39,10 @@
String RightType = CurPage.getParameter("RightType");//Ñ¡Ôñģʽ
String sTempletNo = CurPage.getParameter("TempletNo");//Ä£°åºÅ
if(sTempletNo == null) sTempletNo = "LBChangeInfoTemp";
//改动未提前结清使用
if("ContractTraditionFlow".equals(CurPage.getParameter("FlowNo"))||"ContractTerminateFlow".equals(CurPage.getParameter("FlowNo"))){
sTempletNo = "LBChangeInfoTempForTqJq";
}
%>
<%/*~END~*/%>

1
WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp
View File

@ -145,6 +145,7 @@
if (PAYDAY_DATE!=null&&PAYDAY_DATE!="") {
setItemValue(0,0,"COLLECT_FEES",PAYDAY_DATE);
}
setItemValue(0,0,"CONTRACT_ID","<%=contractid%>");
as_save("myiframe0","run()");
}else{
alert('请先撤销变更，再进行变更操作！！！');

1
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -697,6 +697,7 @@
<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
<attribute name="OTHER_MONEY" label="其他" type="DOUBLE" length="22" scale="2"/>
<attribute name="RATE_TYPE" label="利率类型" type="STRING" length="32" />
<attribute name="FACTORY_ACCESSORIES" label="原厂配件费" type="STRING" length="22" scale="2" />
</attributes>
<manager>

5
src_tenwa/com/tenwa/flow/comm/handler/LBTenantryInfoHandler.java
View File

@ -68,7 +68,8 @@ public class LBTenantryInfoHandler extends CommonHandler{
//联系电话
BizObjectManager bom2 = JBOFactory.getBizObjectManager(CUSTOMER_TEL.CLASS_NAME);
//查询当前客户联系电话为办公地址的最新联系电话
BizObject CustomerTelList = bom2.createQuery("customerid=:customerid and isnew='yes' and teltype='030'").setParameter("customerid",customerid).getSingleResult(false);
//BizObject CustomerTelList = bom2.createQuery("customerid=:customerid and isnew='yes' and teltype='030'").setParameter("customerid",customerid).getSingleResult(false);
BizObject CustomerTelList = bom2.createQuery("customerid=:customerid and isnew='yes' ").setParameter("customerid",customerid).getSingleResult(false);
if(CustomerTelList != null){
//获取联系人
String linkman = CustomerTelList.getAttribute("linkman").toString();
@ -78,6 +79,8 @@ public class LBTenantryInfoHandler extends CommonHandler{
bo.setAttributeValue("CLIENT_LINKMAN",linkman);
//初始化电话
bo.setAttributeValue("CLIENT_TEL",telephone);
//³õʼ»¯ÓÊÏä
bo.setAttributeValue("CLIENT_EMAIL",CustomerTelList.getAttribute("mailbox").toString());
}
//查询当前客户联系电话类型为手机的最新联系电话
BizObject CustomerTelList1 = bom2.createQuery("customerid=:customerid and isnew='yes' and teltype='010'").setParameter("customerid",customerid).getSingleResult(false);

21
src_tenwa/com/tenwa/lease/flow/afterleasing/afterleasingvisit/AfterLeasingVisitStartAction.java
View File

@ -7,11 +7,32 @@ import com.tenwa.reckon.util.UUIDUtil;
public class AfterLeasingVisitStartAction extends BaseFlowStartAction {
private String customername;
private String CustomerId;
public String getCustomerId() {
return CustomerId;
}
public void setCustomerId(String customerId) {
CustomerId = customerId;
}
public String getCustomername() {
return customername;
}
public void setCustomername(String customername) {
this.customername = customername;
}
@Override
public void customOperation(JBOTransaction tx, BizObject flowBussiness)
throws Exception {
String RelativeId = UUIDUtil.getUUID();
this.FlowParam.put("RelativeId", RelativeId);
this.FlowParam.put("customername", this.getCustomername());
this.FlowParam.put("CustomerId", this.getCustomerId());
super.customOperation(tx, flowBussiness);
}