Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
===================================================================
diff -u -r22340 -r22357
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js	(.../config.js)	(revision 22340)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js	(.../config.js)	(revision 22357)
@@ -40,7 +40,5 @@
   //回收一键入筐
   recycleAllTousseIntoBasket : true,
   // 高值耗材自助入库验收后是否发货，默认为否
-  checkedAfterSubmitInvoice : false,
-  //注册证列表是否显示已过期的注册证
-  showExpiredCertification : true
+  checkedAfterSubmitInvoice : false
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
===================================================================
diff -u -r22340 -r22357
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js	(.../expensiveGoodsSupplierForm.js)	(revision 22340)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js	(.../expensiveGoodsSupplierForm.js)	(revision 22357)
@@ -281,6 +281,30 @@
 					  });
 				  }
 			  }
+		  },{
+			  text : '是否显示过期的注册证:'
+		  },{	
+			  xtype : 'combo',
+			  dataIndex:'expired',
+			  valueField : 'value',
+			  displayField : 'value',
+			  id : "expireds",
+			  name : "expireds",
+			  store : new Ext.data.SimpleStore({
+				  data:[[STR_YES],[STR_NO]],
+				  fields:['value']
+			  }),
+			  value: STR_NO,
+			  mode : 'local',
+			  width : 55,
+			  forceSelection : true,
+			  editable : false,
+			  triggerAction : 'all',
+			  listeners :{
+				  select:function(combo, records, index ){
+					  initializeData(combo.value);  
+				  }
+			  }
 		  }],
 		listeners: {
 			  beforeedit: function(obj){
@@ -598,14 +622,13 @@
 				var warningUntil = new Date(supplierRegistrationCertificate.warningUntil.time).getTime();
 				//判定注册证的预警日期是否已过
 				var date= new Date().getTime();
+				expired = false; //初始化为false
 				if(warningUntil < date){
 					expired = true;
 				}
-			    //判断是否有设置显示过期的注册证 ,默认是不显示的
-				if(!sstsConfig.showExpiredCertification){
-					if(new Date(supplierRegistrationCertificate.validityTime.time).getTime() < date){
-					   continue;
-					}
+			    //不显示过期的注册证 ,默认是不显示的
+				if(new Date(supplierRegistrationCertificate.validityTime.time).getTime() < date){
+				   continue;
 				}
 				var supplierRegistrationCertificates = new registrationCertificateConfig({
 					id : supplierRegistrationCertificate.id,
@@ -636,6 +659,7 @@
 				newShopCard();
 				newCertificate();
 			}
+			expired = false; //初始化为False
 		},
 		failure : function(form, action) {
 		}
@@ -741,7 +765,101 @@
 		}
 	});
 }
+//根据传的值是否显示过期的注册证
+function initializeData(expireds){
+	  formObj.form
+		.load( {
+			url : WWWROOT + '/disinfectSystem/baseData/expensiveGoodsSupplierAction!loadSupplier.do',
+			method : 'GET',
+			params : {
+				id : id
+			},
+			success : function(form, action) {
+				configStore.removeAll(); //清空上次器械包注册信息
+				var supplier = action.result.data;
+				authorizationCertifications = action.result.authorizationCertification;
+				
+				//初始化供应商的经营许可证
+				if(supplier.businessCertificate != null && supplier.businessCertificate != ''){
+					var supplierBusinessCertificates = new registrationCertificateConfig({
+						id : supplier.id,
+						certificationType : supplier.businessType,
+						certification : supplier.businessCertificate,
+						validityTime :new Date(supplier.businessValidityTime.time),
+						type : ''
+					});
+					configStore.add(supplierBusinessCertificates);
+				}
+				//初始化供应商的生产许可证
+				if(supplier.productionCertificate != null && supplier.productionCertificate != ''){
+					var supplierProductionCertificates = new registrationCertificateConfig({
+						id : supplier.id,
+						certificationType : supplier.productionType,
+						certification : supplier.productionCertificate,
+						validityTime :new Date(supplier.productionValidityTime.time),
+						type : ''
+					});
+					configStore.add(supplierProductionCertificates);
+				}
+				//初始化供应商的营业执照
+				if(supplier.businessLicense != null && supplier.businessLicense != ''){
+					var supplierBusinessLicenseCertificates = new registrationCertificateConfig({
+						id : supplier.id,
+						certificationType : supplier.licenseType,
+						certification : supplier.businessLicense,
+						validityTime :new Date(supplier.licenseValidityTime.time),
+						type : ''
+					});
+					configStore.add(supplierBusinessLicenseCertificates);
+				}
+				//初始化供应商包含的注册证
+				for(var i = 0 ;i < supplier.registrationCertificate.length;i++){
+					var supplierRegistrationCertificate = supplier.registrationCertificate[i];
+					//预警期
+					var warningUntil = new Date(supplierRegistrationCertificate.warningUntil.time).getTime();
+					//判定注册证的预警日期是否已过
+					var date= new Date().getTime();
+					expired = false; //初始化为false
+					if(warningUntil < date){
+						expired = true;
+					}
+					//判断是否显示过期的注册证 ,默认是不显示的
+					if(expireds == STR_NO){
+						if(new Date(supplierRegistrationCertificate.validityTime.time).getTime() < date){
+							   continue;
+						}
+					}
+					var supplierRegistrationCertificates = new registrationCertificateConfig({
+						id : supplierRegistrationCertificate.id,
+						certificationType : registrationCertification,
+						certification : supplierRegistrationCertificate.certification,
+						validityTime :new Date(supplierRegistrationCertificate.validityTime.time),
+						type : supplierRegistrationCertificate.type,
+						expired : expired
+					});
+					configStore.add(supplierRegistrationCertificates);
+				}
+				
+				//初始化供应商包含的授权证
+				for(var i = 0 ;i < authorizationCertifications.length;i++){
+					var supplierAuthorizationCertification = authorizationCertifications[i];
+					var supplierRegistrationCertificates = new registrationCertificateConfig({
+						id : supplierAuthorizationCertification.id,
+						certificationType : authorization,
+						certification : supplierAuthorizationCertification.authorizationNumber,
+						validityTime :new Date(supplierAuthorizationCertification.validityTime.time),
+						type : ''
+					});
+					configStore.add(supplierRegistrationCertificates);
+				}
+				expired = false;//初始化为false
+			},
+			failure : function(form, action) {
+			}
+		});
+}
 
+
 function save() {
 	this.disable();
 	if (!formObj.form.isValid()) {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp
===================================================================
diff -u -r22265 -r22357
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp	(.../expensiveGoodsSupplierView.jsp)	(revision 22265)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp	(.../expensiveGoodsSupplierView.jsp)	(revision 22357)
@@ -1,4 +1,5 @@
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.ExpensiveGoodsSupplier"%>
+<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods,com.forgon.Constants"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
@@ -71,6 +72,8 @@
 var businessCertificate = '<%=ExpensiveGoodsSupplier.CERTIFICATE_TYPE_BUSINESSCERTIFICATE%>'; //经营许可证类型
 var businessLicense = '<%=ExpensiveGoodsSupplier.CERTIFICATE_TYPE_BUSINESSLICENSE%>'; //营业执照类型
 var authorization = '<%=ExpensiveGoodsSupplier.CERTIFICATE_TYPE_AUTHORIZATION%>'; //授权证类型
+var STR_YES = '<%=Constants.STR_YES %>';//能
+var STR_NO = '<%=Constants.STR_NO %>';//否
 
 </script>