From e7782312de0a0bb1ae5d54409e835fc4a23c14f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 8 Oct 2017 21:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E7=9A=84=E7=B4=AF=E8=AE=A1=E5=BA=94?=
 =?UTF-8?q?=E6=94=B6=E7=AD=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/js/pages/manage/supplier.js  | 6 +++++-
 src/main/webapp/js/pages/materials/in_out.js | 2 +-
 src/main/webapp/pages/manage/customer.jsp    | 8 ++++----
 src/main/webapp/pages/manage/member.jsp      | 8 ++++----
 src/main/webapp/pages/manage/vendor.jsp      | 8 ++++----
 5 files changed, 18 insertions(+), 14 deletions(-)

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 @@
 					<tr>
 						<td>期初应收</td>
 						<td style="padding:1px">
-							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
 						</td>
 						<td>期初应付</td>
 						<td style="padding:1px">
-							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
 						</td>
 					</tr>
 					<tr>
 						<td>累计应收</td>
 						<td style="padding:1px">
-							<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+							<input name="AllNeedGet" id="AllNeedGet" type="text" style="width: 160px;height: 20px" readonly="readonly" />
 						</td>
 						<td>累计应付</td>
 						<td style="padding:1px">
-							<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+							<input name="AllNeedPay" id="AllNeedPay" type="text" style="width: 160px;height: 20px" readonly="readonly" />
 						</td>
 					</tr>
 					<tr>
diff --git a/src/main/webapp/pages/manage/member.jsp b/src/main/webapp/pages/manage/member.jsp
index ebffb678..e57a26a7 100644
--- a/src/main/webapp/pages/manage/member.jsp
+++ b/src/main/webapp/pages/manage/member.jsp
@@ -100,21 +100,21 @@
 					<tr>
 						<td>期初应收</td>
 						<td style="padding:1px">
-							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
 						</td>
 						<td>期初应付</td>
 						<td style="padding:1px">
-							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
 						</td>
 					</tr>
 					<tr>
 						<td>累计应收</td>
 						<td style="padding:1px">
-							<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+							<input name="AllNeedGet" id="AllNeedGet" type="text" style="width: 160px;height: 20px" readonly="readonly" />
 						</td>
 						<td>累计应付</td>
 						<td style="padding:1px">
-							<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+							<input name="AllNeedPay" id="AllNeedPay" type="text" style="width: 160px;height: 20px" readonly="readonly" />
 						</td>
 					</tr>
 					<tr>
diff --git a/src/main/webapp/pages/manage/vendor.jsp b/src/main/webapp/pages/manage/vendor.jsp
index 55115f67..2c926846 100644
--- a/src/main/webapp/pages/manage/vendor.jsp
+++ b/src/main/webapp/pages/manage/vendor.jsp
@@ -100,21 +100,21 @@
 					<tr>
 						<td>期初应收</td>
 						<td style="padding:1px">
-							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+							<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
 						</td>
 						<td>期初应付</td>
 						<td style="padding:1px">
-							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
+							<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
 						</td>
 					</tr>
 					<tr>
 						<td>累计应收</td>
 						<td style="padding:1px">
-							<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+							<input name="AllNeedGet" id="AllNeedGet" type="text" style="width: 160px;height: 20px" readonly="readonly" />
 						</td>
 						<td>累计应付</td>
 						<td style="padding:1px">
-							<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
+							<input name="AllNeedPay" id="AllNeedPay" type="text" style="width: 160px;height: 20px" readonly="readonly" />
 						</td>
 					</tr>
 					<tr>