Index: ssts-web/src/main/webapp/common/selectExpensiveGoodsByExt.jsp
===================================================================
diff -u -r21862 -r22290
--- ssts-web/src/main/webapp/common/selectExpensiveGoodsByExt.jsp	(.../selectExpensiveGoodsByExt.jsp)	(revision 21862)
+++ ssts-web/src/main/webapp/common/selectExpensiveGoodsByExt.jsp	(.../selectExpensiveGoodsByExt.jsp)	(revision 22290)
@@ -12,6 +12,7 @@
 <script type="text/javascript" src="${ctx }/js/common.js" ></script>
 <script type="text/javascript" src="${ctx }/js/selOrg.js" ></script>
 <script type="text/javascript" src="${ctx}/js/forExpensiveGoods.js"> </script>
+<script type="text/javascript" src="${ctx}/dwr/interface/ExpensiveGoodsTableManager.js"></script>
 <script type="text/javascript">
 var formPanel;
 var title ="高值耗材";
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java
===================================================================
diff -u -r22041 -r22290
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java	(.../ExpensiveGoodsAuthorizationAction.java)	(revision 22041)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAuthorizationAction.java	(.../ExpensiveGoodsAuthorizationAction.java)	(revision 22290)
@@ -162,7 +162,7 @@
 			if(StringUtils.isNotBlank(authorizerCompanyId)){
 				expensiveGoodsAuthorization.setAuthorizerCompanyId(Long.parseLong(authorizerCompanyId));
 			}
-			String expensiveGoodsNames = StrutsParamUtils.getPraramValue("expensiveGoodsName", "");
+			String expensiveGoodsNames = StrutsParamUtils.getPraramValue("expensiveGoodsNames", "");
 			String expensiveGoodsIds = StrutsParamUtils.getPraramValue("expensiveGoodsIds", "");
 			if (StringUtils.isNotBlank(StrutsParamUtils.getPraramValue("validityTime", null))) {
 				SimpleDateFormat dateFormat = new SimpleDateFormat(
@@ -303,4 +303,16 @@
 			}
 		}
 	}
+	
+	/**
+	 * 根据高值耗材Ids获取对应高值耗材的信息
+	 * @return
+	 */
+	public void getExpensiveGoodsList(){
+		String expensiveGoodsIds = StrutsParamUtils.getPraramValue("expensiveGoodsIds", "");
+		if(StringUtils.isNotBlank(expensiveGoodsIds)){
+			JSONObject expensiveGoodsMap = expensiveGoodsAuthorizationManager.getExpensiveGoodsMap(expensiveGoodsIds);
+			StrutsResponseUtils.output(expensiveGoodsMap);
+		}
+	}
 }
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
===================================================================
diff -u -r22257 -r22290
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java	(.../ExpensiveGoodsTableManager.java)	(revision 22257)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java	(.../ExpensiveGoodsTableManager.java)	(revision 22290)
@@ -21,6 +21,7 @@
 import com.forgon.Constants;
 import com.forgon.component.grid.GridManager;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
+import com.forgon.disinfectsystem.basedatamanager.supplier.service.ExpensiveGoodsSupplierManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
@@ -41,6 +42,7 @@
 import com.forgon.systemsetting.model.HttpOption;
 import com.forgon.systemsetting.service.HttpOptionManager;
 import com.forgon.tools.SpringBeanManger;
+import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.util.ForgonStringUtils;
 import com.forgon.tools.util.SqlUtils;
@@ -60,6 +62,8 @@
 	
 	private SupplyRoomConfigManager supplyRoomConfigManager;
 	
+	private ExpensiveGoodsSupplierManager expensiveGoodsSupplierManager;
+	
 	public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) {
 		this.dateQueryAdapter = dateQueryAdapter;
 	}
@@ -88,6 +92,11 @@
 		this.supplyRoomConfigManager = supplyRoomConfigManager;
 	}
 
