diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 35c0575fb..6f8b8783a 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -391,10 +391,10 @@ function SelectCardataBrand() { var carTypea = "<%=carTypea%>"; - var selectBank = "SelectCardataBrandFlow"; + var selectBank = "SelectCardataBrandFlowNew"; var parms = "cartypea,"+carTypea; if(typeof(carTypea)=="undefined" || carTypea.length==0 ){ - selectBank = "SelectCardataBrand"; + selectBank = "SelectCardataBrandNew"; parms = "projectId,<%=projectId%>"; } AsDialog.OpenSelector(selectBank, parms ,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", @@ -407,6 +407,7 @@ sReturn = sReturn.split("@"); MyOjbect.brandid=sReturn[0]; MyOjbect.brandname=sReturn[1]; + MyOjbect.cartypea=sReturn[3]; setItemValue(0,getRow(),"BRAND",sReturn[1]); setItemValue(0,getRow(),"car_series",""); setItemValue(0,getRow(),"MODEL",""); @@ -437,7 +438,11 @@ var brandid=""; if(MyOjbect.brandid){ brandid=MyOjbect.brandid; - AsDialog.OpenSelector("SelectCardataSeries","brandid,"+brandid,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", + let selectType = 'SelectCardataSeriesCYC'; + if (MyOjbect.cartypea == 'SYC') { + selectType = 'SelectCardataSeriesSYC'; + } + AsDialog.OpenSelector(selectType,"brandid,"+brandid,"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_") { @@ -465,7 +470,11 @@ var seriesid=""; if(MyOjbect.seriesid){ seriesid=MyOjbect.seriesid; - AsDialog.OpenSelector("SelectCardataModel","seriesid,"+seriesid,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", + let selectType = 'SelectCardataModelCYC'; + if (MyOjbect.cartypea == 'SYC') { + selectType = 'SelectCardataModelSYC'; + } + AsDialog.OpenSelector(selectType,"seriesid,"+seriesid,"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_") { diff --git a/WebContent/Tenwa/Lease/Flow/Project/LbBeforeAppLication/LbBeforeAppLicationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/LbBeforeAppLication/LbBeforeAppLicationInfo.jsp index 02226cadd..bf2f9625a 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/LbBeforeAppLication/LbBeforeAppLicationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/LbBeforeAppLication/LbBeforeAppLicationInfo.jsp @@ -39,6 +39,9 @@ //sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>