From fdfce7be5b478a803ae70a115b67c17143b1e167 Mon Sep 17 00:00:00 2001 From: user Date: Thu, 14 Jun 2018 17:16:21 +0800 Subject: [PATCH] =?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 --- .../Person/LegalPersonApplicationInfo.jsp | 4 ++-- .../Comm/LBEquipment_Car/LBEquipmentList.jsp | 10 ++++---- .../ProjectApprovalCreationInfo.jsp | 10 ++++---- .../LBProjectIntoTempInitCarBusiness.java | 23 ++++++++++++++++++ .../BusinessApprovalStartAction.java | 24 +++++++++++++++++-- 5 files changed, 57 insertions(+), 14 deletions(-) diff --git a/WebContent/Tenwa/Customer/Lessee/Person/LegalPersonApplicationInfo.jsp b/WebContent/Tenwa/Customer/Lessee/Person/LegalPersonApplicationInfo.jsp index bdabd6ae9..5b3862c24 100644 --- a/WebContent/Tenwa/Customer/Lessee/Person/LegalPersonApplicationInfo.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Person/LegalPersonApplicationInfo.jsp @@ -10,11 +10,11 @@ String sTempletNo = "LegalPersonApplicationInfo";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); - doTemp.setColTips("", "测试"); + doTemp.setColTips("", ""); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//只读模式 - dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo")); + dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid")); String sButtons[][] = { {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp index 2a04bd36d..81821753d 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp @@ -92,12 +92,12 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory. }else{ sButtons=new String[][]{ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - {"true","","Button","新增","新增租赁物信息","newRecord()","","","","btn_icon_add",""}, + //{"true","","Button","新增","新增租赁物信息","newRecord()","","","","btn_icon_add",""}, {"true","","Button","修改","修改租赁物信息","viewAndEdit()","","","","btn_icon_edit"}, - {"true","","Button","删除","删除租赁物信息","deleteRecord()","","","","btn_icon_delete",""}, - {"true","","Button","导入Excel","导入租赁物信息Excel","inExcel()","","","","",""}, - {"true","","Button","导出Excel","导出租赁物信息Excel","exportPage('"+sWebRootPath+"',0,'excel','"+dwTemp.getArgsValue()+"')","","","","",""}, - {"true","","Button","下载模板","下载租赁物信息模板","downLoad()","","","","",""} + //{"true","","Button","删除","删除租赁物信息","deleteRecord()","","","","btn_icon_delete",""}, + //{"true","","Button","导入Excel","导入租赁物信息Excel","inExcel()","","","","",""}, + //{"true","","Button","导出Excel","导出租赁物信息Excel","exportPage('"+sWebRootPath+"',0,'excel','"+dwTemp.getArgsValue()+"')","","","","",""}, + //{"true","","Button","下载模板","下载租赁物信息模板","downLoad()","","","","",""} }; } %> diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index 0ed6c72f6..74280d0f0 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -125,7 +125,7 @@ } var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",ProductId="+productid+",ProductName="+productname+",CustomerType="+customerType+",carAttributes="+carAttributes+",leasehold="+leasehold+",carSystem="+carSystem+",custname="+custname+",certtype="+certtype+",certid="+certid; + sParams =sParams+",ProductId="+productid+",ProductName="+productname+",CustomerType="+customerType+",carAttributes="+carAttributes+",leasehold="+leasehold+",carSystem="+carSystem+",custname="+custname+",certtype="+certtype+",certid="+certid+",productModel="+productModel+",carSeries="+carSeries; var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_" ) { @@ -133,7 +133,7 @@ } else { - parent.AsDialog.ClosePage(sReturnInfo+"@"+customerType+"@"+carAttributes+"@"+leasehold+"@"+carSystem+"@"+custname+"@"+certtype+"@"+certid); + parent.AsDialog.ClosePage(sReturnInfo+"@"+customerType+"@"+carAttributes+"@"+leasehold+"@"+carSystem+"@"+custname+"@"+certtype+"@"+certid+"@"+productModel+"@"+carSeries); } } @@ -225,7 +225,7 @@ } } - <%/*~[Describe=选择产品类型;]~*/%> + <%/*~[Describe=选择产品;]~*/%> function selectBusinessType() { @@ -244,7 +244,7 @@ // alert(sReturn); setItemValue(0,0,"productId",sReturn[0]); setItemValue(0,0,"productName",sReturn[1]); - },"请选择产品类型",''); + },"请选择产品",''); }else if(carAttributes=='2'){ AsDialog.OpenSelector("SelectBusinessType","ProductType,1,TypeNo,0005","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", function(sReturn){ @@ -257,7 +257,7 @@ // alert(sReturn); setItemValue(0,0,"productId",sReturn[0]); setItemValue(0,0,"productName",sReturn[1]); - },"请选择产品类型",''); + },"请选择产品",''); } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index 5a162a338..2230d8722 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -1,6 +1,8 @@ package com.tenwa.lease.flow.project.commbusiness; +import jbo.app.lpapplication; import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP; +import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP; import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP; @@ -25,12 +27,20 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { BizObjectManager bm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME); BizObjectManager bmCPT = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME,Sqlca); //顺便初始化客户信息 BizObjectManager bmLULT = JBOFactory.getBizObjectManager(LB_UNION_LESSEE_TEMP.CLASS_NAME,Sqlca); + BizObjectManager bmLPA = JBOFactory.getBizObjectManager(lpapplication.CLASS_NAME,Sqlca); + BizObjectManager bmLECT = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME,Sqlca); Sqlca.join(bm); String customerid = UUIDUtil.getUUID(); + BizObject bo = bm.newObject(); BizObject boCRT = bmCPT.newObject(); BizObject boLULT = bmLULT.newObject(); + BizObject bmLP = bmLPA.newObject(); + BizObject bmLEC = bmLECT.newObject(); + + ASUser asUser=new ASUser(this.getAttribute("CurUserID").toString()); + boCRT.setAttributeValue("flowunid", this.getAttribute("FlowUnid")); boCRT.setAttributeValue("customerid", customerid); boCRT.setAttributeValue("InputOrgID", asUser.getOrgID()); @@ -40,7 +50,16 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { boCRT.setAttributeValue("CERTTYPE", this.getAttribute("certtype")); boCRT.setAttributeValue("CERTID", this.getAttribute("certid")); + bmLP.setAttributeValue("flowunid", this.getAttribute("FlowUnid")); + bmLP.setAttributeValue("customerid", customerid); + bmLP.setAttributeValue("enterprisename", this.getAttribute("custname")); + bmLP.setAttributeValue("certtype", this.getAttribute("certtype")); + bmLP.setAttributeValue("certid", this.getAttribute("certid")); + bmLEC.setAttributeValue("FLOWUNID", this.getAttribute("FlowUnid")); + bmLEC.setAttributeValue("MODEL", this.getAttribute("carSystem")); + bmLEC.setAttributeValue("BRAND", this.getAttribute("productModel")); + bmLEC.setAttributeValue("car_series", this.getAttribute("carSeries")); boLULT.setAttributeValue("project_id", this.getAttribute("ProjectId")); @@ -67,9 +86,13 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { bo.setAttributeValue("InputOrgID", asUser.getOrgID()); bo.setAttributeValue("InputUserID", asUser.getUserID()); bo.setAttributeValue("InputTime", StringFunction.getToday()); + bm.saveObject(bo); bmCPT.saveObject(boCRT); bmLULT.saveObject(boLULT); + bmLPA.saveObject(bmLP); + bmLECT.saveObject(bmLEC); + String sMessage="true"; return sMessage; } 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 708884393..4d3e820af 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java @@ -39,6 +39,8 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{ private String custname; private String certtype; private String certid; + private String productModel; + private String carSeries; @Override public void customOperation(JBOTransaction tx,BizObject flowBussiness) throws Exception { @@ -53,10 +55,28 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{ this.FlowParam.put("leasehold", this.getLeasehold()); this.FlowParam.put("carSystem", this.getCarSystem()); this.FlowParam.put("custname", this.getCustname()); - this.FlowParam.put(certtype, this.getCerttype()); - this.FlowParam.put(certid, this.getCertid()); + this.FlowParam.put("certtype", this.getCerttype()); + this.FlowParam.put("certid", this.getCertid()); + this.FlowParam.put("productModel", getProductModel()); + this.FlowParam.put("carSeries", getCarSeries()); } + public String getProductModel() { + return productModel; + } + + public void setProductModel(String productModel) { + this.productModel = productModel; + } + + public String getCarSeries() { + return carSeries; + } + + public void setCarSeries(String carSeries) { + this.carSeries = carSeries; + } + public String getCertid() { return certid; }