+	public void setExpensiveGoodsSupplierManager(
+			ExpensiveGoodsSupplierManager expensiveGoodsSupplierManager) {
+		this.expensiveGoodsSupplierManager = expensiveGoodsSupplierManager;
+	}
+
 	/**
 	 * 查找高值耗材库存
 	 * @param parameterMap
@@ -660,4 +669,44 @@
 				null);
 	}
 	
+	/**
+	 * 根据供应商ID查出所拥有的高值耗材
+	 * @param supplierId
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public String getExpensiveGoodsByExpensiveGoodsSupplierId(String supplierId){
+		if(StringUtils.isNotBlank(supplierId)){
+			JSONArray dataJsonArray = new JSONArray();
+			//用于对比授权有没失效
+			String currentDate = Constants.SIMPLEDATEFORMAT_YYYYMMDD
+			.format(new Date());
+			String sql = " where po.certificationId in (select rc.id from RegistrationCertification rc where rc.expensiveGoodsSupplier.id = " + supplierId + ")";
+			List<ExpensiveGoods> list = (List<ExpensiveGoods>)objectDao.findBySql(ExpensiveGoods.class.getSimpleName(), sql);
+			if(list.size() > 0){ //如果小于或等于0，根据授权记录去查询拥有的物品
+				for(ExpensiveGoods expensiveGoods : list){
+					JSONObject dataJsonObject = new JSONObject();
+					dataJsonObject.put("id", expensiveGoods.getId());
+					dataJsonObject.put("name", expensiveGoods.getName());
+					dataJsonArray.add(dataJsonObject);
+				}
+			}else{
+				String sql1 = "where po.id in (select eg.expensiveGoodsId from ExpensiveGoodsAuthorization eg where eg.validityTime >= " + currentDate +" and eg.authorizedCompanyId = " + supplierId + ")";
+				List<ExpensiveGoods> expensiveGoodsList = (List<ExpensiveGoods>)objectDao.findBySql(ExpensiveGoods.class.getSimpleName(), sql1);	
+				if(expensiveGoodsList.size() > 0){
+					for(ExpensiveGoods expensiveGoods : expensiveGoodsList){
+						JSONObject dataJsonObject = new JSONObject();
+						dataJsonObject.put("id", expensiveGoods.getId());
+						dataJsonObject.put("name", expensiveGoods.getName());
+						dataJsonArray.add(dataJsonObject);
+					}
+				}else{
+					return null;
+				}
+			}
+			return dataJsonArray.toString();
+		}
+		return null;
+	}
+	
 }
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
===================================================================
diff -u -r22267 -r22290
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java	(.../ExpensiveGoodsAuthorizationManagerImpl.java)	(revision 22267)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java	(.../ExpensiveGoodsAuthorizationManagerImpl.java)	(revision 22290)
@@ -381,6 +381,7 @@
 				Long.valueOf(id));
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public JSONObject getExpensiveGoodsAuthorizationMap(
 			ExpensiveGoodsAuthorization expensiveGoodsAuthorization) {
@@ -397,6 +398,23 @@
 		obj.put("expensiveGoodsNames", expensiveGoodsName);
 		obj.put("expensiveGoodsIds", ega.getRelevancyGoodsAuthorization().getExpensiveGoodsIds());
 		
+		//获取材料集合
+		String sql = "where po.id in (select eg.expensiveGoodsId from ExpensiveGoodsAuthorization eg where eg.authorizedCompanyId = " + ega.getAuthorizedCompanyId() + ")";
+		List<ExpensiveGoods> expensiveGoodsList = objectDao.findBySql(ExpensiveGoods.class.getSimpleName(), sql);
+		List<ExpensiveGoods> expensiveGoodMuch = new ArrayList<ExpensiveGoods>();
+		if(expensiveGoodsList != null){
+			for(ExpensiveGoods eg : expensiveGoodsList){
+				ExpensiveGoods expensiveGoods = new ExpensiveGoods();
+				expensiveGoods.setId(eg.getId());
+				expensiveGoods.setName(eg.getName());
+				expensiveGoods.setGrade(eg.getGrade());
+				expensiveGoods.setType(eg.getType());
+				expensiveGoods.setExternalCode(eg.getExternalCode());
+				expensiveGoods.setCertification(eg.getCertification());
+				expensiveGoodMuch.add(expensiveGoods);
+			}
+		}
+		
 		//获取授权证记录返回前台
 		List<AuthorizationCertification> authorizationCertificationList = new ArrayList<AuthorizationCertification>();
 		for(AuthorizationCertification acl : ega.getRelevancyGoodsAuthorization().getAuthorizationCertificationList()){
@@ -408,10 +426,12 @@
 			authorizationCertificationList.add(authorizationCertification);
 		}
 		JSONArray authorizationCertifications =JSONArray.fromObject(authorizationCertificationList);
+		JSONArray expensiveGoodsLists =JSONArray.fromObject(expensiveGoodMuch);
 		JSONObject result = new JSONObject();
 		result.put("success", true);
 		result.put("data", obj);
 		result.put("authorizationCertificationList", authorizationCertifications);
+		result.put("expensiveGoodsList", expensiveGoodsLists);
 		return result;
 	}
 
@@ -429,4 +449,27 @@
 	    String sql = " where po.expensiveGoodsId = " + expensiveGoodId;
 		return objectDao.getBySql_ForUpdate2(ExpensiveGoodsAuthorization.class.getSimpleName(), sql);
 	}
+
+	@Override
+	public JSONObject getExpensiveGoodsMap(String expensiveGoodsId) {
+		String[]  expensiveGoodsIds = expensiveGoodsId.split(";"); //高值耗材Ids
+		List<ExpensiveGoods> expensiveGoodsList = new ArrayList<ExpensiveGoods>();
+		for(int i=0,len=expensiveGoodsIds.length;i<len;i++){
+			ExpensiveGoods expensiveGoods = new ExpensiveGoods();
+			Long id = Long.parseLong(expensiveGoodsIds[i]); //高值耗材Id
+			ExpensiveGoods eg = expensiveGoodsManager.get(id);
+			expensiveGoods.setId(eg.getId());
+			expensiveGoods.setName(eg.getName());
+			expensiveGoods.setGrade(eg.getGrade());
+			expensiveGoods.setType(eg.getType());
+			expensiveGoods.setExternalCode(eg.getExternalCode());
+			expensiveGoods.setCertification(eg.getCertification());
+			expensiveGoodsList.add(expensiveGoods);
+		}
+		JSONArray expensiveGoodsLists =JSONArray.fromObject(expensiveGoodsList);
+		JSONObject result = new JSONObject();
+		result.put("success", true);
+		result.put("expensiveGoodsList", expensiveGoodsLists);
+		return result;
+	}
 }
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
===================================================================
diff -u -r22264 -r22290
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java	(.../ExpensiveGoodsAuthorizationManager.java)	(revision 22264)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java	(.../ExpensiveGoodsAuthorizationManager.java)	(revision 22290)
@@ -48,4 +48,8 @@
 	 */
 	public ExpensiveGoodsAuthorization getExpensiveGoodsAuthorizationById(String id);
 	
