Index: ssts-web/src/main/webapp/js/forExpensiveGoods.js
===================================================================
diff -u -r21904 -r22290
--- ssts-web/src/main/webapp/js/forExpensiveGoods.js	(.../forExpensiveGoods.js)	(revision 21904)
+++ ssts-web/src/main/webapp/js/forExpensiveGoods.js	(.../forExpensiveGoods.js)	(revision 22290)
@@ -1,3 +1,7 @@
+var expensiveGoodsSupplierId = null; //高值耗材供应商ID
+var departJsonStore = null; //高值耗材数据
+var batches = null
+var batchRecords= null
 var rd = new Ext.data.JsonReader( {
 		fields : [
 		    //{name : 'id'},
@@ -22,6 +26,42 @@
 		}
 	}
 };
+
+var batchRecord = Ext.data.Record.create([
+  		{name : 'id'},
+  		{name : 'name'}
+  	]);
+
+function setBatchNumbers(batches,fireSelect) {
+	for(var i = 0;i<batches.length;i++){
+		batchRecords = new batchRecord(batches[i]);
+		departJsonStore.add(batchRecords);
+	}
+}
+
+departJsonStore = new Ext.data.Store({
+	reader : new Ext.data.JsonReader({
+		fields : [
+	  	    {name : 'id'},
+          	{name : 'name'}
+		]
+	})
+});
+
+//根据厂家id来查询对应的高值耗材，并填入
+function fillGoodsByExpensiveGoodsSupplierId(expensiveGoodsSupplierId){
+	departJsonStore.removeAll();
+	ExpensiveGoodsTableManager.getExpensiveGoodsByExpensiveGoodsSupplierId(expensiveGoodsSupplierId,
+			function(batchesStr){
+		            if(batchesStr != null){
+		            	batches = Ext.util.JSON.decode(batchesStr);
+						if(batches.length > 0){
+							setBatchNumbers(batches,true);
+						}
+		            } 
+	});
+}
+
 //验证高值耗材是否重复添加
 function isDepartRepeat(depart){
 	if(depart != null && depart.length > 0){
@@ -36,43 +76,43 @@
 	}
 	return false;
 }
-var departJsonStore = new Ext.data.Store({
+var supplierStore = new Ext.data.Store({
+    pageSize : 100,
 	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/expensiveGoodsAction!getExpensiveGoodsJson.do',
+		url : WWWROOT + '/disinfectSystem/baseData/supplierAction!getExpensiveGoodsSupplierData.do',
 		method : 'POST'
 	}),
-	autoLoad :true,
-	baseParams :{
-		withoutBaseOrg:true
-	},
 	reader : new Ext.data.JsonReader({
+		totalProperty : 'totalCount',
 		root : 'data'
-	},[
-	    {name : 'id',mapping : 'id'}, 
+	}, [
+	    {name : 'id',mapping : 'id'},
 	    {name : 'name',mapping : 'name'}
-	  ]
-	)
+	])
 });
