From 5da91bd05b050e2c76f5ad670e83706557bb4ccd 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, 9 Aug 2020 23:46:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=94=B6=E5=85=A5=E3=80=81=E6=94=AF?=
 =?UTF-8?q?=E5=87=BA=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=B4=A6=E6=88=B7=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/financial/financial_base.js | 29 ++++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/erp_web/js/pages/financial/financial_base.js b/erp_web/js/pages/financial/financial_base.js
index 433f94d7..444e1d7e 100644
--- a/erp_web/js/pages/financial/financial_base.js
+++ b/erp_web/js/pages/financial/financial_base.js
@@ -1,4 +1,5 @@
 	//初始化界面
+	var defaultAccountId = 0; //默认账户id
 	$(function(){
 		var accountList = null;
 		var accountID = null;
@@ -25,7 +26,6 @@
 		initSystemData_person(); //经手人数据
 		initSelectInfo_person(); //经手人信息
 		initSystemData_account(); //账户数据
-		initSelectInfo_account(); //账户信息
 		initSupplier(); //供应商
 		initTableData();
 		ininPager();
@@ -106,25 +106,22 @@
 				if(res && res.code === 200) {
 					if(res.data) {
                         accountList = res.data.accountList;
+						var options = "";
+						if(accountList !=null) {
+							for(var i = 0 ;i < accountList.length; i++) {
+								var account = accountList[i];
+								options += '<option value="' + account.id + '" data-currentAmount="' + account.currentAmount + '">' + account.name + '</option>';
+								if(account.isDefault) {
+									defaultAccountId = account.id; //给账户赋值默认id
+								}
+							}
+							$("#AccountId").empty().append(options);
+						}
 					}
                 }
 			}
 		});				
 	}
-	//获取账户信息
-	function initSelectInfo_account(){
-		var options = "";				
-		if(accountList !=null)
-		{
-			options = "";
-			for(var i = 0 ;i < accountList.length; i++)
-			{
-				var account = accountList[i];
-				options += '<option value="' + account.id + '">' + account.name + '</option>';
-			}	
-			$("#AccountId").empty().append(options);
-		}
-	}
 	
 	//初始化单位信息
 	function initSupplier(){
@@ -673,6 +670,7 @@
 		$("#BillTime").val(thisDateTime);
 		var thisNumber = getNowFormatDateNum(); //根据时间生成编号
 		$("#BillNo").val(amountNum + thisNumber).focus();
+		$("#AccountId").val(defaultAccountId); //初始化默认的账户Id
 		var addTitle = listTitle.replace("列表","信息");
 		$('#accountHeadDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加' + addTitle);
 		$(".window-mask").css({ width: webW ,height: webH});
@@ -706,6 +704,7 @@
         $('#OrganId').combobox('setValue', res.organId);
         $("#HandsPersonId").val(res.handsPersonId);
         $("#ChangeAmount").val(res.changeAmount);
+		$("#AccountId").val(defaultAccountId); //初始化默认的账户Id
         var TotalPrice = res.totalPrice;
 		preTotalPrice = res.totalPrice; //记录前一次合计金额，用于收预付款
         var editTitle = listTitle.replace("列表","信息");