diff --git a/src/main/webapp/js/pages/manage/supplier.js b/src/main/webapp/js/pages/manage/supplier.js index cd233076..5033d04f 100644 --- a/src/main/webapp/js/pages/manage/supplier.js +++ b/src/main/webapp/js/pages/manage/supplier.js @@ -608,6 +608,8 @@ email : supplierInfo[4].replace("undefined",""), BeginNeedGet : supplierInfo[5], BeginNeedPay : supplierInfo[6], + AllNeedGet: "", + AllNeedPay: "", description : supplierInfo[8].replace("undefined",""), type : supplierInfo[9], fax : supplierInfo[10].replace("undefined",""), @@ -654,12 +656,14 @@ var money = moneyA+moneyB; var moneyBeginNeedGet = $("#BeginNeedGet").val()-0; //期初应收 var moneyBeginNeedPay = $("#BeginNeedPay").val()-0; //期初应付 - money = money + moneyBeginNeedPay - moneyBeginNeedGet; + money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2); if(money>0) { + $("#AllNeedGet").val(""); //累计应收-置空 $("#AllNeedPay").val(money); //累计应付 } else { $("#AllNeedGet").val(-money); //累计应收 + $("#AllNeedPay").val(""); //累计应付-置空 } } }, diff --git a/src/main/webapp/js/pages/materials/in_out.js b/src/main/webapp/js/pages/materials/in_out.js index 13c122cd..2bdb8270 100644 --- a/src/main/webapp/js/pages/materials/in_out.js +++ b/src/main/webapp/js/pages/materials/in_out.js @@ -1941,7 +1941,7 @@ } var OrganId = null, ProjectId = null,AllocationProjectId = null; - var ChangeAmount = $.trim($("#ChangeAmount").val()); + var ChangeAmount = $.trim($("#ChangeAmount").val())-0; var TotalPrice = $("#depotHeadFM .datagrid-footer [field='AllPrice'] div").text(); if($('#OrganId').length){ OrganId = $('#OrganId').combobox('getValue'); diff --git a/src/main/webapp/pages/manage/customer.jsp b/src/main/webapp/pages/manage/customer.jsp index 22bbf44d..3c3cd18a 100644 --- a/src/main/webapp/pages/manage/customer.jsp +++ b/src/main/webapp/pages/manage/customer.jsp @@ -100,21 +100,21 @@