From 3bc21efcf2501b523d872076f7502b38f8924ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 8 Jan 2019 23:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E8=B4=A6=E6=88=B7=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/in_out.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index 59e32bba..d4305fda 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -1727,10 +1727,7 @@
 	    $("#OperTimeShow").text(depotHeadInfo[4]);
 	    $('#OrganIdShow').text(depotHeadInfo[11]);
 	    $("#HandsPersonIdShow").text(depotHeadInfo[12]);
-		if(depotHeadInfo[13]){
-			$("#AccountIdShow").text(depotHeadInfo[13]); //结算账户
-		}
-	    else if(depotHeadInfo[22] && depotHeadInfo[23]){
+	    if(depotHeadInfo[22]!="undefined" && depotHeadInfo[23]!="undefined"){
 			var accountArr = depotHeadInfo[22].split(","); //账户id列表
 			var accountMoneyArr = depotHeadInfo[23].split(","); //账户金额列表
 			var accountIdShow = "";
@@ -1750,7 +1747,9 @@
 				}
 			}
 			$("#AccountIdShow").text(accountIdShow);
-		}
+		} else if(depotHeadInfo[13]){
+            $("#AccountIdShow").text(depotHeadInfo[13]); //结算账户
+        }
 	    $("#ChangeAmountShow").text(depotHeadInfo[8]);
 	    $("#RemarkShow").text(depotHeadInfo[9]);
 		$("#DiscountShow").text(depotHeadInfo[19]);