From e9a381311e78ea8ab7f88e1d155f81eab5cb5df7 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Thu, 13 Sep 2018 20:47:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89=E6=8A=A5=E4=BB=B7=E5=8D=95?=
 =?UTF-8?q?=E7=AD=89=E6=93=8D=E4=BD=9C=E9=87=8C=E9=9D=A2=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8C=89=E9=92=AE=202.=E4=BF=AE=E6=94=B9=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E7=94=B3=E8=AF=B7=E7=9A=84BUG=203.=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E4=BB=98=E6=AC=BE=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tenwa/Lease/Flow/Comm/LBReport/LBReportList.jsp      | 4 ++--
 WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp   | 4 ++--
 .../Lease/Flow/Comm/QuotationList/QuotationList.jsp      | 5 ++---
 .../ActualPayment/TraditionActualPaymentTempList.jsp     | 2 +-
 .../Fund/TraditionFundPayment/ActualPaymentTempList.jsp  | 2 +-
 .../reckon/copydata/CalcConditionTempToContract.java     | 9 +++++----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBReport/LBReportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBReport/LBReportList.jsp
index ff603b52f..a43aef280 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBReport/LBReportList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBReport/LBReportList.jsp
@@ -64,9 +64,9 @@
 					getObj(0,i,"FILENAME").innerHTML=html;
 				};
 					for(var i=0;i<getRowCount(0);i++){
-						html='<a class="btn_icon_detail" onclick="viewOffice()">&nbsp</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+						html='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 						if((null ==RightType||RightType!="ReadOnly")&&(null==ishistory||ishistory!="true")){
-						html+=' <a class="btn_icon_edit" onclick="editOffice()">&nbsp;</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
+						html+=' <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
 						}
 						getObj(0,i,"ACTION").innerHTML=html;
 					}
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp
index a061db6f3..09f4cc86a 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBRisk/LBRistList.jsp
@@ -62,9 +62,9 @@
 					getObj(0,i,"FILENAME").innerHTML=html;
 				};
 					for(var i=0;i<getRowCount(0);i++){
-						html='<a class="btn_icon_detail" onclick="viewOffice()">&nbsp</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+						html='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 						if((null ==RightType||RightType!="ReadOnly")&&(null==ishistory||ishistory!="true")){
-						html+=' <a class="btn_icon_edit" onclick="editOffice()">&nbsp;</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
+						html+=' <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
 						}
 						getObj(0,i,"ACTION").innerHTML=html;
 					}
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/QuotationList/QuotationList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/QuotationList/QuotationList.jsp
index d9264d8c3..6e8ac152e 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/QuotationList/QuotationList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/QuotationList/QuotationList.jsp
@@ -75,9 +75,9 @@ if("".equals(PROJECT_PLAN_NUMBER)||PROJECT_PLAN_NUMBER.length()==0){
 					getObj(0,i,"FILENAME").innerHTML=html;
 				};
 					for(var i=0;i<getRowCount(0);i++){
-						html='<a class="btn_icon_detail" onclick="viewOffice()">&nbsp</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+						html='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 						if((null ==RightType||RightType!="ReadOnly")&&(null==ishistory||ishistory!="true")){
-						html+=' <a class="btn_icon_edit" onclick="editOffice()">&nbsp;</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
+						html+='<a class="btn_icon_delete"onclick="deleteFile()">&nbsp;</a>&nbsp;&nbsp;&nbsp; ';
 						}
 						getObj(0,i,"ACTION").innerHTML=html;
 					}
@@ -143,7 +143,6 @@ if("".equals(PROJECT_PLAN_NUMBER)||PROJECT_PLAN_NUMBER.length()==0){
 			var sparam="";
 			//模板号
 			param["templateNo"]="2017052300000001";
-			
 			//生成文件关联关系
 			tempParam["OBJECTTYPE"]="";
 			tempParam["FLOW_UNID"]="<%=flowunid%>";
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/TraditionActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/TraditionActualPaymentTempList.jsp
index 25bf4fc8d..5f882df95 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/TraditionActualPaymentTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/TraditionActualPaymentTempList.jsp
@@ -9,7 +9,7 @@
 	String rightType = CurComp.getParameter("RightType");
     String flowunid = CurPage.getParameter("FlowUnid");
     String ishistory = CurPage.getParameter("IsHistory");
-	ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempList");
+	ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempListBusiness");
 	if(null!=ishistory&&ishistory.equals("true")){
 		doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
 	}
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp
index 25bf4fc8d..5f882df95 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp
@@ -9,7 +9,7 @@
 	String rightType = CurComp.getParameter("RightType");
     String flowunid = CurPage.getParameter("FlowUnid");
     String ishistory = CurPage.getParameter("IsHistory");
-	ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempList");
+	ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempListBusiness");
 	if(null!=ishistory&&ishistory.equals("true")){
 		doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
 	}
diff --git a/calc/com/tenwa/reckon/copydata/CalcConditionTempToContract.java b/calc/com/tenwa/reckon/copydata/CalcConditionTempToContract.java
index 6eb8e41ce..27ff9d48e 100644
--- a/calc/com/tenwa/reckon/copydata/CalcConditionTempToContract.java
+++ b/calc/com/tenwa/reckon/copydata/CalcConditionTempToContract.java
@@ -30,11 +30,12 @@ public class CalcConditionTempToContract extends Bizlet{
 
 		String sContractId=flow.getAttribute("contract_id").getString();//合同号
 		//String rent_method=contract.getAttribute("RENT_METHOD").getString();
-		if("1".equals(projinfo!=null?projinfo.getAttribute(LB_PROJECT_INFO.BUSINESSTYPE).toString():"")){//汽车
+//		if("1".equals(projinfo!=null?projinfo.getAttribute(LB_PROJECT_INFO.BUSINESSTYPE).toString():"")){//汽车
+		//安鹏没有多次起租，只有单次起租。
 			ser.tempToContractOne(sFlowUnid,sContractId,Sqlca);
-		}else{
-			ser.tempToContractMany(sFlowUnid, sContractId, Sqlca);
-		}
+//		}else{
+//			ser.tempToContractMany(sFlowUnid, sContractId, Sqlca);
+//		}
 		String sMessage="true"; 
 		return sMessage;