From 59a189294580f47d2ec7e44a8d1fab4299a40b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 4 Sep 2017 21:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E5=94=AE=E6=89=BE=E9=9B=B6=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E4=B8=8D=E8=83=BD=E5=B0=8F=E4=BA=8E0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/js/pages/materials/in_out.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/js/pages/materials/in_out.js b/src/main/webapp/js/pages/materials/in_out.js
index 9cb038c9..916b51f6 100644
--- a/src/main/webapp/js/pages/materials/in_out.js
+++ b/src/main/webapp/js/pages/materials/in_out.js
@@ -1639,8 +1639,14 @@
 		//零售单据展示数据
 		if(listSubType == "零售" || listSubType == "零售退货"){
 			var changeAccount = $("#depotHeadDlgShow .change-amount-show").text() -0;
-			$("#depotHeadDlgShow .get-amount-show").text((manyAccountMoney).toFixed(2));
-			$("#depotHeadDlgShow .back-amount-show").text((manyAccountMoney -changeAccount).toFixed(2));
+			if(manyAccountMoney!==0){
+				$("#depotHeadDlgShow .get-amount-show").text((manyAccountMoney).toFixed(2));
+				$("#depotHeadDlgShow .back-amount-show").text((manyAccountMoney -changeAccount).toFixed(2));
+			}
+			else {
+				$("#depotHeadDlgShow .get-amount-show").text((changeAccount).toFixed(2));
+				$("#depotHeadDlgShow .back-amount-show").text(0);
+			}
 		}
 		if(listSubType === "销售" || listSubType === "销售退货"){
 			if(depotHeadInfo[18]){
@@ -1793,6 +1799,10 @@
 							$.messager.alert('提示','请选择收款账户！','warning');
 							return;
 						}
+						if($("#backAmount").val()-0 <0){
+							$.messager.alert('提示','找零金额不能小于0！','warning');
+							return;
+						}
 					}
 					else if(listTitle === "销售出库列表"){
 						if(!$('#OrganId').combobox('getValue')){