Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsDefinition.js
===================================================================
diff -u -r22352 -r22386
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsDefinition.js	(.../expensiveGoodsDefinition.js)	(revision 22352)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsDefinition.js	(.../expensiveGoodsDefinition.js)	(revision 22386)
@@ -221,7 +221,7 @@
 
 //生产厂家的store
 var manufacturerStore = Ext4.create('Ext4.data.Store',{
-	autoLoad : true,
+//	autoLoad : true,
 	pageSize : 20,
 	fields : [{name : 'name'},
 	          {name : 'id'},
@@ -277,6 +277,16 @@
 			type : 'json',
 			root : 'data'
 		}
+	},
+	//添加注册证有效期过滤
+	listeners : {
+		load : function(store,records){
+			for(var i = 0;i<records.length;i++){
+	    		if(getDateColor(records[i].data.validityTime) != ''){
+	    			store.remove(records[i]);
+	    		}
+			}
+		}
 	}
 });
 
@@ -321,10 +331,6 @@
 		xtype : 'hidden',
 		name : 'orginalName',
 		id : 'orginalName'
-	},{
-		xtype : 'hidden',
-		name : 'expensiveGoodsSupplierId',
-		id : 'expensiveGoodsSupplierId'
 	}
 ];
 
@@ -445,6 +451,7 @@
 		minChars : 0,
 		valueField : 'id',
 		displayField : 'name',
+		queryCaching : false,
 	//    pageSize : 5,	
 	    store : manufacturerStore,
 		lazyInit : true,
@@ -464,6 +471,23 @@
 				changeDateBackground(top.Ext4.getCmp("productionValidityTime"),record[0].data.productionValidityTime);
 				changeDateBackground(top.Ext4.getCmp("licenseValidityTime"),record[0].data.licenseValidityTime);
 			}
+,
+			blur : function(combo){
+				if(combo.findRecordByDisplay(combo.getRawValue()) == false){
+					combo.setRawValue('');
+					top.Ext4.getCmp('manufacturerBusinessLicense').setValue('');
+					top.Ext4.getCmp('manufacturerProductionCertificate').setValue('');
+					top.Ext4.getCmp('licenseValidityTime').setValue('');
+					top.Ext4.getCmp('productionValidityTime').setValue('');
+					registrationCertificationStore.removeAll();
+					top.Ext4.getCmp('certification').setRawValue('');
+					top.Ext4.getCmp('registrationCertificationValidityTime').setValue('');
+
+					top.Ext4.getCmp('licenseValidityTime').inputEl.addCls('fieldReadOnlyNoRemoveAndTop');
+					top.Ext4.getCmp('productionValidityTime').inputEl.addCls('fieldReadOnlyNoRemoveAndTop');
+					top.Ext4.getCmp('registrationCertificationValidityTime').inputEl.addCls('fieldReadOnlyNoRemoveAndTop');
+				}
+			}
 		}
 	};
 
@@ -596,7 +620,6 @@
 
 //加载高值耗材定义界面（根据selectedId来判断是新建还是修改）
 var onLoadExpensiveGoodsDefinitionWindow = function(selectedId,supplierId){
-	
 	if(isUndefinedOrNullOrEmpty(selectedId)){
 		selectedId = 0;
 	}
@@ -873,6 +896,15 @@
 			changeDateBackground(top.Ext4.getCmp("registrationCertificationValidityTime"),expensiveGoods.registrationCertificationValidityTime);
 			changeDateBackground(top.Ext4.getCmp("productionValidityTime"),expensiveGoods.productionValidityTime);
 			changeDateBackground(top.Ext4.getCmp("licenseValidityTime"),expensiveGoods.licenseValidityTime);
+
+//			manufacturerStore.load({
+//				params : {
+//					supplierName : expensiveGoods.expensiveGoodsSupplier
+//				}
+//			});
+			
+//			manufacturerStore.add({id : expensiveGoods.expensiveGoodsSupplierId,name : expensiveGoods.expensiveGoodsSupplier});
+			top.Ext4.getCmp('expensiveGoodsSupplier').setRawValue(expensiveGoods.expensiveGoodsSupplier);
 		
 			supplierStore.load({
 				params : {
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r22333 -r22386
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 22333)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 22386)
@@ -219,6 +219,8 @@
 	   <operation operationId="SSTS_ExpensiveGoods_Select" operationName="��ֵ�IJIJ�ѯ"></operation>
 	   <operation operationId="SSTS_ExpensiveGoods_Delete" operationName="��ֵ�IJ�ɾ��"></operation>
 	   
+	   <operation operationId="SSTS_ExpensiveGoodsDefinition_Manager" operationName="��ֵ�IJĶ������"></operation>
+	   
 	   <operation operationId="SSTS_ExpensiveGoodsStock_Manager" operationName="��ֵ�IJĿ�����"></operation>
 	   <operation operationId="SSTS_ExpensiveGoodsStockPrice_Manager" operationName="��ֵ�IJĿ��۸�鿴"></operation>
 	   	   
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r22374 -r22386
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 22374)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 22386)
@@ -331,7 +331,7 @@
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_ExpensiveGoods_Hidden_Menu,
 	children:[
-        {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsDefinition_Hidden_Manager,text:"高值耗材定义管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ExpensiveGoodsImport_Hidden_Menu,text:"导入高值耗材",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/importExpensiveGoods.mhtml',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ViewExpensiveGoodsInstance_Hidden_Menu,text:"高值耗材实例列表",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsStockEntry_Hidden_Manager,text:"高值耗材库存",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r22333 -r22386
--- ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 22333)
+++ ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 22386)
@@ -1130,6 +1130,12 @@
 	}
 </operation:authorize>
 
+//高值耗材定义管理
+var SSTS_ExpensiveGoodsDefinition_Hidden_Manager = true;
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsDefinition_Manager">
+SSTS_ExpensiveGoodsDefinition_Hidden_Manager = false;
+</operation:authorize>
+
 //高值耗材库存管理
 var SSTS_ExpensiveGoodsStockEntry_Hidden_Manager = true;
 <operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsStock_Manager">
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.js
===================================================================
diff -u -r22352 -r22386
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.js	(.../expensiveGoodsStockView.js)	(revision 22352)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.js	(.../expensiveGoodsStockView.js)	(revision 22386)
@@ -198,7 +198,7 @@
 	})
 	
 	var detailWindowObj = Ext4.create('top.Ext4.window.Window',{
-		title: '高值耗材库存详情',
+		title: '库存详情',
 //	    height: 590,
 	    width: 800,
 		layout : 'column',
@@ -441,7 +441,7 @@
 	);
 
 	var tbar = [{
-		text : '型号详情',
+		text : '库存详情',
 		iconCls : 'btn_ext_refresh',
 		handler : function(){
 			showStockDetail();