Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r12747 -r12761
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12747)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12761)
@@ -133,7 +133,7 @@
 	{name : 'totalPrice'},
 	{name : 'identificationID'}, 
 	{name : 'batchID'}, 
-	{name : 'diposableGoodsID'},
+	{name : 'disposableGoodsID'},
 	{name : 'expDate' ,type : 'date'},
 	{name : 'supplierName'},
 	{name : 'identification'},
@@ -150,7 +150,7 @@
 	top.Ext.getCmp('warehouseName').setValue(name);
 }
 
-function addItems(diposableGoodsID,batchID,name,amount,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,identification,producingArea){
+function addItems(disposableGoodsID,batchID,name,amount,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,identification,producingArea){
 	if(top.Ext.getCmp('name1').getValue() == null || top.Ext.getCmp('name1').getValue() == ''){
 		showResult("请填写物品名称!");
 		return false;
@@ -192,7 +192,7 @@
 	}
 	
 	for(var i = 0;i < top.Ext.getCmp('godownEntryItemGrid').getStore().getCount();i++){
-		if(top.Ext.getCmp('godownEntryItemGrid').getStore().getAt(i).data.diposableGoodsID == diposableGoodsID && top.Ext.getCmp('godownEntryItemGrid').getStore().getAt(i).data.batchNumber == batchNumber){
+		if(top.Ext.getCmp('godownEntryItemGrid').getStore().getAt(i).data.disposableGoodsID == disposableGoodsID && top.Ext.getCmp('godownEntryItemGrid').getStore().getAt(i).data.batchNumber == batchNumber){
 			showResult("该物品已经存在,不能重复添加!");
 			return false;
 		}
@@ -202,7 +202,7 @@
 	var godownEntryItem = new GodownEntryItemRecord({
 		localID:g_localID++,
 		id : "",
-		diposableGoodsID : diposableGoodsID,
+		disposableGoodsID : disposableGoodsID,
 		identificationID : '',
 		batchID : batchID,
 		name : name,
@@ -223,7 +223,7 @@
 	top.Ext.getCmp('name1').setValue('');
 	top.Ext.getCmp('amount1').setValue('');
 	top.Ext.getCmp('cost1').setValue('');
-	top.Ext.getCmp('diposableGoodsID').setValue('');
+	top.Ext.getCmp('disposableGoodsID').setValue('');
 	top.Ext.getCmp('batchNumber1').setValue('');
 	top.Ext.getCmp('expDate1').setValue('');
 	top.Ext.getCmp('supplier1').setValue('');
@@ -232,7 +232,7 @@
 	top.Ext.getCmp('certification').setValue('');
 	top.Ext.getCmp('name1').focus();
 	
-	batchNumStore.baseParams.diposableGoodsID = '';
+	batchNumStore.baseParams.disposableGoodsID = '';
 	batchNumStore.load();
 }
 
@@ -495,7 +495,7 @@
 				reader : new top.Ext.data.JsonReader({
 					fields : [
 				  	    {name : 'id'},
-				  	    {name : 'diposableGoodsID'},
+				  	    {name : 'disposableGoodsID'},
 				  	    {name : 'name'},
 				  	    {name : 'amount'},
 				  	    {name : 'batchNumber'},
@@ -512,7 +512,7 @@
 			}),
 			cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer(), selectModel,
 	           	{header : "id",dataIndex : 'id',hidden : true},
-	           	{header : "diposableGoodsID",dataIndex : 'diposableGoodsID',hidden : true},
+	           	{header : "disposableGoodsID",dataIndex : 'disposableGoodsID',hidden : true},
 	        	{header : "名称",dataIndex : 'name',width : 160,menuDisabled : true}, 
 	        	{header : "数量",dataIndex : 'amount',width : 40,menuDisabled : true,
         			editor : new top.Ext.form.TextField({
@@ -603,8 +603,8 @@
 			}),
 			tbar : [{
 				xtype : 'hidden',
-				name : 'diposableGoodsID',
-				id : 'diposableGoodsID'
+				name : 'disposableGoodsID',
+				id : 'disposableGoodsID'
 			},{
 				xtype : 'hidden',
 				name : 'barcode',
@@ -633,7 +633,7 @@
 					select : function(combo, record, index) {
 						top.Ext.getCmp('name1').setValue(record.data.name);
 						top.Ext.getCmp('name1').selectText();
-						top.Ext.getCmp('diposableGoodsID').setValue(record.data.id);
+						top.Ext.getCmp('disposableGoodsID').setValue(record.data.id);
 						top.Ext.getCmp('cost1').setValue(record.data.referencePrice);
 						//加载注册证号
 						DiposableGoodsTableManager.getDiposableGoodsCertification(record.data.id,function(result){
@@ -645,7 +645,7 @@
 								top.Ext.getCmp('sterileBatchNumber').setValue(array[2]);
 							}
 						});
-						batchNumStore.baseParams.diposableGoodsID = record.data.id;
+						batchNumStore.baseParams.disposableGoodsID = record.data.id;
 						batchNumStore.load();
 						top.Ext.getCmp('amount1').focus();
 						top.Ext.getCmp('amount1').selectText();
@@ -704,7 +704,7 @@
 					select : function(combo, record, index) {
 						top.Ext.getCmp('batchNumber1').setValue(record.data.batchNumber);
 						
-						var goodsId = top.Ext.getCmp('diposableGoodsID').getValue();
+						var goodsId = top.Ext.getCmp('disposableGoodsID').getValue();
 						var batchNumber = record.data.batchNumber;
 						//加载灭菌批号、生产厂家
 						DiposableGoodsTableManager.getDiposableGoodBatchProperty(goodsId,batchNumber,function(result){
@@ -933,15 +933,15 @@
 				for ( var i = 0, len = records.length; i < len; i++) {
 					if(items == null){
 						items = records[i].data.id 
-						+ ',' + records[i].data.diposableGoodsID 
+						+ ',' + records[i].data.disposableGoodsID 
 						+ ',' + records[i].data.amount 
 						+ ',' + records[i].data.cost 
 						+ ',' + records[i].data.batchNumber 
 						+ ',' + Ext.util.Format.date(records[i].data.expDate, 'Y-m-d')
 						+ ',' + records[i].data.supplierName;
 					}else {
 						items += ';' + records[i].data.id 
-						+ ',' + records[i].data.diposableGoodsID 
+						+ ',' + records[i].data.disposableGoodsID 
 						+ ',' + records[i].data.amount 
 						+ ',' + records[i].data.cost 
 						+ ',' + records[i].data.batchNumber 
@@ -1124,7 +1124,7 @@
 		showResult('请正确填写表单各值');
 		return false;
 	}
-	var diposableGoodsID = top.Ext.getCmp('diposableGoodsID').getValue();
+	var disposableGoodsID = top.Ext.getCmp('disposableGoodsID').getValue();
 	var name = top.Ext.getCmp('name1').getValue();
 	if(name.length==0){
 		showResult('请填写物品名称!');
@@ -1166,14 +1166,14 @@
   		if(dateCompare(expDateStr,nextYearDate) != 1){
 	    		top.Ext.MessageBox.confirm("请确认","添加的物品失效日期在一年之内,确定要添加吗？",function(button, text){
 	    			if("yes" == button){
-	    				addItems(diposableGoodsID,'',name,count,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,'',producingArea);
+	    				addItems(disposableGoodsID,'',name,count,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,'',producingArea);
 	    				var grid = top.Ext.getCmp('godownEntryItemGrid');
 	    			  	setTotalMoney(grid);
 	    			  	top.Ext.getCmp('name1').focus(false,100);
 	    			}
 	    		});
 	  	}else{
-	  		addItems(diposableGoodsID,'',name,count,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,'',producingArea);
+	  		addItems(disposableGoodsID,'',name,count,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,'',producingArea);
 	  		var grid = top.Ext.getCmp('godownEntryItemGrid');
 	  	  	setTotalMoney(grid);
 	  	}
@@ -1366,7 +1366,7 @@
 				var godownEntryItem = new GodownEntryItemRecord({
 					localID:g_localID++,
 					id : action.result.data.itemsList[i].id,
-					diposableGoodsID : action.result.data.itemsList[i].diposableGoods.id,
+					disposableGoodsID : action.result.data.itemsList[i].diposableGoods.id,
 					identificationID : action.result.data.itemsList[i].identificationID,
 					batchID : action.result.data.itemsList[i].batchID,
 					name : action.result.data.itemsList[i].diposableGoods.name + (b == false?"":" ["+specification+"]"),
@@ -1582,7 +1582,7 @@
 						select : function(combo, record, index) {
 							Ext.getCmp('batchNumber').setValue();
 							Ext.getCmp('code').setValue(record.data.name);
-							batchNumStore.baseParams['diposableGoodsID'] = record.data.id;
+							batchNumStore.baseParams['disposableGoodsID'] = record.data.id;
 							batchNumStore.load();
 						}
 					}