From 0433c4d5f335c67cc0e1750621d038c3b4bf591b Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Wed, 5 Sep 2018 11:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=BD=E8=BD=A6=E7=B1=BB=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7=EF=BC=8C?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=B1=9E=E6=80=A7=E5=92=8C=E7=A7=9F=E8=B5=81?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BB=8E=E4=BA=A7=E5=93=81=E4=B8=AD=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectApprovalCreationInfo.jsp           | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index 3ee8f5803..7ea000fd4 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -117,11 +117,11 @@
 			CustomerId=ceckRes;
 			
 			if(carAttributes==""){
-				alert("请选择车辆属性");
+				alert("该产品未配置车辆属性，请完善或选择别的产品！");
 				return;
 			}
 			if(leasehold==""){
-				alert("请选择租赁方式");
+				alert("该产品未配置租赁方式，请完善或选择别的产品！");
 				return;
 			}
 			if(productModel==""){
@@ -291,7 +291,7 @@
 		<%/*~[Describe=选择产品;]~*/%>
 		 function selectBusinessType()
 		  {
-			 var carAttr = false;
+			/* var carAttr = false;
 			 var carAttributes = getItemValue(0,getRow(),"carAttributes");
 			 if(carAttributes){
 				 carAttr = true;
@@ -304,7 +304,7 @@
 				 lease = true;
 			 }else{
 				 lease = false;
-			 }
+			 } */
 			 var modelid = false;
 			 var model = getItemValue(0,getRow(),"modelid");
 			 if(model){
@@ -314,9 +314,9 @@
 			 }
 			 var CurOrgID=<%=CurOrg.getOrgID()%>;
 			 var YesNo="Y";
-			 if(modelid==true&&carAttr==true&&lease==true){
+			if(modelid==true){
 				 modelid=getItemValue(0,getRow(),"modelid");
-				 AsDialog.OpenSelector("selectProductVersionInfo","carAttributes,"+carAttributes+",leasehold,"+leasehold+",modelid,"+modelid+",CurOrgID,"+CurOrgID+",YesNo,"+YesNo,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
+				 AsDialog.OpenSelector("selectProductVersionInfo","attribute2,car_product,modelid,"+modelid+",CurOrgID,"+CurOrgID+",YesNo,"+YesNo,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",
 							function(sReturn){
 								if(!sReturn||sReturn=="_CANCEL_"||sReturn==""||sReturn=="_NONE_")
 								{
@@ -338,18 +338,21 @@
 								setItemValue(0,0,"productName",sReturn[2]);
 								setItemValue(0,0,"productId",sReturn[3]);
 								setItemValue(0,0,"versionid",sReturn[4]);
+								setItemValue(0,0,"carAttributes",sReturn[9]);
+								setItemValue(0,0,"leasehold",sReturn[10]);
 								
 								},"请选择产品",'');
 			 }else{
-				if(modelid){
+				 alert("请先选择车型");
+				 /*if(modelid){
 					alert("请先选择车型");
 				}
-				if(carAttr==false){
+				 if(carAttr==false){
 					alert("请先选择车辆属性");
 				}
 				if(lease==false){
 					alert("请先选择租赁方式");
-				}
+				} */
 			 }
 			 
 // 			 if(carAttributes=='01'){