+	/**
+	 * 根据高值耗材Ids获取对应的高值耗材数据
+	 */
+	public JSONObject getExpensiveGoodsMap(String ExpensiveGoodsIds);
 }
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
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js
===================================================================
diff -u -r22265 -r22290
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js	(.../expensiveGoodsAuthorizationForm.js)	(revision 22265)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js	(.../expensiveGoodsAuthorizationForm.js)	(revision 22290)
@@ -1,6 +1,8 @@
 var registrationPanel;
 var id;
-var expensiveGoodsSupplierId;
+var expensiveGoodsSupplierId; 
+var expensiveGoodsPanel; //高值耗材数据
+var expensiveGoodsConfig; 
 function addExpensiveGoodsAuthorization(id,ishidden,isclear){
 	this.id = id;
 	var supplierStore = new top.Ext.data.Store({
@@ -21,6 +23,8 @@
 	configStore = new top.Ext.data.Store({
 	});
 	
+	expensiveGoodsStore = new top.Ext.data.Store({
+	});
 	Ext.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
 	
 	var registrationCertificateConfig = Ext.data.Record.create([
@@ -30,6 +34,15 @@
         {name : 'type'}
     ]);
 	
+	expensiveGoodsConfig = Ext.data.Record.create([
+        {name : 'id'},
+        {name : 'expensiveGoodsName'},
+	    {name : 'goodsType'},
+		{name : "grade"},
+        {name : 'externalCode'},
+        {name : 'certification'}
+    ]);
+	
 	function newRow(){
 		var n = top.Ext.getCmp('configGrid').getStore().getCount();// 获得总行数 
 		  var p = new registrationCertificateConfig({
@@ -58,6 +71,58 @@
 		])
 	});
 	
+	var expensiveGoodsCm = new top.Ext.grid.ColumnModel([{
+		id : 'expensiveGoodsName',
+		header : "材料名称",
+		dataIndex : 'expensiveGoodsName',
+		width : 160 ,
+		editor : new top.Ext.form.TextField({
+			allowBlank : false,
+			minValue:1
+		})
+	}, {
+		id : 'goodsType',
+		header : "物品类型",
+		dataIndex : 'goodsType',
+		width : 50 ,
+		editor : new top.Ext.form.TextField({
+			allowBlank : false,
+			minValue:1
+		})
+	}, {
+		id : 'grade',
+		header : "物品类别",
+		dataIndex : 'grade',
+		width : 50 ,
+		editor : new top.Ext.form.TextField({
+			allowBlank : false,
+			minValue:1
+		})
+	}, {
+		id:'externalCode',
+		header:"外部编码",
+		width : 60,
+		dataIndex:'externalCode',
+		editor : new top.Ext.form.TextField({
+			xtype : 'combo',
+			valueField : 'type',
+			displayField : 'type',
+			mode : 'local',
+			forceSelection : true,
+			editable : false,
+			triggerAction : 'all'
+		})
+	}, {
+		id : 'certification',
+		header : "注册证",
+		dataIndex : 'certification',
+		width : 130 ,
+		editor : new top.Ext.form.TextField({
+			allowBlank : false,
+			minValue:1
+		})
+	}]);
+	
 	var registrationCm = new top.Ext.grid.ColumnModel([{
 		id : 'certification',
 		header : "证件号",
@@ -130,12 +195,38 @@
 		}	
 	}]);
 
+	expensiveGoodsPanel = new top.Ext.grid.EditorGridPanel({
+		  id : 'expensiveGoodsGrid',
+		  name : 'expensiveGoodsGrid',
+		  store : expensiveGoodsStore,
+		  cm : expensiveGoodsCm,
+		  height:180,
+		  frame : false,
+		  bodyStyle : 'border:1px solid #afd7af',
+		  autoExpandColumn : 'count',
+		  viewConfig: {forceFit:true},
+		  clicksToEdit : 1,//设置点击几次才可编辑 
+		  selModel : new top.Ext.grid.RowSelectionModel({
+			  singleSelect : false
+		  }),
+		  tbar : [{
+			  text : '添加高值耗材',
+			  width : 70 ,
+			  iconCls : 'btn_ext_add',
+			  handler : function() {
+				  var departNames = top.Ext.getCmp('expensiveGoodsNames').getValue();
+				  var departcodes = top.Ext.getCmp('expensiveGoodsIds').getValue();
+				  openSelectReceiverOrganization(departNames,departcodes);
+			  }
+		  }]
+	});
+	
 	registrationPanel = new top.Ext.grid.EditorGridPanel({
 		  id : 'configGrid',
 		  name : 'configGrid',
 		  store : configStore,
 		  cm : registrationCm,
-		  height:280,
+		  height:260,
 		  frame : false,
 		  bodyStyle : 'border:1px solid #afd7af',
 		  autoExpandColumn : 'count',
@@ -287,8 +378,8 @@
 		labelSeparator : '：',
 		bodyStyle : 'padding:5px 5px 0px 5px',
 		labelWidth : 100,
-		autoHeight : true,
-		autoScroll : true,
+//		autoHeight : true,
+//		autoScroll : true,
 		items : [{
             layout:'column',
             items:[{
@@ -297,6 +388,10 @@
 				id : 'id'
 			},{
 				xtype : 'hidden',
+				name : 'expensiveGoodsNames',
+				id : 'expensiveGoodsNames'
+			},{
+				xtype : 'hidden',
 				name : 'expensiveGoodsIds',
 				id : 'expensiveGoodsIds'
 			},{
@@ -316,36 +411,43 @@
 				name : 'treeItemData',
 				id : 'treeItemData'
 			},{
-				columnWidth : 0.85,
 				layout : 'form',
-				labelWidth : 80,
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : '高值耗材',
-					id : 'expensiveGoodsName',
-					name : 'expensiveGoodsName',
-					allowBlank : false,
-					readOnly:true,
-					width : 400,
-					anchor : '98%'
-				}]
+				columnWidth : 1,
+				labelWidth : 70,
+				items : [
+		          expensiveGoodsPanel
+				]
+//			}, {
+//				columnWidth : 0.85,
+//				layout : 'form',
+//				labelWidth : 80,
+//				items : [{
+//					xtype : 'textfield',
+//					fieldLabel : '高值耗材',
+//					id : 'expensiveGoodsName',
+//					name : 'expensiveGoodsName',
+//					allowBlank : false,
+//					readOnly:true,
+//					width : 400,
+//					anchor : '98%'
+//				}]
+//			},{
+//				columnWidth : 0.15,
+//				labelWidth : 80,
+//				layout : 'form',
+//				items : [{
+//					xtype : 'button',
+//					text : '选择高值耗材',
+//					width : 400,
+//					listeners:{
+//						click : function(){
+//							var departNames = top.Ext.getCmp('expensiveGoodsName').getValue();
+//							var departcodes = top.Ext.getCmp('expensiveGoodsIds').getValue();
+//							openSelectReceiverOrganization(departNames,departcodes);
+//						}
+//					}
+//				}]
 			},{
-				columnWidth : 0.15,
-				labelWidth : 80,
-				layout : 'form',
-				items : [{
-					xtype : 'button',
-					text : '选择高值耗材',
-					width : 400,
-					listeners:{
-						click : function(){
-							var departNames = top.Ext.getCmp('expensiveGoodsName').getValue();
-							var departcodes = top.Ext.getCmp('expensiveGoodsIds').getValue();
-							openSelectReceiverOrganization(departNames,departcodes);
-						}
-					}
-				}]
-			},{
 				columnWidth : 1,
 				layout : 'form',
 				labelWidth : 80,
@@ -425,7 +527,7 @@
 				layout : 'form',
 				columnWidth : 0.5,
 		        bodyStyle : 'border:1px solid #afd7af',
-		        height:280,
+		        height:260,
 		        labelWidth : 60,
 				items : [
 					showCertificateImage
@@ -514,13 +616,14 @@
 		width : 720,
 		// width : 650,
 		// height : 600,
-		height : 450,
+		height : 600,
 		border : false,
 		plain : true,
 		modal :true,
 		items : [{
 			region:'center',
 			width : 400,
+			height : 600,
 		    layout :'fit',
 			items:[form]
 		}]
@@ -538,9 +641,22 @@
 				top.Ext.getCmp('authorizedCompanyName').setRawValue(action.result.data.authorizedCompanyName);
 				top.Ext.getCmp('authorizerCompanyName').setValue(action.result.data.authorizerCompanyId);
 				top.Ext.getCmp('authorizerCompanyName').setRawValue(action.result.data.authorizerCompanyName);
-				top.Ext.getCmp('expensiveGoodsName').setValue(action.result.data.expensiveGoodsNames);
+				top.Ext.getCmp('expensiveGoodsNames').setValue(action.result.data.expensiveGoodsNames);
 				top.Ext.getCmp('expensiveGoodsIds').setValue(action.result.data.expensiveGoodsIds);
                 var result = Ext.decode(action.response.responseText);
+                //初始化材料数据
+    			for(var i = 0 ;i < action.result.expensiveGoodsList.length;i++){
+    				var expensiveGoods = action.result.expensiveGoodsList[i];
+    					var expensiveGoodss = new expensiveGoodsConfig({
+    						id : expensiveGoods.id,
+    						expensiveGoodsName : expensiveGoods.name,
+    						goodsType : expensiveGoods.type,
+    						grade : expensiveGoods.grade,
+    						externalCode : expensiveGoods.externalCode,
+    						certification : expensiveGoods.certification
+    					});
+    					expensiveGoodsStore.add(expensiveGoodss);
+    			}
                 
               //初始化授权记录包含的授权证件
     			for(var i = 0 ;i < action.result.authorizationCertificationList.length;i++){
@@ -658,7 +774,36 @@
     		}
     	}
     	top.Ext.getCmp("expensiveGoodsIds").setValue(str);
-    	top.Ext.getCmp("expensiveGoodsName").setValue(selectedOrgUnitArray[1]);
+    	top.Ext.getCmp("expensiveGoodsNames").setValue(selectedOrgUnitArray[1]);
+    	
+    	if(str != null){
+    		Ext.Ajax.request( {	
+	    		url : WWWROOT + '/disinfectSystem/expensiveGoods/expensiveGoodsAuthorizationAction!getExpensiveGoodsList.do?time=' + new Date(),
+	    		method : 'POST',
+	    		params : {expensiveGoodsIds : str },
+	    		success : function(response, options) {
+	    			//清除高值耗材列表里面的数据
+	    			expensiveGoodsStore.removeAll();
+	    			var obj = Ext.util.JSON.decode(response.responseText);
+	//    			 //初始化材料数据
+	    			for(var i = 0 ;i < obj.expensiveGoodsList.length;i++){
+	    				var expensiveGoods = obj.expensiveGoodsList[i];
+	    					var expensiveGoodss = new expensiveGoodsConfig({
+	    						id : expensiveGoods.id,
+	    						expensiveGoodsName : expensiveGoods.name,
+	    						goodsType : expensiveGoods.type,
+	    						grade : expensiveGoods.grade,
+	    						externalCode : expensiveGoods.externalCode,
+	    						certification : expensiveGoods.certification
+	    					});
+	    					expensiveGoodsStore.add(expensiveGoodss);
+	    			}
+	    		},
+	    		failure : function(form, action) {
+	    			
+	    		}
+    		});	
+    	}
     }
 }