From c14c08120f30dda50525af82c6bb5134684013ea 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, 2 Jul 2017 23:07:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=95=E5=85=A5=E9=9B=B6=E5=94=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=88=B7=E5=8D=A1=E6=97=B6=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=A2=84=E4=BB=98=E6=AC=BE=E4=BF=A1=E6=81=AF=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/js/pages/materials/in_out.js | 22 +++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/js/pages/materials/in_out.js b/src/main/webapp/js/pages/materials/in_out.js
index ca09dcee2..c47070b42 100644
--- a/src/main/webapp/js/pages/materials/in_out.js
+++ b/src/main/webapp/js/pages/materials/in_out.js
@@ -24,6 +24,7 @@
 		var amountNum = ""; //单据编号开头字符
 		var depotString = ""; //店铺列表
 		var orgDefaultId = 0; //单位默认编号
+		var orgDefaultList; //存储查询出来的会员列表
 		//初始化系统基础信息
 		getType();
 		initSystemData_UB();
@@ -216,10 +217,13 @@
 			onLoadSuccess: function(res) {
 				var data = $(this).combobox('getData');
 				for(var i = 0; i<= data.length; i++){
-					if(data[i].supplier === "非会员"){
+					if(data && data[i] && data[i].supplier === "非会员"){
 						orgDefaultId = data[i].id;
 					}
 				}
+				if(listSubType === "零售"){
+					orgDefaultList = res;
+				}
 			},
 			onSelect: function(rec){
 				if(listSubType === "零售"){
@@ -800,9 +804,25 @@
 			$("#OrganId").combobox("setValue", orgDefaultId); //自动默认选择非会员
 			//当会员卡号长度超过10位后，自动点击下拉框，用于兼容刷卡器
 			$("#OrganId").next().find("input").off("keyup").on("keyup",function(){
+				var self = this;
 				if($(this).val().length === 10){
 					setTimeout(function(){
 						$(".combo-panel .combobox-item-selected").click();
+						//更新付款类型，加载会员的预付款的金额
+						for(var i=0; i<orgDefaultList.length; i++){
+							var rec = orgDefaultList[i];
+							if(rec.supplier == $(self).val()){
+								var option = "";
+								if(rec.supplier !== "非会员" && rec.advanceIn >0){
+									option = '<option value="预付款">预付款(' + rec.advanceIn + ')</option>';
+									option += '<option value="现付">现付</option>';
+								}
+								else {
+									option += '<option value="现付">现付</option>';
+								}
+								$("#payType").empty().append(option);
+							}
+						}
 					},500);
 				}
 			});