From b5de1b87198b649c384b2f6bf78787909cb0867f Mon Sep 17 00:00:00 2001
From: user <user@Lenovo-y50>
Date: Mon, 11 Jun 2018 21:20:38 +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

---
 .../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.
 	<script type="text/javascript">
 	
 	/*~[Describe=导入租赁物excel;InputParam=无;OutPutParam=无;]~*/
+	$(function(){
+		var carSystem="<%=carSystem%>"; 
+		setItemValue(0,0,"MODEL",carSystem);
+		
+	});
 	function inExcel(){
 		var importCondition = {};//导入配置
 		var sEquipType = "<%=sEquipType%>";//租赁物类型
diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
index eb0d95495..2440d78e1 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
@@ -75,8 +75,8 @@
 		function saveRecord()
 		{
 			//从页面上获取客户编号，产品编号
-			var carAttributes = getItemValue(0,0,"carAttributes");
-			var leasehold = getItemValue(0,0,"leasehold");
+			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");
@@ -89,7 +89,7 @@
 			var certid =getItemValue(0,getRow(),"certid");
 			var brandid = getItemValue(0,getRow(),"brandid");
 			var seriesid = getItemValue(0,getRow(),"seriesid");
-			var modelid = getItemValue(0,getRow(),"modelid");
+			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);
 			}
 		}
 		
@@ -304,7 +303,7 @@
 				 showItem(0,"product_id");//字段显示
 			}
 	 }
-	 initRow();
+	 //initRow();
   </script>	
  <%/*~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());
 	}
 }