Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
===================================================================
diff -u -r22306 -r22340
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js	(.../expensiveGoodsSupplierForm.js)	(revision 22306)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js	(.../expensiveGoodsSupplierForm.js)	(revision 22340)
@@ -5,6 +5,7 @@
 var registrationConfig;
 var authorizationCertifications; //授权证信息集合
 var expensiveGoodsSupplierId; //供应商Id
+var expired = false; //判断注册证是否过期
 function addAndEditSupplier(id) {
 	this.id = id;
 	this.expensiveGoodsSupplierId = id;
@@ -17,6 +18,18 @@
 	configStore = new top.Ext.data.Store({
 	});
 	
+	function rendeColor(v, p, record){
+		var expensiveGoodsSupplier = record.data;
+		if(expensiveGoodsSupplier != null){
+			//判断是否有注册证过期或达到预警期有就改变名称背景颜色为黄色
+			if(expensiveGoodsSupplier.expired){
+				expired = false; //还原是否过期值为否
+				return "<p style=\"backGround-color:yellow\"> "+ v + "</p>";
+			}
+		}
+		return v;
+	}
+
 	//注册证
 	function newRow(){
 		var n = top.Ext.getCmp('configGrid').getStore().getCount();// 获得总行数 
@@ -102,6 +115,7 @@
 		id : 'certification',
 		header : "证件号",
 		dataIndex : 'certification',
+		renderer : rendeColor,
 		width : 100 ,
 		editor : new top.Ext.form.TextField({
 			allowBlank : false,
@@ -580,27 +594,41 @@
 			//初始化供应商包含的注册证
 			for(var i = 0 ;i < supplier.registrationCertificate.length;i++){
 				var supplierRegistrationCertificate = supplier.registrationCertificate[i];
-					var supplierRegistrationCertificates = new registrationCertificateConfig({
-						id : supplierRegistrationCertificate.id,
-						certificationType : registrationCertification,
-						certification : supplierRegistrationCertificate.certification,
-						validityTime :new Date(supplierRegistrationCertificate.validityTime.time),
-						type : supplierRegistrationCertificate.type
-					});
-					configStore.add(supplierRegistrationCertificates);
+				//预警期
+				var warningUntil = new Date(supplierRegistrationCertificate.warningUntil.time).getTime();
+				//判定注册证的预警日期是否已过
+				var date= new Date().getTime();
+				if(warningUntil < date){
+					expired = true;
+				}
+			    //判断是否有设置显示过期的注册证 ,默认是不显示的
+				if(!sstsConfig.showExpiredCertification){
+					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);
+				var supplierRegistrationCertificates = new registrationCertificateConfig({
+					id : supplierAuthorizationCertification.id,
+					certificationType : authorization,
+					certification : supplierAuthorizationCertification.authorizationNumber,
+					validityTime :new Date(supplierAuthorizationCertification.validityTime.time),
+					type : ''
+				});
+				configStore.add(supplierRegistrationCertificates);
 			}
 			
 			//类型为生产厂家是添加时带出2证
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
===================================================================
diff -u -r22291 -r22340
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js	(.../config.js)	(revision 22291)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js	(.../config.js)	(revision 22340)
@@ -40,5 +40,7 @@
   //回收一键入筐
   recycleAllTousseIntoBasket : true,
   // 高值耗材自助入库验收后是否发货，默认为否
-  checkedAfterSubmitInvoice : false
+  checkedAfterSubmitInvoice : false,
+  //注册证列表是否显示已过期的注册证
+  showExpiredCertification : true
 }
\ No newline at end of file