Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
===================================================================
diff -u -r22290 -r22305
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java	(.../ExpensiveGoodsTableManager.java)	(revision 22290)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java	(.../ExpensiveGoodsTableManager.java)	(revision 22305)
@@ -687,7 +687,11 @@
 				for(ExpensiveGoods expensiveGoods : list){
 					JSONObject dataJsonObject = new JSONObject();
 					dataJsonObject.put("id", expensiveGoods.getId());
-					dataJsonObject.put("name", expensiveGoods.getName());
+					dataJsonObject.put("expensiveGoodsName", expensiveGoods.getName());
+					dataJsonObject.put("goodsType", expensiveGoods.getType());
+					dataJsonObject.put("grade", expensiveGoods.getGrade());
+					dataJsonObject.put("certification", expensiveGoods.getCertification());
+					dataJsonObject.put("expensiveGoodsSupplier", expensiveGoods.getRegistrationCertification(objectDao).getExpensiveGoodsSupplier().getCompanyName());
 					dataJsonArray.add(dataJsonObject);
 				}
 			}else{
@@ -697,7 +701,11 @@
 					for(ExpensiveGoods expensiveGoods : expensiveGoodsList){
 						JSONObject dataJsonObject = new JSONObject();
 						dataJsonObject.put("id", expensiveGoods.getId());
-						dataJsonObject.put("name", expensiveGoods.getName());
+						dataJsonObject.put("expensiveGoodsName", expensiveGoods.getName());
+						dataJsonObject.put("goodsType", expensiveGoods.getType());
+						dataJsonObject.put("grade", expensiveGoods.getGrade());
+						dataJsonObject.put("certification", expensiveGoods.getCertification());
+						dataJsonObject.put("expensiveGoodsSupplier", expensiveGoods.getRegistrationCertification(objectDao).getExpensiveGoodsSupplier().getCompanyName());
 						dataJsonArray.add(dataJsonObject);
 					}
 				}else{
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
===================================================================
diff -u -r22290 -r22305
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java	(.../ExpensiveGoodsAuthorizationManagerImpl.java)	(revision 22290)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java	(.../ExpensiveGoodsAuthorizationManagerImpl.java)	(revision 22305)
@@ -319,19 +319,19 @@
 		JSONArray jsonArray = JSONArray.fromObject(authorizationCertificationResult);
 		List<Long> list = new ArrayList<Long>(); //判断前台有没有进行删除授权证设的List集合
 		String id = null ;
-//		Date date = null ; //初始化date   代码保留有关授权失效期的！
+		Date date = null ; //初始化date   代码保留有关授权失效期的！
 		for (int i = 0; i < jsonArray.size(); i++) {
 			JSONObject obj = jsonArray.getJSONObject(i);
 			String certification = obj.optString("certification");
-//			String validityTime = obj.optString("validityTime");
+			String validityTime = obj.optString("validityTime");
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			String type = obj.optString("type");
-			//失效期转换成date类型
-//			try { 
-//				date = sdf.parse(validityTime);
-//				} catch (Exception e) { 
-//				e.printStackTrace(); 
-//				} 
+//			失效期转换成date类型
+			try { 
+				date = sdf.parse(validityTime);
+				} catch (Exception e) { 
+				e.printStackTrace(); 
+				} 
 	 		id = obj.optString("id");
 	 		list.add(Long.parseLong(id));
 	 		AuthorizationCertification authorizationCertification;
@@ -342,7 +342,7 @@
 	 					.getSimpleName(), "id", Long.valueOf(id));
 	 		}
 	 		authorizationCertification.setAuthorizationNumber(certification); //授权证号
-	 		authorizationCertification.setValidityTime(expensiveGoodsAuthorization.getValidityTime()); //失效期
+	 		authorizationCertification.setValidityTime(date); //失效期
 	 		authorizationCertification.setType(type); //证件类型
 	 		authorizationCertification.setRelevancyGoodsAuthorization(relevancyGoodsAuthorization);
 	 		objectDao.saveOrUpdate(authorizationCertification); 
@@ -399,8 +399,8 @@
 		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);
