Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r24063 -r24079
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 24063)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 24079)
@@ -23,6 +23,8 @@
 var taskGroupObj = null;
 //丢失报损按钮响应函数
 var onErrorDamageBtnClick = null;
+var curSelMaterialName = null;
+var curSelMaterialId = null;
 //判断是否ie和ie7
 var isIE6OrIE7 = top.Ext4.isIE6 || top.Ext4.isIE7;
 var appDepartJsonStore = new Ext4.data.Store({
@@ -913,8 +915,10 @@
     	}]
 	}
 	],
+	tbar:[
+	      { id:'imageName'}
+	      ],
 	bbar: [
-	       { id:'imageName'},
 	       {xtype:'hidden',id:'imageType'},
 	       {xtype:'hidden',id:'currentPage'},
 	       {xtype:'hidden',id:'materialId'},
@@ -923,6 +927,8 @@
 	       '->',
 	       {
                xtype : 'button',
+               id:'btn_packingNote',
+               name:'btn_packingNote',
                text : '配包注意事项',
                hidden : teachingPicture,
                handler : function(){
@@ -936,6 +942,8 @@
            },
 	       {
                xtype : 'button',
+               id:'btn_specification',
+               name:'btn_specification',
                text : '说明书',
                hidden : specificationPicture,
                handler : function(){
@@ -949,6 +957,8 @@
            },
 	       {
                xtype : 'button',
+               id:'btn_teachingPicture',
+               name:'btn_teachingPicture',
                text : '教学图片',
                hidden : teachingPicture,
                handler : function(){
@@ -964,14 +974,57 @@
                xtype : 'button',
                hidden : teachingVideo,
                text : '配包视频',
-               id:'watchVideoBar',
+               id:'btn_watchVideoBar',
+               name:'btn_watchVideoBar',
                handler : function(){
             	   var vedioName = Ext4.getCmp('vedioName').getValue();
                    if(vedioName != ""){
                        watchVideo(vedioName);
                    }
                }
            },
+           {
+               xtype : 'button',
+               id : 'btn_washQualityCheckPoint',
+               name : 'btn_washQualityCheckPoint',
+               hidden : true,
+               text : '清洗质量检查关注点',
+               handler : function(){
+            	   if(!curSelMaterialId){
+            		   showResult("请选择材料" , null , sstsConfig.messagePauseTimeOnPackingPage);
+            		   return;
+            	   }
+               	   loadGoodsImage(curSelMaterialName,IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT,curSelMaterialId,1,"","");
+               }
+           },
+           {
+               xtype : 'button',
+               id : 'btn_washQualityCheckMethod',
+               name : 'btn_washQualityCheckMethod',
+               hidden : true,
+               text : '清洗质量检查方法',
+               handler : function(){
+            	   if(!curSelMaterialId){
+            		   showResult("请选择材料" , null , sstsConfig.messagePauseTimeOnPackingPage);
+            		   return;
+            	   }
+               	   loadGoodsImage(curSelMaterialName,IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD,curSelMaterialId,1,"","");
+               }
+           },
+           {
+               xtype : 'button',
+               id : 'btn_functionCheck',
+               name : 'btn_functionCheck',
+               hidden : true,
+               text : '功能检查',
+               handler : function(){
+            	   if(!curSelMaterialId){
+            		   showResult("请选择材料" , null , sstsConfig.messagePauseTimeOnPackingPage);
+            		   return;
+            	   }
+               	   loadGoodsImage(curSelMaterialName,IMAGE_TYPE_MATERIAL_FUNCTIONCHECK,curSelMaterialId,1,"","");
+               }
+           },
 	       {xtype:'button',text:'<<',tooltip :"上一页", handler : function(){
 	    	   var imageName = Ext4.getCmp('imageName').getText();
 	    	   var imageType = Ext4.getCmp('imageType').getValue();
@@ -1840,8 +1893,39 @@
 function loadTousseInfo(tousseName,type,vedioName,td_id){
 	loadGoodsImage(tousseName,type,'',1,vedioName,td_id);
     materialStore.load({params: {tousseName:tousseName,tousseDefinitionId:td_id}});
+    
+    showTousseImgBtns();
 }
 
+function showTousseImgBtns(){
+	curSelMaterialName = null;
+    curSelMaterialId = null;
+    
+    Ext4.getCmp('btn_washQualityCheckPoint').hide();
+    Ext4.getCmp('btn_washQualityCheckMethod').hide();
+    Ext4.getCmp('btn_functionCheck').hide();
+    
+    if(!teachingPicture){
+    	Ext4.getCmp('btn_packingNote').show();
+    	Ext4.getCmp('btn_teachingPicture').show();
+    }
+    if(!specificationPicture){
+    	Ext4.getCmp('btn_specification').show();
+    }
+    if(!teachingVideo){
+    	Ext4.getCmp('btn_watchVideoBar').show();
+    }
+}
+function showMaterialImgBtns(){
+	Ext4.getCmp('btn_packingNote').hide();
+    Ext4.getCmp('btn_specification').hide();
+    Ext4.getCmp('btn_teachingPicture').hide();
+    Ext4.getCmp('btn_watchVideoBar').hide();
+    
+	Ext4.getCmp('btn_washQualityCheckPoint').show();
+    Ext4.getCmp('btn_washQualityCheckMethod').show();
+    Ext4.getCmp('btn_functionCheck').show();
+}
 
 var materialStore = new Ext4.data.Store({
 	proxy : {
@@ -1859,6 +1943,8 @@
 			    {name : 'notice'},
 			    {name : 'hasNotice'},
 			    {name : 'washQualityCheckPoint'},
+			    {name : 'washQualityCheckMethod'},
+			    {name : 'detachable'},
 			    {name : 'functionCheck'}
 			],
     listeners : {
@@ -1882,13 +1968,15 @@
 
 function gridItemRender(v , ctx , record){
 	var content = "<tr height=25><td align='left' width='200px'>&nbsp"
+		+ record.data['washQualityCheckMethod']
+		+"</td><td align='left' width='200px'>&nbsp"
 		+ record.data['washQualityCheckPoint']
 		+ "</td><td align='center' width='100px'>&nbsp"
 		+ record.data['functionCheck']
 		+ "</td></tr>";
 	var tableContent = ("<table height='100%' width='310px' border='1' align='center' cellpadding='0' cellspacing='0'>" 
 			+ "<tr bgcolor='#D7EBD9' height=25>" +
-			"<td width='200px' align='center'><h3>清洗质量检查关注点</h3></td><td width='100px' align='center'><h3>功能检查</h3></td>");
+			"<td width='200px' align='center'><h3>清洗质量检查方法</h3></td><td width='200px' align='center'><h3>清洗质量检查关注点</h3></td><td width='100px' align='center'><h3>功能检查</h3></td>");
 	tableContent += "</tr>"
 			+ content
 			+ "</table></br>";
@@ -1905,7 +1993,7 @@
     height : document.body.clientHeight-20,
 	region: 'east',
 	margin: '0 0 0 0',
-    width : '22%',
+    width : '24%',
     selModel: selModel,
     tbar:[{
     	xtype:'button',
@@ -1927,7 +2015,16 @@
     columns: [
          {hidden : true, dataIndex : 'materialDefinitionId'},
          {header : "材料名称",width : 140,flex: 1,menuDisabled: true,dataIndex : 'name',renderer:gridItemRender}, 
-      	 {header : "数量",width : 40,menuDisabled: true,dataIndex : 'count',renderer:gridItemRender}
+      	 {header : "数量",width : 40,menuDisabled: true,dataIndex : 'count',renderer:gridItemRender},
+         {header : "是否可拆",width : 60,menuDisabled: true,dataIndex : 'detachable',renderer: function(v , ctx , record){
+        	 if(v == '是'){
+        		 var materialName = record.get('name');
+             	 var materialId = record.get('materialDefinitionId');
+        		 return "<input type='button' style='height:20px; width:40px;' value='是' >";
+        	 }else{
+        		 return v;
+        	 }
+         }}
     ],
     plugins: [{
         ptype: 'rowexpander',
@@ -1945,10 +2042,20 @@
     title:'材料清单',
     listeners: {
         itemclick: function (dv, record, item, index, e) {
-        	var materialName = record.get('name');
-        	var materialId = record.get('materialDefinitionId');
-        	loadGoodsImage(materialName,imageType_material,materialId,1,"","");
+        	
         },
+        cellclick: function(grid, td, cellIndex, record, tr, rowIndex, e, eOpts ){
+        	curSelMaterialName = record.get('name');
+        	curSelMaterialId = record.get('materialDefinitionId');
+        	var detachable = record.get('detachable');
+        	showMaterialImgBtns();
+        	
+        	if(cellIndex == 5 && detachable == '是'){
+        		loadGoodsImage(curSelMaterialName,IMAGE_TYPE_MATERIAL_DETACHABLE,curSelMaterialId,1,"","");
+        		return;
+        	}
+        	loadGoodsImage(curSelMaterialName,imageType_material,curSelMaterialId,1,"","");
+        },
         afterrender: function (grid) {
             grid.getView().getHeaderAtIndex(0).hide();
          }
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r22941 -r24079
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 22941)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 24079)
@@ -290,6 +290,11 @@
 var imageType_qualitymonitoring = '<%=ImageFile.IMAGE_TYPE_QUALITYMONITORING%>';
 var imageType_specification = '<%=ImageFile.IMAGE_TYPE_SPECIFICATION%>';
 
+var IMAGE_TYPE_MATERIAL_DETACHABLE = '<%=ImageFile.IMAGE_TYPE_MATERIAL_DETACHABLE%>';
+var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD%>';
+var IMAGE_TYPE_MATERIAL_FUNCTIONCHECK = '<%=ImageFile.IMAGE_TYPE_MATERIAL_FUNCTIONCHECK%>';
+var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT%>';
+
 var inspector = "";
 var operator = "";
 var reviewer = "";