Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r12599 -r12839
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 12599)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 12839)
@@ -1718,6 +1718,7 @@
 	    {header : "签收人",width : 70,dataIndex : 'receiptor'},
 	    {header : "签收时间",width : 120,dataIndex : 'receiptingTime',renderer : myDateFormatByMinute},
 	    {header : "结算科室",width : 100,dataIndex : 'settleAccountsDepart'},
+	    {header : "仓库",width : 100,dataIndex : 'warehouseName'},
 	    {header : "总价",width : 70,dataIndex : 'totalPrice',align : 'right',renderer : formartPrice},
 	    {id : 'remark',header : "备注",width : 120,dataIndex : 'remark'}
 	];
@@ -1741,6 +1742,7 @@
 	    {name : 'receiptor'},
 	    {name : 'receiptingTime'},
 	    {name : 'personInCharge'},
+	    {name : 'warehouseName'},
 	    {name : 'personInChargeCode'}
 	];
 
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r12827 -r12839
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 12827)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 12839)
@@ -22,14 +22,17 @@
 	listeners : {
 		load : function(store,records) {
 			var id = top.Ext.getCmp('warehouseID').getValue();
-			var name = top.Ext.getCmp('warehouseName').getValue();
+			//var name = top.Ext.getCmp('warehouseName').getValue();
 			if(records.length > 0 && (id == null || id == '')){
-				id=records[0].data.id;
-				name = records[0].data.name;
+				//id=records[0].data.id;
+				//name = records[0].data.name;
+				var combo = top.Ext.getCmp("warehouse");
+				// 触发选中事件
+				combo.fireEvent('select', combo,records[0],0);
 			}
-			top.Ext.getCmp('warehouse').setValue(id);
-			top.Ext.getCmp('warehouseID').setValue(id);
-			top.Ext.getCmp('warehouseName').setValue(name);
+			//top.Ext.getCmp('warehouse').setValue(id);
+			//top.Ext.getCmp('warehouseID').setValue(id);
+			//top.Ext.getCmp('warehouseName').setValue(name);
 		}
 	}
 });
@@ -498,7 +501,6 @@
  * @param depart 科室名称
  */
 function addAndEditInvoicePlan(orgUnitCoding,depart) {
-	
 	// 发货物品
 	sendOutGoodsStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
@@ -1242,7 +1244,7 @@
 	}, this, {
 		buffer : 250
 	});
-	
+	wareHouseStore.load();
 }
 
 //展示器械包信息