Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
===================================================================
diff -u -r16965 -r17008
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js	(.../setGoodsOption.js)	(revision 16965)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js	(.../setGoodsOption.js)	(revision 17008)
@@ -92,33 +92,43 @@
  * 添加物品到视图列表，如果是已添加的物品不可以再添加
  * 
  * @param goodsName	物品名称
- * @param batchAdd	是否为批量添加（即：点全部器械包或者全部一次性物品的按钮）
  * 
  * @returns 
  */
-function addGoodsToGridPanel(goodsName, batchAdd) {
+function addGoodsToGridPanel(goodsName) {
 	
 	if (goodsName) {
-		 var isExist = false;  //此物品名称是否已经添加过
 		 for (var i = 0; i < apparatusInfuTypeStore.getCount(); i++) {
-			 var record = apparatusInfuTypeStore.getAt(i);
-			 if(record.get('name') == goodsName){
-				 isExist = true;
-				 break;
+			 if(apparatusInfuTypeStore.getAt(i).get('name') == goodsName){
+				 showResult(goodsName+"，已添加！");
+				 return false;
 			 }
 		 }
-		 if(!isExist){
-			 var goodsRecord  = new GoodsRecord({name : goodsName});
-			 apparatusInfuTypeStore.add(goodsRecord);
-			 top.Ext.getCmp('goodsSearch').setValue('');
-		 }else{
-			 batchAdd ? (function(){})() : (function(){showResult(goodsName+"，已添加！");return false;})();  //不是批量添加的则提示一下
-		 } 
+		 var goodsRecord  = new GoodsRecord({name : goodsName});
+		 apparatusInfuTypeStore.add(goodsRecord);
+		 top.Ext.getCmp('goodsSearch').setValue(''); 
 	 }
 	
 }
 
 /**
+ * 批量添加物品到视图列表
+ * 
+ * @param records	需要添加的物品集合
+ * 
+ * @returns 
+ */
+function batchAddGoodsToGridPanel(recordArray) {
+	
+	if (recordArray && recordArray.length > 0) {
+		apparatusInfuTypeStore.removeAll();
+		apparatusInfuTypeStore.add(recordArray);
+	}
+	
+}
+
+
+/**
  * 从视图列表删除已选择的物品
  * 
  */
@@ -230,15 +240,15 @@
 			render : function(c) {
 				c.getEl().on('keypress',function(e) {
 					if (e.getKey() == 13) {
-						addGoodsToGridPanel(top.Ext.getCmp('goodsSearch').getValue(), false);
+						addGoodsToGridPanel(top.Ext.getCmp('goodsSearch').getValue());
 					}
 				});
 			}
 		}
 	},{
 		text : '添加',
 		handler : function () {
-			addGoodsToGridPanel(top.Ext.getCmp('goodsSearch').getValue(), false);
+			addGoodsToGridPanel(top.Ext.getCmp('goodsSearch').getValue());
 		}
 	},{
 		text : '全部器械包',
@@ -253,10 +263,12 @@
 				success : function(response, options) {
 					var result = Ext.decode(response.responseText);
 					if (result && result.data) {
+						var recordArray = new Array();
 						var tousseArray = result.data;
 						for(var i = 0; i < tousseArray.length; i ++){
-							addGoodsToGridPanel(tousseArray[i].name, true);
+							recordArray.push(new GoodsRecord({name : tousseArray[i].name}));
 						}
+						batchAddGoodsToGridPanel(recordArray);
 					}
 				},
 				failure : function(response, options) {
@@ -273,10 +285,12 @@
 				success : function(response, options) {
 					var result = Ext.decode(response.responseText);
 					if (result && result.data) {
+						var recordArray = new Array();
 						var disposableGoodsArray = result.data;
 						for(var i = 0; i < disposableGoodsArray.length; i ++){
-							addGoodsToGridPanel(disposableGoodsArray[i].name, true);
+							recordArray.push(new GoodsRecord({name : disposableGoodsArray[i].name}));
 						}
+						batchAddGoodsToGridPanel(recordArray);
 					}
 				},
 				failure : function(response, options) {