From 35d9079b9988fff0e7273ae84562813058b0f22c Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Sat, 29 Sep 2018 18:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E4=BA=BA=E5=AE=A2=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Customer/Lessee/Company/CustomerCompany.jsp      | 12 ++++++++++--
 .../Partner/Comm/Company/PartnerCompanyViewInfo.jsp  |  1 +
 .../Partner/Comm/Person/PartnerPersonViewInfo.jsp    |  2 +-
 .../TriditionLCContractTerminateInfo.jsp             |  1 +
 .../flow/comm/handler/LBTenantryInfoHandler.java     |  5 ++++-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
index 59d063c62..ea29df7ef 100644
--- a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
+++ b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompany.jsp
@@ -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('/');     // 拆分年月日		
diff --git a/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp b/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp
index f1436b530..5023619da 100644
--- a/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp
+++ b/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp
@@ -35,6 +35,7 @@
 <script type="text/javascript">
 	$(document).ready(function(){
 		init();
+		changeRegisterInfo();
 	})
 	function init(){
 		
diff --git a/WebContent/Tenwa/Customer/Partner/Comm/Person/PartnerPersonViewInfo.jsp b/WebContent/Tenwa/Customer/Partner/Comm/Person/PartnerPersonViewInfo.jsp
index a2a211000..1454c6000 100644
--- a/WebContent/Tenwa/Customer/Partner/Comm/Person/PartnerPersonViewInfo.jsp
+++ b/WebContent/Tenwa/Customer/Partner/Comm/Person/PartnerPersonViewInfo.jsp
@@ -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);
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp
index 80f0cd2d5..3ef59ed79 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/TriditionLCContractTerminateInfo.jsp
@@ -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('请先撤销变更，再进行变更操作！！！');
diff --git a/src_tenwa/com/tenwa/flow/comm/handler/LBTenantryInfoHandler.java b/src_tenwa/com/tenwa/flow/comm/handler/LBTenantryInfoHandler.java
index 2711ec945..86470c08a 100644
--- a/src_tenwa/com/tenwa/flow/comm/handler/LBTenantryInfoHandler.java
+++ b/src_tenwa/com/tenwa/flow/comm/handler/LBTenantryInfoHandler.java
@@ -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);