From 0bee00149ab529dc052dfeafdc81d881e7f3856b Mon Sep 17 00:00:00 2001
From: tangft <32189@DESKTOP-M6TAG3K>
Date: Sat, 12 Jan 2019 18:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E6=B1=BD=E4=B8=9A=E5=8A=A1=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=8F=B7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp  | 9 +++++++++
 .../ContractChange/ContractChangeApplyList_Car.jsp       | 3 ++-
 .../BusinessApplication/BusinessProjectTempInfo.jsp      | 6 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
index 8d579f9cc..c0f6b1b07 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
@@ -37,6 +37,7 @@
 	String flowName = CurPage.getParameter("FlowName");//流程名称
 	String contractid = CurPage.getParameter("ContractId");
 	String showtype = CurPage.getParameter("ShowType");
+	String operationType = CurPage.getParameter("operationType");
 	
 	BizObject boLPI= JBOFactory.createBizObjectQuery(LB_PROJECT_INFO.CLASS_NAME,"ID='"+projectId+"'").getSingleResult(false);
 	//String carType=boLPI.getAttribute("CAR_TYPE").toString();
@@ -99,6 +100,10 @@
 		doTemp.setReadOnly("FRAME_NUMBER",false);
 		doTemp.setReadOnly("CAR_COLOUR",false);
 		doTemp.setReadOnly("ENGINE_NUMBER",false);
+		//第一车贷产品可以修改其他配置说明 
+		if("DYCD".equals(operationType)){
+			doTemp.setReadOnly("MEMO",false);
+		}
 		
 		doTemp.setColInnerBtEvent("BRAND", "");
 		doTemp.setColInnerBtEvent("CAR_SERIES", "");
@@ -163,6 +168,10 @@
 			setItemRequired(0,"FRAME_NUMBER",true);
 			setItemRequired(0,"CAR_COLOUR",true);
 			setItemRequired(0,"ENGINE_NUMBER",true);
+			//第一车贷产品其他配置说明为必填 
+			if("DYCD"=="<%=operationType%>"){
+				setItemRequired(0,"MEMO",true);
+			}
 		/* 	var falg = checkCarNumber();
 			if(falg){
 				$("#FRAME_NUMBER").css("color","red");
diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
index 2a4c97001..dd39d48ed 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
@@ -5,7 +5,8 @@
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply()
  	{
-		AsDialog.OpenSelector("SelectContractCar","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
+		var userid="<%=CurUser.getUserID()%>";
+		AsDialog.OpenSelector("SelectContractCar","userid,"+userid,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
 			if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){
 				//alert(getHtmlMessage('1'));//请选择一条信息！
 	    	return;
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
index a4917e89c..2439981d9 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
@@ -32,7 +32,7 @@
 		doTemp.setReadOnly("INPUTTEL", true);
 	}
 	//如果是北汽的产品，业务申请号可编辑
-	if(!"ReadOnly".equals(rightType)&&sPhaseNo.equals("0010")&&"BAIC_MOTOR".equals(operationType)){
+	if(!"ReadOnly".equals(rightType)&&sPhaseNo.equals("0010")&&"BAIC_MOTOR".equals(operationType)&&"BusinessApplyFlow".equals(FlowNo)){
 		doTemp.setReadOnly("PROJECT_NO", false);
 	}else{
 		doTemp.setReadOnly("PROJECT_NO", true);
@@ -82,10 +82,10 @@
 			return;
 		}
 		var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","checkProjectNo","projectNo="+projectNo+",id="+getItemValue(0,getRow(),"ID"));
-		/* if("error"==sReturnInfo){
+		if("error"==sReturnInfo&&"BusinessApplyFlow"=="<%=FlowNo%>"){
 			alert("业务申请编号已被占用，请重新填写！！！");
 			return;
-		} */
+		}
 		var operationType="<%=operationType%>";
 		
 		if(customerType=="01"||customerT=="01"){//法人