anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into tangfutang

Browse Source
This commit is contained in:
tangfutang 2018-06-12 11:23:23 +08:00
commit db291bf896
8 changed files with 92 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WebContent/Tenwa/Core/FlowManager/FlowPage/FlowPageViewTab.jsp
View File

@ -142,6 +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["modelid"]="<%=startMap.get("modelid")%>";
//paramJson["CurFlowUser"]="<%=FlowFixedParam.get("CurFlowUser")%>";
//paramJson["AgentFlowUser"]="<%=FlowFixedParam.get("AgentFlowUser")%>";

1
WebContent/Tenwa/Lease/Flow/Comm/LBEquipment/LBEquipmentList.jsp
View File

@ -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~*/%>

109
WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
View File

@ -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]);
}
}
}
},"车品牌选择");
<%/*~[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_")
{
//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");
}
},"省份城市");
}
</script>
<%/*~END~*/%>

11
WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp
View File

@ -43,6 +43,12 @@
String taskno=CurPage.getParameter("TaskNo");
String ishistory=CurPage.getParameter("IsHistory");
String nodeNo=CurPage.getParameter("NodeNo");
String carAttributes=CurPage.getParameter("carAttributes");
String leasehold=CurPage.getParameter("leasehold");
String carSystem=CurPage.getParameter("carSystem");
System.out.print("+++++++++++++++++++++++++"+carSystem+"------------------");
%>
<%/*~END~*/%>
@ -111,6 +117,11 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.
<script type="text/javascript">
/*~[Describe=µ¼Èë×âÁÞÎïexcel;InputParam=ÎÞ;OutPutParam=ÎÞ;]~*/
$(function(){
var carSystem="<%=carSystem%>";
setItemValue(0,0,"MODEL",carSystem);
});
function inExcel(){
var importCondition = {};//µ¼ÈëÅäÖÃ
var sEquipType = "<%=sEquipType%>";//×âÁÞÎïÀàÐÍ

1
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessApplyApplyList.jsp
View File

@ -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];

4
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
View File

@ -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);
}
</script>

25
WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
View File

@ -75,21 +75,21 @@
function saveRecord()
{
//从页面上获取客户编号，产品编号
var carAttributes = getItemValue(0,getRow(),"carAttributes");
var leasehold = getItemValue(0,getRow(),"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");
var carSystem = getItemValue(0,getRow(),"carSystem");
if(certtype==""){
alert("请选择证件类型");
@ -127,16 +127,15 @@
}
var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
sParams =sParams+",ProductId="+productid+",ProductName="+productname+",Customer_type="+customerType+",CustomerType="+customerType+",CarAttributes="+carAttributes+",Leasehold="+leasehold;
sParams =sParams+",ProductId="+productid+",ProductName="+productname+",CustomerType="+customerType+",carAttributes="+carAttributes+",leasehold="+leasehold+",carSystem="+carSystem;
var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams);
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_" )
{
doCancel();
}
else
{
parent.AsDialog.ClosePage(sReturnInfo+"@"+customerType);
parent.AsDialog.ClosePage(sReturnInfo+"@"+customerType+"@"+carAttributes+"@"+leasehold+"@"+carSystem);
}
}
@ -244,7 +243,7 @@
return;
}
sReturn = sReturn.split("@");
alert(sReturn);
// alert(sReturn);
setItemValue(0,0,"productId",sReturn[0]);
setItemValue(0,0,"productName",sReturn[1]);
},"请选择产品类型",'');
@ -257,7 +256,7 @@
return;
}
sReturn = sReturn.split("@");
alert(sReturn);
// alert(sReturn);
setItemValue(0,0,"productId",sReturn[0]);
setItemValue(0,0,"productName",sReturn[1]);
},"请选择产品类型",'');
@ -276,7 +275,7 @@
return;
}
sReturn = sReturn.split("@");
alert(sReturn[1]);
// alert(sReturn[1]);
setItemValue(0,0,"CUSTOMERID",sReturn[0]);
setItemValue(0,0,"customername",sReturn[1]);
},"请选择客户",'');
@ -304,7 +303,7 @@
showItem(0,"product_id");//字段显示
}
}
initRow();
//initRow();
</script>
<%/*~END~*/%>

27
src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
View File

@ -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());
}
}