From 88fe06a051afaa4c487d7298fe645a65e91e0fd3 Mon Sep 17 00:00:00 2001
From: yjf <2211675158@qq.com>
Date: Tue, 23 Nov 2021 08:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=80=89=E6=8B=A9=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectApprovalCreationInfo.jsp              | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index de64075a3..482b7f3a6 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -390,6 +390,7 @@
 						MyOjbect.price=Math.round(sReturn[2]*10000);
 						MyOjbect.liter=sReturn[3];
 						MyOjbect.geartype=sReturn[4];
+						MyOjbect.carId=sReturn[8];
 						setItemValue(0,getRow(),"modelid",sReturn[0]);
 						setItemValue(0,getRow(),"carSystem",sReturn[1]);
 						setItemValue(0,getRow(),"price",MyOjbect.price);
@@ -426,17 +427,12 @@
 		var model = getItemValue(0,getRow(),"modelid");
 		if(model){
 			modelid = true;
-		}else{
-			modelid = false;
 		}
 		var CurOrgID=<%=CurOrg.getOrgID()%>;
 		var YesNo="Y";
-		if( MyOjbect.cartypea=="SYC" || modelid==true ){
-			modelid=getItemValue(0,getRow(),"modelid");
-			if(""== modelid && MyOjbect.cartypea=="SYC"){
-				modelid = null;
-			}
-			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",
+		if(  modelid==true || MyOjbect.cartypea == 'SYC' ){
+            let carId = MyOjbect.carId;
+			AsDialog.OpenSelector("selectProductVersionInfoNew","carId,"+carId+",CurOrgID,"+CurOrgID,"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_")
 						{
@@ -452,8 +448,8 @@
 						MyOjbect.VERSIONID = sReturn[4];//版本ID
 						MyOjbect.id = sReturn[5];//经销商ID
 						MyOjbect.distributor_name = sReturn[6];//经销商名称
-						MyOjbect.modelid = sReturn[7];//车型ID
-						MyOjbect.modelname = sReturn[8];//车型名称
+						// MyOjbect.modelid = sReturn[7];//车型ID
+						// MyOjbect.modelname = sReturn[8];//车型名称
 						operationType =  sReturn[11];
 						SubjectId =  sReturn[12];