+		String hql = "from " + ExpensiveGoods.class.getSimpleName() + " po where po.id in (select eg.expensiveGoodsId from ExpensiveGoodsAuthorization eg where eg.authorizedCompanyId = " + ega.getAuthorizedCompanyId() + " and eg.relevancyGoodsAuthorization.id = " + ega.getRelevancyGoodsAuthorization().getId() + ")";
+		List<ExpensiveGoods> expensiveGoodsList = objectDao.findByHql(hql);
 		List<ExpensiveGoods> expensiveGoodMuch = new ArrayList<ExpensiveGoods>();
 		if(expensiveGoodsList != null){
 			for(ExpensiveGoods eg : expensiveGoodsList){
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.jsp
===================================================================
diff -u -r22152 -r22305
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.jsp	(.../expensiveGoodsAuthorizationView.jsp)	(revision 22152)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.jsp	(.../expensiveGoodsAuthorizationView.jsp)	(revision 22305)
@@ -22,6 +22,7 @@
 <script type="text/javascript" src="${ctx }/js/json3.min.js"></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js"></script>
 <script type='text/javascript' src="${ctx }/dwr/interface/ExpensiveGoodsAuthorizationTableManager.js"></script>
+<script type='text/javascript' src="${ctx }/dwr/interface/ExpensiveGoodsTableManager.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js"></script>
 <%
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js
===================================================================
diff -u -r22290 -r22305
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js	(.../expensiveGoodsAuthorizationForm.js)	(revision 22290)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js	(.../expensiveGoodsAuthorizationForm.js)	(revision 22305)
@@ -3,6 +3,9 @@
 var expensiveGoodsSupplierId; 
 var expensiveGoodsPanel; //高值耗材数据
 var expensiveGoodsConfig; 
+var departJsonStore; //高值耗材数据
+var batches;
+var batchRecords;
 function addExpensiveGoodsAuthorization(id,ishidden,isclear){
 	this.id = id;
 	var supplierStore = new top.Ext.data.Store({
@@ -30,25 +33,59 @@
 	var registrationCertificateConfig = Ext.data.Record.create([
         {name : 'id'},
         {name : 'certification'},
-//        {name : 'certificationTime'},
+        {name : 'certificationTime'},
         {name : 'type'}
     ]);
 	
 	expensiveGoodsConfig = Ext.data.Record.create([
-        {name : 'id'},
-        {name : 'expensiveGoodsName'},
-	    {name : 'goodsType'},
-		{name : "grade"},
-        {name : 'externalCode'},
-        {name : 'certification'}
+           {name : 'id'},
+	       {name : 'expensiveGoodsName'},
+		   {name : 'goodsType'},
+		   {name : "grade"},
+	       {name : 'certification'},
+	       {name : 'expensiveGoodsSupplier'}
     ]);
 	
+	departJsonStore = new Ext.data.Store({
+		reader : new Ext.data.JsonReader({
+			fields : [
+		  	    {name : 'id'},
+		        {name : 'expensiveGoodsName'},
+			    {name : 'goodsType'},
+				{name : "grade"},
+		        {name : 'certification'},
+		        {name : 'expensiveGoodsSupplier'}
+			]
+		})
+	});
+	
+	function setBatchNumbers(batches,fireSelect) {
+		for(var i = 0;i<batches.length;i++){
+			batchRecords = new expensiveGoodsConfig(batches[i]);
+			departJsonStore.add(batchRecords);
+		}
+	}
+	
+	//根据厂家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 newRow(){
 		var n = top.Ext.getCmp('configGrid').getStore().getCount();// 获得总行数 
 		  var p = new registrationCertificateConfig({
 			  id : 0,
 			  certification : '',
-//			  certificationTime : '',
+			  certificationTime : '',
 			  type : '授权证'
 		  });
 		  top.Ext.getCmp('configGrid').stopEditing();// 停止编辑 
@@ -99,14 +136,14 @@
 			minValue:1
 		})
 	}, {
-		id:'externalCode',
-		header:"外部编码",
-		width : 60,
-		dataIndex:'externalCode',
+		id:'expensiveGoodsSupplier',
+		header:"生产厂家",
+		width : 130,
+		dataIndex:'expensiveGoodsSupplier',
 		editor : new top.Ext.form.TextField({
 			xtype : 'combo',
-			valueField : 'type',
-			displayField : 'type',
+			valueField : 'expensiveGoodsSupplier',
+			displayField : 'expensiveGoodsSupplier',
 			mode : 'local',
 			forceSelection : true,
 			editable : false,
@@ -134,29 +171,29 @@
 			listeners : {
 			}
 		})
-//	}, {
-//		id	: 'certificationTime',  保留授权证失效期有关代码。
-//		header : "失效期",
-//		width : 80,
-//		dataIndex : 'certificationTime',
-//		renderer: function(v,p,record){
-//			v = v||{};
-//			if(v.format){
-//				return v.format('Y-m-d');
-//			}else if(v.year && v.month && v.date){
-//				return (v.year + 1900) + "-" + (v.month+1) + "-" + v.date;
-//			}
-//			return "";
-//		},
-//		editor : new top.Ext.form.DateExtensiableField( {
-//			readOnly : false,
-//			minWidth:177,
-//			altFormats : 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-//			format : 'Y-m-d',
-//			editable : false,
-//			allowBlank : false
-//		})
 	}, {
+		id	: 'certificationTime',  
+		header : "失效期",
+		width : 60,
+		dataIndex : 'certificationTime',
+		renderer: function(v,p,record){
+			v = v||{};
+			if(v.format){
+				return v.format('Y-m-d');
+			}else if(v.year && v.month && v.date){
+				return (v.year + 1900) + "-" + (v.month+1) + "-" + v.date;
+			}
+			return "";
+		},
+		editor : new top.Ext.form.DateExtensiableField( {
+			readOnly : false,
+			minWidth:177,
+			altFormats : 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+			format : 'Y-m-d',
+			editable : false,
+			allowBlank : false
+		})
+	}, {
 		id:'type',
 		header:"类别",
 		width : 40,
@@ -210,14 +247,88 @@
 			  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);
-			  }
+			text : '选择高值耗材:'
+			},{	
+				xtype : 'combo',
+				id : 'departName2',
+				name : 'departName2',
+				queryParam : 'spell',
+				fieldLabel : '材料名称',
+				minChars : 0,
+				valueField : 'departName2',
+				displayField : 'departName2',
+				valueField : 'id',
+				displayField : 'expensiveGoodsName',
+				width : 350,
+				store : departJsonStore,
+				mode : 'local',
+				forceSelection : true,
+				lazyInit : true,
+				selectOnFocus :true,
+				triggerAction : 'all',
+				hideTrigger : false,
+				typeAhead : false,
+				allowBlank : true,
+				listeners :{
+					focus : function(value) {
+						//获取授权方信息
+						var authorizerCompanyName = top.Ext.getCmp('authorizerCompanyName').getRawValue();// 返回值为 Record 数组 
+						if(authorizerCompanyName == ""){
+						    showResult('请先填写授权代理商!');
+//							top.Ext.getCmp('configGrid').stopEditing();
+							return false;
+						}
+					},
+					select:function(combo, record, index ){
+						var tem = record.data.id;
+						var name = record.data.expensiveGoodsName;
+					    var goodsType = record.data.goodsType;
+					    var grade = record.data.grade;
+					    var certification = record.data.certification;
+					    var expensiveGoodsSupplier = record.data.expensiveGoodsSupplier;
+						addItem(tem,name,goodsType,grade,certification,expensiveGoodsSupplier);
+					}
+				}
+			},{
+				text :'添加所有',
+				iconCls : 'btn_ext_add',
+				handler:function(){
+					var authorizerCompanyName = top.Ext.getCmp('authorizedCompanyName').getValue();
+					if(batches != null){
+						expensiveGoodsStore.removeAll();
+						for(var i = 0;i<batches.length;i++){
+							batchRecords = new expensiveGoodsConfig(batches[i]);
+							expensiveGoodsStore.add(batchRecords);
+						}
+					}else{
+						showResult('请先选择授权代理商，再点击添加!');
+					}
+				}
+			},{
+				text : '删除材料',
+				iconCls : 'btn_remove',
+				handler : function() {
+					var rows = top.Ext.getCmp('expensiveGoodsGrid').getSelectionModel().getSelections();// 返回值为 Record 数组 
+					if (rows.length == 0) {
+						showResult('最少选择一条信息，进行删除!');
+					} else {
+						top.Ext.MessageBox.confirm('提示框', '您确定要进行该操作？', function(btn) {
+							if (btn == 'yes') {
+								if (rows) {
+								 for ( var i = 0; i < rows.length; i++) {
+										expensiveGoodsStore.remove(rows[i]);
+									}
+								}
+							}
+						});
+					}
+				}
+			},{
+				text :'清空所有',
+				iconCls : 'btn_remove',
+				handler:function(){
+					expensiveGoodsStore.removeAll();
+				}
 		  }]
 	});
 	
