diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
index 10e0c2bcb..311446373 100644
--- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp
@@ -22,8 +22,6 @@
 		clean_lease_money="0";
 	}
 	double money = Double.parseDouble(clean_lease_money);
-	System.out.print("========================="+money);
-	
 	CurPage.getCurComp().setAttribute("RightType", null);
 	
 	String sTempletNo = "VI_BUSINESS_APPROVAL";//--模板号--
@@ -31,9 +29,6 @@
 	doTemp.setHtmlEvent("firstchoice","onChange","changeFirstChoice");
 	doTemp.setHtmlEvent("secondchoice","onChange","changeSecondChoice");
 	doTemp.setHtmlEvent("thirdchoice","onChange","changeThirdChoice");
-	if(null!=ishistory&&ishistory.equals("true")){
-		 doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据
-	}
 	ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	dwTemp.setAttr("inputWidth", "163");
@@ -62,19 +57,35 @@
 		dwTemp.getDataObject().setRequired("secondopinion", true);
 		dwTemp.setGroupHidden("0040,0050");
 	}else if("0050".equals(phaseNo)){//信审
-		dwTemp.getDataObject().setVisible("firstchoice", true);
-		dwTemp.getDataObject().setVisible("firstopinion", true);
-		dwTemp.getDataObject().setReadOnly("firstchoice", true);
-		dwTemp.getDataObject().setReadOnly("firstopinion", true);
-		dwTemp.getDataObject().setVisible("secondchoice", true);
-		dwTemp.getDataObject().setVisible("secondopinion", true);
-		dwTemp.getDataObject().setReadOnly("secondchoice", true);
-		dwTemp.getDataObject().setReadOnly("secondopinion", true);
-		dwTemp.getDataObject().setVisible("thirdchoice", true);
-		dwTemp.getDataObject().setVisible("thirdopinion", true);
-		dwTemp.getDataObject().setRequired("thirdchoice", true);
-		dwTemp.getDataObject().setRequired("thirdopinion", true);
-		//dwTemp.setGroupHidden("0040,0050");
+		if(!"true".equals(ishistory)){
+			dwTemp.getDataObject().setVisible("firstchoice", true);
+			dwTemp.getDataObject().setVisible("firstopinion", true);
+			dwTemp.getDataObject().setReadOnly("firstchoice", true);
+			dwTemp.getDataObject().setReadOnly("firstopinion", true);
+			dwTemp.getDataObject().setVisible("secondchoice", true);
+			dwTemp.getDataObject().setVisible("secondopinion", true);
+			dwTemp.getDataObject().setReadOnly("secondchoice", true);
+			dwTemp.getDataObject().setReadOnly("secondopinion", true);
+			dwTemp.getDataObject().setVisible("thirdchoice", true);
+			dwTemp.getDataObject().setVisible("thirdopinion", true);
+			dwTemp.getDataObject().setRequired("thirdchoice", true);
+			dwTemp.getDataObject().setRequired("thirdopinion", true);
+		}else{
+			dwTemp.getDataObject().setVisible("firstchoice", true);
+			dwTemp.getDataObject().setVisible("firstopinion", true);
+			dwTemp.getDataObject().setReadOnly("firstchoice", true);
+			dwTemp.getDataObject().setReadOnly("firstopinion", true);
+			dwTemp.getDataObject().setVisible("secondchoice", false);
+			dwTemp.getDataObject().setVisible("secondopinion", false);
+			dwTemp.getDataObject().setVisible("thirdchoice", false);
+			dwTemp.getDataObject().setVisible("thirdopinion", false);
+			dwTemp.getDataObject().setVisible("INTEROPINION2", false);
+			dwTemp.getDataObject().setVisible("DISTRIOPINION2", false);
+			dwTemp.getDataObject().setVisible("INTEROPINION3", false);
+			dwTemp.getDataObject().setVisible("DISTRIOPINION3", false);
+
+			dwTemp.setGroupHidden("0030,0040,0050");
+		}
 	}else if("0020".equals(phaseNo)){//经销商
 		dwTemp.getDataObject().setVisible("firstchoice", true);
 		dwTemp.getDataObject().setVisible("firstopinion", true);
@@ -100,7 +111,6 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	$(function(){
-		debugger;
 		switch('<%=phaseNo%>'){
 		case '0030'://初审
 			$("#A_div_1230").attr("style","display:none;");
diff --git a/calc/com/tenwa/flow/CopyDChargeTempToFormal.java b/calc/com/tenwa/flow/CopyDChargeTempToFormal.java
index 262a59d0e..99ca6166a 100644
--- a/calc/com/tenwa/flow/CopyDChargeTempToFormal.java
+++ b/calc/com/tenwa/flow/CopyDChargeTempToFormal.java
@@ -1,13 +1,16 @@
 package com.tenwa.flow;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
 import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT;
 import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT_TEMP;
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
 import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP;
 import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO;
 import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO_TEMP;
+import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO_TEMP;
 
 import com.amarsoft.are.jbo.BizObject;
 import com.amarsoft.are.jbo.BizObjectManager;
@@ -23,11 +26,19 @@ public class CopyDChargeTempToFormal extends BaseBussiness{
 		this.initBussinessParam(Sqlca);
 		String flowunid = this.getAttribute("ObjectNo").toString();
 		String id = this.getAttribute("ProjectId").toString();
+		String DistributorNo = this.getAttribute("DistributorNo").toString();
 		Map<String,String> fromCondtion = new HashMap<String,String>();
 		fromCondtion.put("FLOWUNID",flowunid);
 		Map<String,String> otherProperty = new HashMap<String,String>();
 		//otherProperty.put("ID",id);
 		DataOperatorUtil.copySingleJBO(D_DEPOSITCHARGE_INFO_TEMP.CLASS_NAME, fromCondtion, D_DEPOSITCHARGE_INFO.CLASS_NAME, null, otherProperty, Sqlca);		
+		BizObject dibo = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, "flowunid=:flowunid").setParameter("flowunid",flowunid).getSingleResult(false);
+		BizObject deit = JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO_TEMP.CLASS_NAME, "flowunid=:flowunid").setParameter("flowunid",flowunid).getSingleResult(false);
+		BigDecimal total = new BigDecimal(dibo.getAttribute(DISTRIBUTOR_INFO_TEMP.TOTAL).getString());
+		BigDecimal cautionMoney = new BigDecimal(deit.getAttribute(D_DEPOSITRETURN_INFO_TEMP.CAUTION_MONEY).getString());
+		double num = total.add(cautionMoney).doubleValue();
+		JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set TOTAL='"+num+"' where distributor_no='"+DistributorNo+"'").executeUpdate();
+		
 		return "true";
 	}
 	
diff --git a/calc/com/tenwa/flow/CopyDReturnTempToFormal.java b/calc/com/tenwa/flow/CopyDReturnTempToFormal.java
index 41a44ec56..cc4bcb6e6 100644
--- a/calc/com/tenwa/flow/CopyDReturnTempToFormal.java
+++ b/calc/com/tenwa/flow/CopyDReturnTempToFormal.java
@@ -1,8 +1,10 @@
 package com.tenwa.flow;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
 import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP;
 import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO_TEMP;
 import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO;
@@ -34,6 +36,11 @@ public class CopyDReturnTempToFormal extends BaseBussiness {
 		dit.saveObject(deit);
 		
 		DataOperatorUtil.copySingleJBO(D_DEPOSITRETURN_INFO_TEMP.CLASS_NAME, fromCondtion, D_DEPOSITRETURN_INFO.CLASS_NAME, null, otherProperty, Sqlca);
+		//修改经销商总额
+		BigDecimal total = new BigDecimal(dst.getAttribute(DISTRIBUTOR_INFO_TEMP.TOTAL).getString());
+		BigDecimal cautionMoney = new BigDecimal(deit.getAttribute(D_DEPOSITRETURN_INFO_TEMP.CAUTION_MONEY).getString());
+		double num = total.subtract(cautionMoney).doubleValue();
+		JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set TOTAL='"+num+"' where distributor_no='"+disStatus+"'").executeUpdate();
 		return "true";
 	}
 }