Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js
===================================================================
diff -u -r12838 -r12846
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js	(.../appropriationView.js)	(revision 12838)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/appropriationView.js	(.../appropriationView.js)	(revision 12846)
@@ -315,158 +315,6 @@
 	clearFormData();
 	wareHouseStore.load();
 	targetWareHouseStore.load();
-	var toolbar = [{
-				xtype : 'hidden',
-				name : 'disposableGoodsStockID',
-				id : 'disposableGoodsStockID'
-			},{
-				xtype : 'hidden',
-				name : 'barcode',
-				id : 'barcode'
-			},{
-				xtype : 'hidden',
-				name : 'sterileBatchNumber',
-				id : 'sterileBatchNumber'
-			},{
-				xtype : 'hidden',
-				name : 'manufacturer',
-				id : 'manufacturer'
-			},{
-				xtype : 'hidden',
-				name : 'certification',
-				id : 'certification'
-			},{
-				xtype : 'hidden',
-				name : 'producingArea',
-				id : 'producingArea'
-			},{
-				text : '名称:'
-			},{
-				xtype : 'combo',
-				id : 'name1',
-				name : 'name1',
-				queryParam : 'spell',
-				minChars : 0,
-				valueField : 'id',
-				displayField : 'name',
-				store : disposableGoodsStockStore,
-				forceSelection : true,
-				lazyInit : false,
-				triggerAction : 'all',
-				hideTrigger : true,
-				typeAhead : false,
-				allowBlank : true,
-				disabled : true,
-				width : 180,
-				listeners : {
-					select : function(combo, record, index) {
-						top.Ext.getCmp('name1').setValue(record.data.name);
-						top.Ext.getCmp('disposableGoodsStockID').setValue(record.data.id);
-						top.Ext.getCmp('cost').setValue(record.data.referencePrice);
-						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
-						top.Ext.getCmp('certification').setValue(record.data.certification);
-						
-						// 清空批次和价格
-						clearBatchNumberAndPrice();
-						var wareHouseid = top.Ext.getCmp('warehouseID').getValue();
-						DiposableGoodsTableManager.getBatchsByDisposableGoodsStockIdAndWareHouse(record.data.id,wareHouseid,false,function(batchesStr){
-							var batches = JSON.parse(batchesStr);
-							for(var i = 0;i<batches.length;i++){
-								batches[i].expDate = batches[i].expDateStr;
-							}
-							setBatchNumbers(batches, true);
-						});
-					},
-					specialkey : function(field, ee) {
-						if (ee.getKey() == Ext.EventObject.ENTER) {
-							top.Ext.getCmp('amount1').focus();
-						}
-					}
-				}
-			},{
-				text : '数量:'
-			},{
-				xtype : 'textfield',
-				maxLength : '16',
-				id : 'amount1',
-				name : 'amount1',
-				width : 80,
-				regex: /^\d+$/,
-				regexText:'只能输入数字',
-				anchor : '95%',
-				listeners : {
-					specialkey : function(field, e) {
-						if (e.getKey() == Ext.EventObject.ENTER) {
-							top.Ext.getCmp('batchNumber1').focus();
-						}
-					}
-				}
-			},{
-				text : '批次:'
-			},{
-				xtype : 'combo',
-				id : 'batchNumber1',
-				name : 'batchNumber1',
-				valueField : 'batchNumber',
-				displayField : 'batchNumber',
-				store : disposableGoodsBatchNumStore,
-				editable : false,
-				forceSelection : true,
-				mode : 'local',
-				triggerAction : 'all',
-				typeAhead : false,
-				allowBlank : false,
-				width : 120,
-				anchor : '95%',
-				listeners:{
-					select : function(combo, record, index) {
-						var disposableGoodID = top.Ext.get('disposableGoodsStockID').getValue();
-						top.Ext.getCmp('cost').setValue(record.data.cost);
-						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
-						top.Ext.getCmp('expDate').setValue(record.data.expDate);
-						top.Ext.getCmp('sterileBatchNumber').setValue(record.data.sterileBatchNumber);
-						top.Ext.getCmp('manufacturer').setValue(record.data.manufacturer);
-						top.Ext.getCmp('producingArea').setValue(record.data.producingArea);
-						// 清空价格
-						clearPrice();
-						// 填充价格
-						var batch = getSelectedBatch();
-						GodownEntryTableManager.getDiposableGoodsPriceAmountInfoCanOutEntryByBatchID(batch.id,function(priceAmounts){
-							setPrices(priceAmounts,true);
-						});
-					}
-				}
-			},{
-				text : '单价  :'
-			},{
-				xtype : 'combo',
-				id : 'combo_price',
-				name : 'combo_price',
-				valueField : 'price',
-				displayField : 'price',
-				store : priceStore,
-				editable : false,
-				forceSelection : true,
-				mode : 'local',
-				triggerAction : 'all',
-				typeAhead : false,
-				allowBlank : false,
-				width : 100,
-				anchor : '95%'
-			},
-			{
-				text : '添加',
-				iconCls : 'btn_ext_add',
-				handler : function() {
-					var disposableGoodsStockID = top.Ext.getCmp('disposableGoodsStockID').getValue();
-					var name = top.Ext.getCmp('name1').getValue();
-					var count = top.Ext.getCmp('amount1').getValue();
-					var batchNumber = top.Ext.getCmp('batchNumber1').getValue();
-					var batch = getSelectedBatch();
-					var priceAmount = getSelectedPriceAmount();
-					addItems(disposableGoodsStockID,name,count,batch,priceAmount);
-				}
-			}];
 	var form = new top.Ext.FormPanel({
 		id : 'appropriationForm',
 		frame : true,
@@ -717,7 +565,159 @@
 			selModel : new top.Ext.grid.RowSelectionModel({
 				singleSelect : false
 			}),
-			tbar : commonEntry.isOpen() ? '' : toolbar
+			tbar : [{
+				xtype : 'hidden',
+				name : 'disposableGoodsStockID',
+				id : 'disposableGoodsStockID'
+			},{
+				xtype : 'hidden',
+				name : 'barcode',
+				id : 'barcode'
+			},{
+				xtype : 'hidden',
+				name : 'sterileBatchNumber',
+				id : 'sterileBatchNumber'
+			},{
+				xtype : 'hidden',
+				name : 'manufacturer',
+				id : 'manufacturer'
+			},{
+				xtype : 'hidden',
+				name : 'certification',
+				id : 'certification'
+			},{
+				xtype : 'hidden',
+				name : 'producingArea',
+				id : 'producingArea'
+			},{
+				text : '名称:'
+			},{
+				xtype : 'combo',
+				id : 'name1',
+				name : 'name1',
+				queryParam : 'spell',
+				minChars : 0,
+				valueField : 'id',
+				displayField : 'name',
+				store : disposableGoodsStockStore,
+				forceSelection : true,
+				lazyInit : false,
+				triggerAction : 'all',
+				hideTrigger : true,
+				typeAhead : false,
+				allowBlank : true,
+				disabled : true,
+				width : 180,
+				listeners : {
+					select : function(combo, record, index) {
+						top.Ext.getCmp('name1').setValue(record.data.name);
+						top.Ext.getCmp('disposableGoodsStockID').setValue(record.data.id);
+						top.Ext.getCmp('cost').setValue(record.data.referencePrice);
+						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
+						top.Ext.getCmp('certification').setValue(record.data.certification);
+						
+						// 清空批次和价格
+						clearBatchNumberAndPrice();
+						var wareHouseid = top.Ext.getCmp('warehouseID').getValue();
+						DiposableGoodsTableManager.getBatchsByDisposableGoodsStockIdAndWareHouse(record.data.id,wareHouseid,false,function(batchesStr){
+							var batches = JSON.parse(batchesStr);
+							for(var i = 0;i<batches.length;i++){
+								batches[i].expDate = batches[i].expDateStr;
+							}
+							setBatchNumbers(batches, true);
+						});
+					},
+					specialkey : function(field, ee) {
+						if (ee.getKey() == Ext.EventObject.ENTER) {
+							top.Ext.getCmp('amount1').focus();
+						}
+					}
+				}
+			},{
+				text : '数量:'
+			},{
+				xtype : 'textfield',
+				maxLength : '16',
+				id : 'amount1',
+				name : 'amount1',
+				width : 80,
+				regex: /^\d+$/,
+				regexText:'只能输入数字',
+				anchor : '95%',
+				listeners : {
+					specialkey : function(field, e) {
+						if (e.getKey() == Ext.EventObject.ENTER) {
+							top.Ext.getCmp('batchNumber1').focus();
+						}
+					}
+				}
+			},{
+				text : '批次:'
+			},{
+				xtype : 'combo',
+				id : 'batchNumber1',
+				name : 'batchNumber1',
+				valueField : 'batchNumber',
+				displayField : 'batchNumber',
+				store : disposableGoodsBatchNumStore,
+				editable : false,
+				forceSelection : true,
+				mode : 'local',
+				triggerAction : 'all',
+				typeAhead : false,
+				allowBlank : false,
+				width : 120,
+				anchor : '95%',
+				listeners:{
+					select : function(combo, record, index) {
+						var disposableGoodID = top.Ext.get('disposableGoodsStockID').getValue();
+						top.Ext.getCmp('cost').setValue(record.data.cost);
+						top.Ext.getCmp('supplierName').setValue(record.data.supplierName);
+						top.Ext.getCmp('expDate').setValue(record.data.expDate);
+						top.Ext.getCmp('sterileBatchNumber').setValue(record.data.sterileBatchNumber);
+						top.Ext.getCmp('manufacturer').setValue(record.data.manufacturer);
+						top.Ext.getCmp('producingArea').setValue(record.data.producingArea);
+						// 清空价格
+						clearPrice();
+						// 填充价格
+						var batch = getSelectedBatch();
+						GodownEntryTableManager.getDiposableGoodsPriceAmountInfoCanOutEntryByBatchID(batch.id,function(priceAmounts){
+							setPrices(priceAmounts,true);
+						});
+					}
+				}
+			},{
+				text : '单价  :'
+			},{
+				xtype : 'combo',
+				id : 'combo_price',
+				name : 'combo_price',
+				valueField : 'price',
+				displayField : 'price',
+				store : priceStore,
+				editable : false,
+				forceSelection : true,
+				mode : 'local',
+				triggerAction : 'all',
+				typeAhead : false,
+				allowBlank : false,
+				width : 100,
+				anchor : '95%'
+			},
+			{
+				text : '添加',
+				iconCls : 'btn_ext_add',
+				hidden : commonEntry.isOpen(),
+				handler : function() {
+					var disposableGoodsStockID = top.Ext.getCmp('disposableGoodsStockID').getValue();
+					var name = top.Ext.getCmp('name1').getValue();
+					var count = top.Ext.getCmp('amount1').getValue();
+					var batchNumber = top.Ext.getCmp('batchNumber1').getValue();
+					var batch = getSelectedBatch();
+					var priceAmount = getSelectedPriceAmount();
+					addItems(disposableGoodsStockID,name,count,batch,priceAmount);
+				}
+			}]
 		})],
 		buttons : [{
 			text : '保存',