@@ -411,42 +522,6 @@
 				name : 'treeItemData',
 				id : 'treeItemData'
 			},{
-				layout : 'form',
-				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 : 1,
 				layout : 'form',
@@ -472,6 +547,12 @@
 					typeAhead : false,
 					anchor : '97%',
 					listeners : {
+						select : function(combo, record, index) {
+							top.Ext.getCmp("departName2").setValue('');
+							expensiveGoodsSupplierId = record.data.id+'';
+							fillGoodsByExpensiveGoodsSupplierId(expensiveGoodsSupplierId);
+							top.Ext.getCmp("departName2").focus();
+						}
 					}
 				 }]
 			},{
@@ -516,6 +597,13 @@
 					format : 'Y-m-d',
 					anchor : '97%'
 				}]
+			},{
+				layout : 'form',
+				columnWidth : 1,
+				labelWidth : 70,
+				items : [
+		          expensiveGoodsPanel
+				]
 			}, {
 				layout : 'form',
 				columnWidth : 0.5,
@@ -543,15 +631,12 @@
 					showResult('请正确填写表单各值');
 					return false;
 				}
-				var departcodes = top.Ext.getCmp('expensiveGoodsIds').getValue();
-				if(!departcodes || departcodes.length == 0){
-					showResult('高值耗材不能为空！');
+				
+				var expensiveGoods = expensiveGoodsStore.getCount();
+				if(expensiveGoods ==0){
+					showResult('请添加高值耗材！');
 					return false;
-				}else if(departcodes.length >= 3980){
-					showResult('所选耗材太多,请重新选择！');
-					return false;
 				}
-				
 				//验证授权证号是否重复
 				var rowIndex = top.Ext.getCmp('configGrid').getStore().getCount();//grid的行数 
 				var configStore = top.Ext.getCmp('configGrid').getStore();
@@ -664,7 +749,7 @@
     					var authorizationCertifications = new registrationCertificateConfig({
     						id : authorizationCertification.id,
     						certification : authorizationCertification.authorizationNumber,
-//    						certificationTime :new Date(authorizationCertification.validityTime.time),
+    						certificationTime :new Date(authorizationCertification.validityTime.time),
     						type : authorizationCertification.type
     					});
     					configStore.add(authorizationCertifications);
@@ -719,92 +804,41 @@
 	}
 }
 
