anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
58261 2018-09-28 15:53:54 +08:00
commit 5419602371
6 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
WebContent/Tenwa/Customer/Lessee/Comm/Invoice/CustomerInvoice.jsp
View File

@ -94,6 +94,7 @@
function validityCheck(){
//验证纳税人识别号
var tax_no = getItemValue(0,getRow(),"tax_no");//纳税人识别号
var certid=getItemValue(0,getRow() , "certid");//统一社会信用代码
var id = getItemValue(0,getRow(),"id");
var tax_account = getItemValue(0,getRow(),"tax_account");//开户账号
var tax_status = getItemValue(0,getRow(),"tax_status");//开票状态
@ -106,7 +107,7 @@
if(typeof(tax_no) != undefined && tax_no != ""){
var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.invoice.CustomerInvoiceController","checkTax_no","tax_no="+tax_no+",customer_id="+"<%=customer_id%>");
if(sReturnInfo != "true"){
alert("统一社会信用代码已存在");
alert("纳税人识别号已存在");
return false;
}
}
@ -114,7 +115,7 @@
if(typeof(tax_no) != undefined && tax_no != "" ){
var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.invoice.CustomerInvoiceController","editCheckTax_no","tax_no="+tax_no+",id="+id+",customer_id="+"<%=customer_id%>");
if(sReturnInfo != "true"){
alert("统一社会信用代码已存在");
alert("纳税人识别号已存在");
return false;
}
}

2
WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp
View File

@ -64,7 +64,7 @@
sumethod6 += parseFloat(getItemValue(0,i,'FACT_MONEY'));
}
}
$('.list_gridCell_standard.list_div_pagecount').text(ormatKNumber(sumethod6,2));
$('.list_gridCell_standard.list_div_pagecount').text(FormatKNumber(sumethod6,2));
})
function setColRequired(){

32
WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
View File

@ -47,36 +47,6 @@
}
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<script type="text/javascript">
var oldFactMoney = 0;
var newFactMoney = 0;
$(function(){
for(var i=0;i<DZ[0][2].length;i++){
oldFactMoney = eval(oldFactMoney + "+" + removeFomatedNumber(getItemValue(0,i,"CORPUS")));
oldFactMoney = eval(oldFactMoney + "+" + removeFomatedNumber(getItemValue(0,i,"INTEREST")));
oldFactMoney = eval(oldFactMoney + "+" + removeFomatedNumber(getItemValue(0,i,"PENALTY")));
var CerificationMoney = eval(removeFomatedNumber(getItemValue(0,i,"CORPUS"))+ "+" + removeFomatedNumber(getItemValue(0,i,"INTEREST"))+ "+" + removeFomatedNumber(getItemValue(0,i,"PENALTY"))+ "-" + removeFomatedNumber(getItemValue(0,i,"INTEREST_ADJUST")));
CerificationMoney = CerificationMoney.toFixed(2);
setItemValue(0,i,"CerificationMoney",CerificationMoney);
}
oldFactMoney = oldFactMoney.toFixed(2);
newFactMoney = oldFactMoney;
total();
})
function get(){
for(var i=0;i<DZ[0][2].length;i++){
var CerificationMoney = eval(removeFomatedNumber(getItemValue(0,i,"CORPUS"))+ "+" + removeFomatedNumber(getItemValue(0,i,"INTEREST"))+ "+" + removeFomatedNumber(getItemValue(0,i,"PENALTY"))+ "-" + removeFomatedNumber(getItemValue(0,i,"INTEREST_ADJUST")));
CerificationMoney = CerificationMoney.toFixed(2);
setItemValue(0,i,"CerificationMoney",CerificationMoney);
}
}
function total(){
var total=0;
for(var i=0;i<DZ[0][2].length;i++){
total= eval(total + "+" + removeFomatedNumber(getItemValue(0,i,"CerificationMoney")));
}
total = total.toFixed(2);
$('#myiframe0_order_GridBody_Cells').children('.list_smallcount_color').find('td').eq(4).children('div').text(total);
}
function updateEbankAndEbankProcessOfDel(){
var rows = getItemValueArray(0,"ID")+"";
if(rows == ""){
@ -245,8 +215,6 @@
setItemValue(0,position,"rent",oldRent);
newFactMoney = newFactMoney - beyondBalance;
}
get();
total();
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

BIN
WebContent/fileTemplate/报价方案.xlsx Normal file
View File

Binary file not shown.

2
src_tenwa/com/tenwa/customer/handler/invoice/CustomerInvoiceHandler.java
View File

@ -20,7 +20,7 @@ public class CustomerInvoiceHandler extends CommonHandler{
if(CUSTOMER_INFO != null)
{
bo.setAttributeValue("tax_object", CUSTOMER_INFO.getAttribute("customername").getString());
bo.setAttributeValue("tax_no", CUSTOMER_INFO.getAttribute("customerid").getString());
bo.setAttributeValue("tax_no", CUSTOMER_INFO.getAttribute("certid").getString());
}
//³õʼ»¯customer_id

9
src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
View File

@ -423,4 +423,13 @@ public class FundIncomeMethod {
}
return "SUCCESS";
}
public static String setCerificationMoney(String corpus,String interest,String penalty){
BigDecimal c = new BigDecimal(corpus);
BigDecimal i = new BigDecimal(interest);
BigDecimal p = new BigDecimal(penalty);
c=c.add(i).add(p);
// double CerificationMoney= Double.valueOf(corpus)+Double.valueOf(interest)+Double.valueOf(penalty);
return c.doubleValue()+"";
}
}