Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/Supplier.java
===================================================================
diff -u -r20818 -r20849
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/Supplier.java	(.../Supplier.java)	(revision 20818)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/Supplier.java	(.../Supplier.java)	(revision 20849)
@@ -228,7 +228,10 @@
 	
 	public ImageFile getImageAt(ObjectDao objectDao, int index) {
 		Session session = objectDao.getHibernateSession();
-		Query query = session.createQuery("from ImageFile where supplier_id = :id and imageType='注册证图片' order by serialNum asc");
+//		String sql = "where po.supplier_id = : id ";
+//		@SuppressWarnings("unchecked")
+//		List<RegistrationCertification> certification = objectDao.findBySql(RegistrationCertification.class.getSimpleName(), sql);
+		Query query = session.createQuery("from ImageFile where objectId = :id and imageType='注册证图片' order by serialNum asc");
 		query.setLong("id", id);
 		query.setMaxResults(1);
 		query.setFirstResult(index);
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js
===================================================================
diff -u -r20842 -r20849
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js	(.../supplierForm.js)	(revision 20842)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js	(.../supplierForm.js)	(revision 20849)
@@ -5,7 +5,7 @@
 var registrationConfig;
 function addAndEditSupplier(id) {
 	this.id = id;
-
+	Ext.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
 	var isDeposableStore = new Ext.data.SimpleStore( {
 		fields : [ 'value' ],
 		data : [ [ renttousse ], [ madeCompany ],[ supplier ],[expensivegoodssupplier] ]
@@ -31,7 +31,7 @@
 		id : 'certification',
 		header : "注册证号",
 		dataIndex : 'certification',
-		width : 100	,
+		width : 80 ,
 		editor : new top.Ext.form.NumberField({
 			allowBlank : false,
 			minValue:1,
@@ -58,14 +58,14 @@
 						if(isLastRow){//是最后一行，新增空白行
 							newRow();
 						}
-					}2017-11-15
+					}
 				}
 			}
 		})
 	}, {
 		id	: 'validityTime',
 		header : "失效期",
-		width : 100,
+		width : 60,
 		dataIndex : 'validityTime',
 		renderer: function(v,p,record){
 			v = v||{};
@@ -110,7 +110,17 @@
 					}
 				}
 			}
-		})	
+		})
+	}, {
+		id:'operation',
+		header:"操作",
+		width : 60,
+		dataIndex:'operation',
+  		hidden:id == 0?true:false,
+		renderer: function(v,p,record){
+			var str = " <button type='button' onclick= 'getCurrentTab().loadImag()'>注册证图片管理</button>";
+			return str;
+		}	
 	}]);
 
 	registrationPanel = new top.Ext.grid.EditorGridPanel({
@@ -208,7 +218,8 @@
 				id : 'imageBrowse',
 				tag : 'img',
 				autoHeight:true,
-				src : WWWROOT + '/ext/resources/images/default/s.gif',
+				src : Ext.BLANK_IMAGE_URL,
+//					WWWROOT + '/ext/resources/images/default/s.gif',
 				style : 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);',
 				complete : 'off'
 		    }
@@ -385,13 +396,6 @@
 			text : '取消',
 			id : 'saveAndNewBtn',
 			handler : cancel
-		}, {	
-	 		text : '注册证图片管理',
-	  		id : 'uploadFile',
-	  		hidden:id == 0?true:false,
-	  		handler : function(){
-	  		      uploadToussePackingImageFile(imageTypeSupplier,id);
-	  		}
 		} ]
 	});
 
@@ -437,6 +441,19 @@
 	
 }
 
+function loadImag() {
+	var rows = top.Ext.getCmp('configGrid').getSelectionModel().getSelections();// 返回值为所点击的行
+	var configStore = top.Ext.getCmp('configGrid').getStore();
+	if (rows) {
+		for ( var i = 0; i < rows.length; i++) {
+			var index = configStore.indexOf(rows[i]); //获取本行数据下标
+			var record = configStore.getAt(index); //用本行数据下标获取点击行的注册证信息
+			var id = record.data.id;   //获取注册证ID
+			uploadToussePackingImageFile(imageTypeCertification,id);
+		}
+	}
+}
+
 var registrationCertificateConfig = Ext.data.Record.create([
     {name : 'id'},
     {name : 'certification'},
@@ -504,6 +521,7 @@
 		this.enable();
 		return false;
 	}
+	
 	var rentTousse = top.Ext.getCmp('rentTousse').getValue();
 	if(sstsConfig.enableExpensiveGoods && rentTousse == expensivegoodssupplier){ //高值耗材启用并且厂商类型为高值耗材供应商才可以添加注册证
 		var certificationCount = configStore.getCount();
@@ -530,6 +548,13 @@
 		}
 		
 	 }
+	var rentTousse = top.Ext.getCmp('rentTousse').getValue();
+	if(rentTousse != expensivegoodssupplier){ //高值耗材启用并且厂商类型为高值耗材供应商才可以添加注册证
+	  showResult("厂商类型不为高值耗材供应商不能添加注册证！");
+	  this.enable();
+	  return false;
+	}
+	
 	validateAndSubmit();
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.jsp
===================================================================
diff -u -r20842 -r20849
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.jsp	(.../supplierView.jsp)	(revision 20842)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.jsp	(.../supplierView.jsp)	(revision 20849)
@@ -60,7 +60,7 @@
 var madeCompany = '<%=Supplier.SUPPLIER_TYPE_MADECOMPANY%>';//生产厂家
 var supplier = '<%=Supplier.SUPPLIER_TYPE_SUPPLIER%>';//供货单位
 var expensivegoodssupplier = '<%=Supplier.SUPPLIER_TYPE_EXPENSIVEGOODSSUPPLIER%>';//高值耗材供应商
-var imageTypeSupplier = '<%=ImageFile.IMAGE_TYPE_CERTIFICATION%>'; //图片类别
+var imageTypeCertification = '<%=ImageFile.IMAGE_TYPE_CERTIFICATION%>'; //图片类别
 var imageTypeTousse = '<%=ImageFile.IMAGE_TYPE_CERTIFICATION%>'; 
 
 </script>