-function openSelectReceiverOrganization(departNames,departCodes){
-	var param = null;
-	var temp;
-	if(departCodes.charAt(0)==";" && departCodes.charAt(departCodes.length-1)==";"){
-		temp = departCodes.substring(1,departCodes.length-1);
-	}else{
-		temp = departCodes;
+//验证高值耗材是否重复添加
+function isDepartRepeat(depart){
+	if(depart != null && depart.length > 0){
+		for ( var i = 0; i < expensiveGoodsStore.getCount(); i++) {
+			 var record = expensiveGoodsStore.getAt(i);
+			 var tempName =record.get('expensiveGoodsName');
+			 if(depart == tempName){
+				 return true;
+				 break;
+			 }
+		}
 	}
-	//两个都不为空
-	if(!Ext.isEmpty(departNames)&&!Ext.isEmpty(departCodes)){
-		param = {
-			departNames:departNames,
-			departCodes:temp,
-			allowNull : true,
-			onlyOneOrg : true,
-			resultType : 'code',
-			tabType : 'orgUnit',
-			sameLevel : 'yes',
-			range : 'all'
-		};
-	}else{
-		param = {
-			allowNull : true,
-			onlyOneOrg : true,
-			resultType : 'code',
-			tabType : 'orgUnit',
-			sameLevel : 'yes',
-			range : 'all'
-		};
-	}
-	
-	var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectExpensiveGoodsByExt.jsp?", param, "800", "450");
-    if(selectedOrgUnitArray != null){
-    	var tem = selectedOrgUnitArray[0];
-    	var arr = tem.split(";");
-    	var str = "";
-    	if(arr.length>0){
-    		for(var i=0;i<arr.length;i++){
-    			//如果已经有这个东西了，就不要再加了
-    			if(arr[i].indexOf(null)==-1){
-    				if(i==arr.length-1){
-    					str += arr[i];
-    				}else{
-    					str += arr[i]+";";
-    				}
-    			}else{
-    				if(i==arr.length-1){
-    					str += arr[i];
-    				}else{
-    					str += arr[i]+";";
-    				}
-    			}
-    		}
-    	}
-    	top.Ext.getCmp("expensiveGoodsIds").setValue(str);
-    	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) {
-	    			
-	    		}
-    		});	
-    	}
+	return false;
+}
+
+function addItem(code,name,goodsType,grade,certification,expensiveGoodsSupplier){
+    if(name==null||name==''){
+    	showResult('请选择材料！');
+		return false;
     }
+    var b = isDepartRepeat(name);
+    if(b){
+			showResult('材料：['+name+'] 已存在！');
+			return false;
+	}
+    var record = new Ext.data.Record({
+    	id:code,
+    	expensiveGoodsName:name,
+    	goodsType : goodsType,
+    	grade : grade,
+    	certification : certification,
+    	expensiveGoodsSupplier : expensiveGoodsSupplier
+    });
+    expensiveGoodsStore.add(record);
+    top.Ext.getCmp("departName2").setValue("");
 }
 
 function deleteGiveBackColumnTreeItem(clickNode){
@@ -848,14 +882,6 @@
 	return (currentClickType=='down'?true:false);
 }
 
