From 197f55abef8d24a6403a799de610bbf62fad3310 Mon Sep 17 00:00:00 2001 From: zzk Date: Thu, 14 Apr 2022 16:41:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8F=90=E5=89=8D=E7=BB=93?= =?UTF-8?q?=E6=B8=85=E7=95=99=E8=B4=AD=E4=BB=B7=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LCContractTerminate/LCContractTerminateInfo.jsp | 11 ++++++----- .../voucher/CreateVoucherProcess/EarlyContract.java | 4 ---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp index 68872857f..903da5936 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp @@ -251,7 +251,6 @@ //提前部分结清约定终止日校验 function getTimeInfo(){ - debugger var paydayAdjust = getItemValue(0,getRow(),"PAYDAY_ADJUST"); var result = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","checkPaydayAdjust","contractId=<%=contractId%>,paymentnumber=<%=paymentnumber%>,paydayAdjust="+paydayAdjust); if(result.result != "true"){ @@ -424,7 +423,6 @@ function setEquipmentRatioCharge(){ - debugger var settlemethod = getItemValue(0,0,"SETTLE_METHOD"); var ADJUST_TYPE = getItemValue(0,0,"ADJUST_TYPE"); var PAYDAY_ADJUST = getItemValue(0,0,"PAYDAY_ADJUST"); @@ -458,6 +456,7 @@ function settlemet(){ + debugger AsDialog.OpenSelector("selectEquipCarTermination","contractid,<%=contractId%>,flowunid,<%=flowunid%>","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){ setItemValue(0,0,'SETTLE_METHOD',""); @@ -465,11 +464,14 @@ var IDS= sReturn; // 获取选中租赁物参融比例 var PROPROTION_NUMBER = AsControl.RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.EarlyContract","getReductionRatio","flowunid=<%=flowunid%>,IDS="+IDS); - var returns = AsControl.RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.EarlyContract","setEquipmentTerminateStatus","flowunid=<%=flowunid%>,IDS="+IDS); + var NOMINAL_PRICE = AsControl.RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.EarlyContract","getPrice","flowunid=<%=flowunid%>,IDS="+IDS); + var returns = AsControl.RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.EarlyContract","setEquipmentTerminateStatus","flowunid=<%=flowunid%>,IDS="+IDS); if(returns=="false"){ $m.alert("系统异常，请联系管理员！", 'error'); }else{ setItemValue(0,0,'PROPROTION_NUMBER',PROPROTION_NUMBER); + // 留购价 + setItemValue(0,0,'NOMINAL_PRICE',NOMINAL_PRICE); if(PAYDAY_ADJUST!=""){ changeContractTotal(); } @@ -482,6 +484,7 @@ * 提前结清结清金额计算 */ function changeContractTotal(){ + debugger var ADJUST_TYPE = getItemValue(0,0,"ADJUST_TYPE"); var AGREED_PENALTY = parseFloat(getItemValue(0,0,"AGREED_PENALTY")); var SDHANDLING_CHARGE = parseFloat(getItemValue(0,0,"SDHANDLING_CHARGE")); @@ -522,8 +525,6 @@ setItemValue(0,getRow(),"DUN_PENALTY",DUN_PENALTY); // 应退金额 setItemValue(0,getRow(),"OTHER_OUT",'0.00'); - // 留购价 - setItemValue(0,getRow(),"NOMINAL_PRICE","<%=nominalPrice%>"); // 违约金 var ratio=0; if("<%=ratio%>"==""||"<%=ratio%>"==null||"<%=ratio%>"=="null"){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java index 819439f9e..2bfb0d799 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java @@ -238,10 +238,6 @@ public class EarlyContract { return ""+ret+""; } - private Date now() { - // TODO Auto-generated method stub - return null; - } /** * 获取租赁物比重