From 2187423be6c2b7c36e5348e56452d5a597da1f1f Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Mon, 27 Aug 2018 16:58:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4ie=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E8=BE=93=E5=85=A5=E6=A1=86=E5=8F=89=E5=8F=B7=EF=BC=88?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E7=82=B9=E5=87=BB=E5=8F=89=E5=8F=B7=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=9A=E8=A7=A6=E5=8F=91onchange=E4=BA=8B=E4=BB=B6=EF=BC=89?=
 =?UTF-8?q?=E3=80=82=202.=E4=BF=AE=E6=94=B9=E7=BD=91=E9=93=B6=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E6=A0=B8=E9=94=80=E8=BE=93=E5=85=A5=E5=80=BC=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Frame/page/resources/css/ow/list.css      |  4 ++
 .../Rent/RentIncome/LCRentIncomeTempList.jsp  | 45 +++++++++++++++----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/WebContent/Frame/page/resources/css/ow/list.css b/WebContent/Frame/page/resources/css/ow/list.css
index a826f158e..ea3364a0b 100644
--- a/WebContent/Frame/page/resources/css/ow/list.css
+++ b/WebContent/Frame/page/resources/css/ow/list.css
@@ -1,6 +1,10 @@
 @charset "gb2312";
 @import url("common.css");
 @import url("../filter.css");
+
+input::-ms-clear{
+     display: none;  
+}
 /*通用表格页面样式*/
 .list_page{
 	background-color: transparent;
diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
index d89d8038e..220b2dc7c 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
@@ -137,6 +137,14 @@
 			}
 			var interest = removeFomatedNumber(getItemValue(0,position,"INTEREST"));
 			rent = eval(thisFactMoney + "+" + interest + "+" + interestadjust);
+			if(eval(rent + "+" + penalty+"-"+interestadjust) <= 0){
+				alert("回笼租金或回笼罚息错误，本次收款金额不能小于等于0。");
+				if(oldValue == ".00"){
+					oldValue = "0.00";
+				}
+				this.value = oldValue;
+				return;
+			}
 			if(rent == 0){
 				setItemValue(0,position,"RENT","0.00");
 			}else{
@@ -156,6 +164,14 @@
 			}
 			var corpus = removeFomatedNumber(getItemValue(0,position,"CORPUS"));
 			rent = eval(thisFactMoney + "+" + corpus + "+" + interestadjust);
+			if(eval(rent + "+" + penalty+"-"+interestadjust) <= 0){
+				alert("回笼租金或回笼罚息错误，本次收款金额不能小于等于0。");
+				if(oldValue == ".00"){
+					oldValue = "0.00";
+				}
+				this.value = oldValue;
+				return;
+			}
 			if(rent == 0){
 				setItemValue(0,position,"RENT","0.00");
 			}else{
@@ -171,6 +187,14 @@
 				this.value = oldValue;
 				return;
 			}
+			if(eval(rent + "+" + penalty+"-"+interestadjust) <= 0){
+				alert("回笼租金或回笼罚息错误，本次收款金额不能小于等于0。");
+				if(oldValue == ".00"){
+					oldValue = "0.00";
+				}
+				this.value = oldValue;
+				return;
+			}
 		}else if(colName == "INTEREST_ADJUST"){
 			var interestOverMoney = AsControl.RunJsp("/Tenwa/Lease/Flow/Rent/RentIncome/GetRentPlanOverMoney.jsp","paymentNumber="+paymentNumber+"&planList="+planList+"&flowunid=<%=flowunid%>&colName=INTEREST");
 			var corpus = removeFomatedNumber(getItemValue(0,position,"CORPUS"));
@@ -184,20 +208,24 @@
 				return;
 			}
 			rent = eval(thisFactMoney + "+" + corpus + "+" + interest);
+			if(eval(rent + "+" + penalty+"-"+interestadjust) <= 0){
+				alert("回笼租金或回笼罚息错误，本次收款金额不能小于等于0。");
+				if(oldValue == ".00"){
+					oldValue = "0.00";
+				}
+				this.value = oldValue;
+				return;
+			}
 			if(rent == 0){
 				setItemValue(0,position,"RENT","0.00");
 			}else{
 				setItemValue(0,position,"RENT",getDWFomatedNumber(eval(thisFactMoney + "+" + corpus+ "+" + interest),2));
 			}
 		}
-		if(eval(rent + "+" + penalty+"-"+interestadjust) <= 0){
-			alert("回笼租金或回笼罚息错误，本次收款金额不能小于等于0。");
-			if(oldValue == ".00"){
-				oldValue = "0.00";
-			}
-			this.value = oldValue;
-			return;
-		}
+		
+			
+		
+		
 		for(var i=0;i<DZ[0][2].length;i++){
 			newFactMoney = eval(newFactMoney + "+" + getItemValue(0,i,"CORPUS"));
 			newFactMoney = eval(newFactMoney + "+" + getItemValue(0,i,"INTEREST"));
@@ -218,6 +246,7 @@
 			newFactMoney = newFactMoney - beyondBalance;
 		}
 		get();
+		total();
 	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file