-function replaceStr(str){
-	var replaceV = "";
-	if(str){
-		replaceV = str.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(/"/g,"\"");
-	}
-	return replaceV;
-}
-
 function submitForm(form,wwindow,btnSave){
 	var authorizerCompanyId = top.Ext.getCmp('authorizerCompanyName').getValue();
     var authorizedCompanyId = top.Ext.getCmp('authorizedCompanyName').getValue();
@@ -867,17 +893,38 @@
 		var record = configStore.getAt(i);
 		var id = configStore.getAt(i).data.id;
 		var certification = record.get('certification');
-//		var validityTime = record.data.certificationTime.format('Y-m-d');
+		var validityTime = record.data.certificationTime.format('Y-m-d');
 		var type = record.get('type');
 		var authorizationCertification = {
 				id : id,
 				certification: certification,
-//				validityTime: validityTime,
+				validityTime: validityTime,
 				type: type
 		}
 		authorizationCertifications.push(authorizationCertification);
 	}
 	
+	var len = expensiveGoodsStore.getCount();
+	if(len ==0){
+		showResult('请选择材料！');
+		return false;
+	}
+	  var tempName ='';
+	  var tempId ='';
+	  var returnVal = [];
+	  for(var i =0;i<len;i++){
+		  var record = expensiveGoodsStore.getAt(i);
+		  if(i==len-1){
+			  tempId += record.data['id'];
+			  tempName += record.data['expensiveGoodsName'];
+		  }else{
+			  tempId += record.data['id'] + ";";
+			  tempName += record.data['expensiveGoodsName'] + ";";
+		  }
+	  }
+	  top.Ext.getCmp('expensiveGoodsNames').setValue(tempName);
+	  top.Ext.getCmp('expensiveGoodsIds').setValue(tempId);
+	  
 	form.form.submit({
 		url : WWWROOT + '/disinfectSystem/expensiveGoods/expensiveGoodsAuthorizationAction!saveExpensiveGoodsAuthorization.do?time=' + new Date(),
 		method : 'POST',