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

WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp

@@ -11,7 +11,7 @@
 
 	String sTempletNo = "DDepositReturn_TempInfo";//--Ä£°åºÅ--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
-	doTemp.setColTips("", "²âÊÔ");
+	/* doTemp.setColTips("", "²âÊÔ"); */
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	//dwTemp.ReadOnly = "-2";//Ö»¶Áģʽ

WebContent/Flow/DealerDepositChargeApplyList.jsp

@@ -4,7 +4,7 @@
 	<script type="text/javascript">
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply(){
-		AsDialog.OpenSelector("selectDealerInfo","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",function(sReturn){
+		AsDialog.OpenSelector("selectDealerChargeInfo","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",function(sReturn){
 	    	if(!sReturn||sReturn=="_CANCEL_"){
     			//alert(getHtmlMessage('1'));//请选择一条信息！
     			return;

WebContent/Flow/DealerDepositReturnApplyList.jsp

@@ -4,7 +4,7 @@
 	<script type="text/javascript">
  	/*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 	function newApply(){
-		AsDialog.OpenSelector("selectDealerInfo","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",function(sReturn){
+		AsDialog.OpenSelector("selectDealerReturnInfo","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px",function(sReturn){
 	    	if(!sReturn||sReturn=="_CANCEL_"){
     			//alert(getHtmlMessage('1'));//请选择一条信息！
     			return;