From 95e3e192c3a3e3c77008130efe364c07a738d066 Mon Sep 17 00:00:00 2001 From: user Date: Mon, 11 Jun 2018 11:08:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Project/BusinessApplication/BusinessApplyApplyList.jsp | 1 - .../BusinessApproval/ProjectApprovalCreationInfo.jsp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessApplyApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessApplyApplyList.jsp index 11791d6af..88e6f144f 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessApplyApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessApplyApplyList.jsp @@ -11,7 +11,6 @@ "dialogWidth=500px;dialogHeight=300px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sReturnInfo){ if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@"); - alert(sReturnInfos); if(sReturnInfos[0]=="success") { var objectNo=sReturnInfos[1]; diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index 32c38992d..f982c014e 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -244,7 +244,7 @@ return; } sReturn = sReturn.split("@"); - alert(sReturn); +// alert(sReturn); setItemValue(0,0,"productId",sReturn[0]); setItemValue(0,0,"productName",sReturn[1]); },"请选择产品类型",''); @@ -257,7 +257,7 @@ return; } sReturn = sReturn.split("@"); - alert(sReturn); +// alert(sReturn); setItemValue(0,0,"productId",sReturn[0]); setItemValue(0,0,"productName",sReturn[1]); },"请选择产品类型",''); @@ -276,7 +276,7 @@ return; } sReturn = sReturn.split("@"); - alert(sReturn[1]); +// alert(sReturn[1]); setItemValue(0,0,"CUSTOMERID",sReturn[0]); setItemValue(0,0,"customername",sReturn[1]); },"请选择客户",''); From 2215ba3961f3860aa89592670b96234cbf498d92 Mon Sep 17 00:00:00 2001 From: user Date: Mon, 11 Jun 2018 14:21:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Project/BusinessApplication/BusinessProjectTempInfo.jsp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index f22075fc7..39a2209a4 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -64,10 +64,6 @@ function save(){ var leasfrom = getItemValue(0,getRow(),"LEAS_FORM"); var projectSource = getItemValue(0,getRow(),"PROJECT_SOURCE"); - if(leasfrom==""||projectSource==""){ - alert("保存失败!必填项信息不能为空!"); - return; - } frame_list.window.saveRecord(leasfrom,projectSource); } From 462cda6287b1ef713ee7e002f91df555db7be016 Mon Sep 17 00:00:00 2001 From: user Date: Mon, 11 Jun 2018 16:58:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowManager/FlowPage/FlowPageViewTab.jsp | 2 + .../Flow/Comm/LBEquipment/LBEquipmentList.jsp | 1 + .../Comm/LBEquipment_Car/LBEquipmentInfo.jsp | 109 ++++++++---------- .../Comm/LBEquipment_Car/LBEquipmentList.jsp | 1 + .../ProjectApprovalCreationInfo.jsp | 10 +- 5 files changed, 56 insertions(+), 67 deletions(-) diff --git a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp index 04ffe6df5..d39025137 100644 --- a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp +++ b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp @@ -142,6 +142,8 @@ $(function(){ paramJson["CustomerNature"]="<%=startMap.get("CustomerNature")%>"; paramJson["CUSTOMERID"]="<%=startMap.get("CUSTOMERID")%>"; paramJson["ContractId"]="<%=startMap.get("ContractId")%>"; + paramJson["CarAttributes"]="<%=startMap.get("CarAttributes")%>"; + paramJson["Leasehold"]="<%=startMap.get("Leasehold")%>"; //paramJson["CurFlowUser"]="<%=FlowFixedParam.get("CurFlowUser")%>"; //paramJson["AgentFlowUser"]="<%=FlowFixedParam.get("AgentFlowUser")%>"; diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment/LBEquipmentList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment/LBEquipmentList.jsp index 5a0b0077a..345381ca2 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment/LBEquipmentList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment/LBEquipmentList.jsp @@ -51,6 +51,7 @@ String taskno=CurPage.getParameter("TaskNo"); String ishistory=CurPage.getParameter("IsHistory"); String nodeNo=CurPage.getParameter("NodeNo"); + String CustomerType=CurPage.getParameter("CustomerType"); %> <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 60a6f4bd5..0540d7a3b 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -49,6 +49,8 @@ String nodeNo=CurPage.getParameter("NodeNo"); String taskno=CurPage.getParameter("TaskNo"); String RightType= CurPage.getParameter("RightType"); + String CarAttributes=CurPage.getParameter("CarAttributes"); + String Leasehold=CurPage.getParameter("Leasehold"); %> <%/*~END~*/%> @@ -139,70 +141,53 @@ } function getselectCarBrand(){ - var cityid = getItemValue(0,getRow(0),"cityid"); - if(typeof(cityid) == "undefined" || cityid.length == 0 ){ - AsDebug.showMessage("提示","请选择区域！","","",true); - return; - } - var params = "cityid=" + cityid + "&carType=<%=carType%>"; - AsDialog.PopView("/Tenwa/Lease/App/Interface/CarInterface/CarBrand.jsp",params, - "dialogWidth=800px;dialogHeight=600px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(myBrand){ - if(myBrand=="NO"){ - setItemReadOnly(0,0,"BRAND",false); - setItemReadOnly(0,0,"VEHICLES",false); - setItemReadOnly(0,0,"MODEL",false); - setItemValue(0,0,"EVAL_PRICE","0"); - $('#GUIDEDPRICE').attr('disabled',false); - setItemReadOnly(0,0,"DISPLACEMENT",false); - }else{ - setItemReadOnly(0,0,"BRAND",true); - setItemReadOnly(0,0,"VEHICLES",true); - setItemReadOnly(0,0,"MODEL",true); - $('#GUIDEDPRICE').attr('disabled',true); - setItemReadOnly(0,0,"DISPLACEMENT",true); - for (var key in myBrand){ - if(key=="guidedprice" || key=="eval_price" || key=="m_eval_price" || key=="purchaseprice"){ - setItemValue(0,0,key,myBrand[key]=="0"?"0":myBrand[key]*10000); - }else{ - setItemValue(0,0,key,myBrand[key]); - } - } - } - },"车品牌选择"); + debugger; + <%/*~[Describe=选择车品牌;]~*/%> + AsDialog.OpenSelector("SelectCardataBrand","","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_") + { + //alert(getHtmlMessage('1'));//请选择一条信息！ + return; + } + sReturn = sReturn.split("@"); + MyOjbect.brandid=sReturn[0]; + MyOjbect.brandname=sReturn[1]; + setItemValue(0,0,"BRAND",sReturn[1]); + },"请选择车品牌",''); + +// var cityid = getItemValue(0,getRow(0),"cityid"); +// if(typeof(cityid) == "undefined" || cityid.length == 0 ){ +// AsDebug.showMessage("提示","请选择区域！","","",true); +// return; +// } +<%-- var params = "cityid=" + cityid + "&carType=<%=carType%>"; --%> +// AsDialog.PopView("/Tenwa/Lease/App/Interface/CarInterface/CarBrand.jsp",params, +// "dialogWidth=800px;dialogHeight=600px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(myBrand){ +// if(myBrand=="NO"){ +// setItemReadOnly(0,0,"BRAND",false); +// setItemReadOnly(0,0,"VEHICLES",false); +// setItemReadOnly(0,0,"MODEL",false); +// setItemValue(0,0,"EVAL_PRICE","0"); +// $('#GUIDEDPRICE').attr('disabled',false); +// setItemReadOnly(0,0,"DISPLACEMENT",false); +// }else{ +// setItemReadOnly(0,0,"BRAND",true); +// setItemReadOnly(0,0,"VEHICLES",true); +// setItemReadOnly(0,0,"MODEL",true); +// $('#GUIDEDPRICE').attr('disabled',true); +// setItemReadOnly(0,0,"DISPLACEMENT",true); +// for (var key in myBrand){ +// if(key=="guidedprice" || key=="eval_price" || key=="m_eval_price" || key=="purchaseprice"){ +// setItemValue(0,0,key,myBrand[key]=="0"?"0":myBrand[key]*10000); +// }else{ +// setItemValue(0,0,key,myBrand[key]); +// } +// } +// } +// },"车品牌选择"); } - function getselectProvinceAndCity(){ - AsDialog.PopView("/Tenwa/Lease/App/Interface/ProvinceCity/SelectProvinceCity.jsp","", - "dialogWidth=600px;dialogHeight=450px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(sReturnInfo){ - if(sReturnInfo.length==0){ - return; - } - var brand = getItemValue(0,0,"BRAND"); - if (!(typeof(brand)=="undefined" || ""==brand || null==brand)){ - alert("城市已重新选择，需要重新选择车辆信息!"); - setItemValue(0,0,"BRAND",""); - setItemValue(0,0,"VEHICLES",""); - setItemValue(0,0,"MODEL",""); - setItemValue(0,0,"GUIDEDPRICE",""); - setItemValue(0,0,"INVOICEDPRICE",""); - setItemValue(0,0,"CARCOLOR",""); - setItemValue(0,0,"DISPLACEMENT",""); - setItemValue(0,0,"INVOICEDPRICE",""); - setItemValue(0,0,"FRAME_NUMBER",""); - } - var cityid= sReturnInfo.split("@")[2]; - var cityname= sReturnInfo.split("@")[1]+sReturnInfo.split("@")[3]; - setItemValue(0,0,"cityid",cityid); - setItemValue(0,0,"cityname",cityname); - if(getItemValue(0,0,"ID")){ - setItemValue(0,0,"GUIDEDPRICE","0"); - setItemValue(0,0,"M_EVAL_PRICE","0"); - setItemValue(0,0,"EVAL_PRICE","0"); - setItemValue(0,0,"PURCHASEPRICE","0"); - setItemValue(0,0,"INVOICEDPRICE","0"); - } - },"省份城市"); - } <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp index 7ef3e4279..c1c4fe1a7 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp @@ -43,6 +43,7 @@ String taskno=CurPage.getParameter("TaskNo"); String ishistory=CurPage.getParameter("IsHistory"); String nodeNo=CurPage.getParameter("NodeNo"); +// alert(CarAttributes,Leasehold); %> <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index f982c014e..eb0d95495 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -75,21 +75,21 @@ function saveRecord() { //从页面上获取客户编号，产品编号 + var carAttributes = getItemValue(0,0,"carAttributes"); + var leasehold = getItemValue(0,0,"leasehold"); + var productModel =getItemValue(0,getRow(),"productModel"); + var carSeries = getItemValue(0,getRow(),"carSeries"); + var carSystem = getItemValue(0,getRow(),"carSystem"); var productid = getItemValue(0,getRow(),"productId"); var productname = getItemValue(0,getRow(),"productName"); var custid = getItemValue(0,getRow(),"CustomerID"); var custname = getItemValue(0,getRow(),"CustomerName"); var customerType = getItemValue(0,getRow(),"Customer_type"); - var carSystem = getItemValue(0,getRow(),"carSystem"); var certtype =getItemValue(0,getRow(),"certtype"); var certid =getItemValue(0,getRow(),"certid"); - var carSeries = getItemValue(0,getRow(),"carSeries"); - var productModel =getItemValue(0,getRow(),"productModel"); var brandid = getItemValue(0,getRow(),"brandid"); var seriesid = getItemValue(0,getRow(),"seriesid"); var modelid = getItemValue(0,getRow(),"modelid"); - var carAttributes = getItemValue(0,0,"carAttributes"); - var leasehold = getItemValue(0,0,"leasehold"); if(certtype==""){ alert("请选择证件类型"); From 2cd51d416a7edbd5f73355bc3a8d719f84d47979 Mon Sep 17 00:00:00 2001 From: user Date: Mon, 11 Jun 2018 17:14:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 0540d7a3b..0640c2d25 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -141,8 +141,8 @@ } function getselectCarBrand(){ - debugger; <%/*~[Describe=选择车品牌;]~*/%> + var MyOjbect={}; AsDialog.OpenSelector("SelectCardataBrand","","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_") From b5de1b87198b649c384b2f6bf78787909cb0867f Mon Sep 17 00:00:00 2001 From: user Date: Mon, 11 Jun 2018 21:20:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowManager/FlowPage/FlowPageViewTab.jsp | 5 ++-- .../Comm/LBEquipment_Car/LBEquipmentList.jsp | 12 ++++++++- .../ProjectApprovalCreationInfo.jsp | 13 +++++---- .../BusinessApprovalStartAction.java | 27 ++++++++++++------- 4 files changed, 38 insertions(+), 19 deletions(-) diff --git a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp index d39025137..a5ea16301 100644 --- a/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp +++ b/WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp @@ -142,8 +142,9 @@ $(function(){ paramJson["CustomerNature"]="<%=startMap.get("CustomerNature")%>"; paramJson["CUSTOMERID"]="<%=startMap.get("CUSTOMERID")%>"; paramJson["ContractId"]="<%=startMap.get("ContractId")%>"; - paramJson["CarAttributes"]="<%=startMap.get("CarAttributes")%>"; - paramJson["Leasehold"]="<%=startMap.get("Leasehold")%>"; + paramJson["carAttributes"]="<%=startMap.get("carAttributes")%>"; + paramJson["leasehold"]="<%=startMap.get("leasehold")%>"; + paramJson["modelid"]="<%=startMap.get("modelid")%>"; //paramJson["CurFlowUser"]="<%=FlowFixedParam.get("CurFlowUser")%>"; //paramJson["AgentFlowUser"]="<%=FlowFixedParam.get("AgentFlowUser")%>"; diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp index c1c4fe1a7..010b437fe 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp @@ -43,7 +43,12 @@ String taskno=CurPage.getParameter("TaskNo"); String ishistory=CurPage.getParameter("IsHistory"); String nodeNo=CurPage.getParameter("NodeNo"); -// alert(CarAttributes,Leasehold); + + String carAttributes=CurPage.getParameter("carAttributes"); + String leasehold=CurPage.getParameter("leasehold"); + String carSystem=CurPage.getParameter("carSystem"); + System.out.print("+++++++++++++++++++++++++"+carSystem+"------------------"); + %> <%/*~END~*/%> @@ -112,6 +117,11 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory. <%/*~END~*/%> diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java index 822034d3d..bb1495e62 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java @@ -33,8 +33,9 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{ private String productID; private String CustomerType; - private String CarAttributes; - private String Leasehold; + private String carAttributes; + private String leasehold; + private String carSystem; public String getProductID() { return productID; @@ -54,26 +55,33 @@ public String getProductID() { CustomerType = customerType; } - public String getCarAttributes() { - return CarAttributes; + return carAttributes; } public void setCarAttributes(String carAttributes) { - CarAttributes = carAttributes; + this.carAttributes = carAttributes; } public String getLeasehold() { - return Leasehold; + return leasehold; } public void setLeasehold(String leasehold) { - Leasehold = leasehold; + this.leasehold = leasehold; } + public String getCarSystem() { + return carSystem; + } + + + public void setCarSystem(String carSystem) { + this.carSystem = carSystem; + } @Override public void customOperation(JBOTransaction tx,BizObject flowBussiness) throws Exception { @@ -84,7 +92,8 @@ public String getProductID() { this.FlowParam.put("FlowKey", projectNO); this.FlowParam.put("ProjectName", projectNO); this.FlowParam.put("CustomerType", this.getCustomerType()); - this.FlowParam.put("CarAttributes", getCarAttributes()); - this.FlowParam.put("Leasehold", this.getLeasehold()); + this.FlowParam.put("carAttributes", this.getCarAttributes()); + this.FlowParam.put("leasehold", this.getLeasehold()); + this.FlowParam.put("carSystem", this.getCarSystem()); } }