Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r25654 -r26225
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 25654)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 26225)
@@ -484,11 +484,14 @@
 			    		    {header : "开始时间",dataIndex : 'startDate',width : 160, menuDisabled: true,renderer : myDateFormatBySecond},
 			    		    {id : 'endDate',header : "结束时间",dataIndex : 'endDate',width : 160, menuDisabled: true,renderer : myDateFormatBySecond},
 			    		    {header : "清洗参数",dataIndex : 'washDataAmount',width : 70, menuDisabled: true,renderer : function(v,p,record){
-			    		    	 if(record.data.washDataAmount > 0){
-			    		    		 return "<img height=\"20\" src=\"" + WWWROOT + "/images/web/application_view_list.png\" onclick=\"getCurrentTab().openWashDataLineChart('"+record.data.washRecordID+"') \">";
-			    		    	 }else{
-			    		    		 return null;
-			    		    	 }  
+								var buttonStr = ""
+			    		    	if(record.data.washDataAmount > 0){
+									buttonStr += "<img height=\"20\" src=\"" + WWWROOT + "/images/web/application_view_list.png\" onclick=\"getCurrentTab().openWashDataLineChart('"+record.data.washRecordID+"') \">";
+			    		    	}
+								if(record.data.hasWashAndDisinfectPictures){
+									buttonStr += "<img height=\"20\" src=\"" + WWWROOT + "/images/web/application_view_list.png\" onclick=\"getCurrentTab().showWashAndDisinfectRecordPic('"+record.data.washRecordID+"') \">";
+								}
+								return buttonStr;
 			    	     	 }}
 			    		]),
 						enableHdMenu : false,
@@ -2011,7 +2014,8 @@
 								position : washRecordInfo.position,  //清洗记录_位置
 								startDate : washRecordInfo.startDate,  //清洗记录_开始时间
 								endDate : washRecordInfo.endDate,  //清洗记录_结束时间
-								washDataAmount : washRecordInfo.washDataAmount  //清洗记录_清洗参数
+								washDataAmount : washRecordInfo.washDataAmount  ,//清洗记录_清洗参数
+								hasWashAndDisinfectPictures : washRecordInfo.hasWashAndDisinfectPictures //按钮，打开清洗记录拍照的图片
 							});
 							top.Ext.getCmp('washRecord').getStore().add(washRecordData);
 						}