+
+var selectModel = new top.Ext.grid.CheckboxSelectionModel();
 var cm = new Ext.grid.ColumnModel([
-	/*{
-	  id : 'departId',
-	  dataIndex : 'departId',
-	  hidden :true
-	},*/{
+//	{
+//	  header : 'id',
+//	  dataIndex : 'id',
+//	  hidden :true
+//	},
+	{
 	  header : "材料名称",
-	 dataIndex : 'name',
+	  dataIndex : 'name',
 	  width : 200,
 	  menuDisabled : true
 	}
 	,{
-	    id : 'deleteItem',
-	    header:'删除',
-	    width : 50,
-	    renderer: function(v,p,record){
-	        var str = "<img src=" + WWWROOT + '/images/web/stop.png'+" onclick=\"removeGridItem()\"/>";
-	        return str;
-	    },
-	   menuDisabled:true
+      id : 'deleteItem',
+      header:'删除',
+      width : 50,
+      renderer: function(v,p,record){
+          var str = "<img src=" + WWWROOT + '/images/web/stop.png'+" onclick=\"removeGridItem()\"/>";
+          return str;
+      },
+      menuDisabled:true
 	}
 ]);
 
@@ -95,19 +135,49 @@
 }
 Ext.onReady(function(){
 	var tbar = [ {
-		text : '选择高值耗材:'
+		text : '选择供应商:'
 	},{
 		xtype : 'combo',
+		id : 'expensiveGoodsSupplier',
+		name : 'expensiveGoodsSupplier',
+		queryParam : 'supplierName',
+		valueField : 'id',
+		displayField : 'name',
+		minChars : 0,
+		width : 200,
+		emptyText : '',
+		store : supplierStore,
+		forceSelection : true,
+		lazyInit : true,
+		selectOnFocus :true,
+		triggerAction : 'all',
+		hideTrigger : false,
+		typeAhead : false,
+		allowBlank : true,
+		listeners :{
+			select : function(combo, record, index) {
+				top.Ext.getCmp("departName2").setValue('');
+				expensiveGoodsSupplierId = record.data.id+'';
+				fillGoodsByExpensiveGoodsSupplierId(expensiveGoodsSupplierId);
+				top.Ext.getCmp("departName2").focus();
+			},
+		}
+	},{
+		text : '选择高值耗材:'
+	},{	
+		xtype : 'combo',
 		id : 'departName2',
 		name : 'departName2',
 		queryParam : 'spell',
 		fieldLabel : '材料名称',
-		queryParam : 'spell',
 		minChars : 0,
+		valueField : 'departName2',
+		displayField : 'departName2',
 		valueField : 'id',
 		displayField : 'name',
-		width : 320,
+		width : 160,
 		store : departJsonStore,
+		mode : 'local',
 		forceSelection : true,
 		lazyInit : true,
 		selectOnFocus :true,
@@ -134,8 +204,11 @@
 		hidden : hideAddAllButton,
 		handler:function(){
 			supplyRoom1Store.removeAll();
-			for(var i=0;i<departJsonStore.getTotalCount();i++){
-				supplyRoom1Store.add(departJsonStore.getAt(i));
+			if(batches != null){
+				for(var i = 0;i<batches.length;i++){
+					batchRecords = new batchRecord(batches[i]);
+					supplyRoom1Store.add(batchRecords);
+				}
 			}
 		}
 	},'-',{
@@ -160,31 +233,26 @@
 				xtype : 'hidden',
 				name : 'departCode',
 				id : 'departCode'
-			},{
-				columnWidth : 1,
-				layout: 'form',
-				items : [
-					new top.Ext.grid.GridPanel({
-						id : 'supplyRoom2',
-						title :'高值耗材列表',
-						store : supplyRoom1Store,
-						tbar : tbar,
-						cm : cm,
-						width : 700,
-						height: 380,
-						isCheckboxSelectionModel : true,
-						frame : false,
-						viewConfig: {
-				            forceFit:true
-						},
-						bodyStyle : 'border:1px solid #afd7af',
-						anchor : '100%',
-						selModel : new top.Ext.grid.RowSelectionModel({
-							singleSelect : false
-						})
-					})
-				]
-			}]
+			},new top.Ext.grid.GridPanel({
+				columnWidth: 1,
+				id : 'supplyRoom2',
+				title :'高值耗材列表',
+				store : supplyRoom1Store,
+				tbar : tbar,
+//				sm : selectModel,
+				cm : cm,
+				width : 1000,
+				height: 380,
+				frame : false,
+				viewConfig: {
+		            forceFit:true
+				},
+				bodyStyle : 'border:1px solid #afd7af',
+				anchor : '100%',
+				selModel : new top.Ext.grid.RowSelectionModel({
+					singleSelect : false
+				})
+			})]
 		}],
 		buttons : [{
 			id : 'saveBtn',
@@ -239,5 +307,5 @@
 	}
 	
 	//formWindow.show();
-	Ext.getCmp('departName2').focus(false,300);
+	Ext.getCmp('expensiveGoodsSupplier').focus(false,300);
 });
\ No newline at end of file