From 79dad49adbcd17e3d241f131542f01646593e8e7 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 22:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E5=94=AE=E5=92=8C=E6=94=B6=E9=A2=84?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=EF=BC=8C=E6=94=AF=E6=8C=81=E5=88=B7=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E5=8D=A1=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/js/pages/financial/financial_base.js  | 12 ++++++++++++
 src/main/webapp/js/pages/materials/in_out.js     | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/js/pages/financial/financial_base.js b/src/main/webapp/js/pages/financial/financial_base.js
index 0063cacc3..235a0cb84 100644
--- a/src/main/webapp/js/pages/financial/financial_base.js
+++ b/src/main/webapp/js/pages/financial/financial_base.js
@@ -619,6 +619,18 @@
         initTableData_account("add"); //明细列表
         reject(); //撤销下、刷新材料列表
         url = path + '/accountHead/create.action';
+
+		//收预付款单据支持刷卡功能
+		if(listType == "收预付款") {
+			//当会员卡号长度超过10位后，自动点击下拉框，用于兼容刷卡器
+			$("#OrganId").next().find("input").off("keyup").on("keyup",function(){
+				if($(this).val().length === 10){
+					setTimeout(function(){
+						$(".combo-panel .combobox-item-selected").click();
+					},500);
+				}
+			});
+		}
 	}
 	
 	//编辑信息
diff --git a/src/main/webapp/js/pages/materials/in_out.js b/src/main/webapp/js/pages/materials/in_out.js
index e10697683..ca09dcee2 100644
--- a/src/main/webapp/js/pages/materials/in_out.js
+++ b/src/main/webapp/js/pages/materials/in_out.js
@@ -207,9 +207,9 @@
 		}
 	}
 	
-	//初始化系统基础信息
+	//初始化供应商、客户、散户信息
 	function initSupplier(){
-		$('#OrganId').combobox({    
+		$('#OrganId').combobox({
 			url: organUrl,
 		    valueField:'id',    
 		    textField:'supplier',
@@ -797,7 +797,15 @@
 		//零售单据修改收款时，自动计算找零
 		if(listSubType == "零售" || listSubType == "零售退货") {
 			$("#payType").val("现付");
-			$("#OrganId").combobox("setValue", orgDefaultId);
+			$("#OrganId").combobox("setValue", orgDefaultId); //自动默认选择非会员
+			//当会员卡号长度超过10位后，自动点击下拉框，用于兼容刷卡器
+			$("#OrganId").next().find("input").off("keyup").on("keyup",function(){
+				if($(this).val().length === 10){
+					setTimeout(function(){
+						$(".combo-panel .combobox-item-selected").click();
+					},500);
+				}
+			});
 			var getAmount = $("#depotHeadFM .get-amount");
 			var changeAmount = $("#depotHeadFM .change-amount");
 			var backAmount = $("#depotHeadFM .back-amount");
@@ -1187,7 +1195,7 @@
 		    if(k == "13"&&(obj.id=="searchState"||obj.id=="searchNumber"))
 		    {  
 		        $("#searchBtn").click();
-		    }  
+		    }
 		}); 
 	}