Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r14486 -r14519
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14486)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14519)
@@ -882,6 +882,18 @@
 	       '->',
 	       {
                xtype : 'button',
+               text : '配包注意事项',
+               handler : function(){
+            	   var td_id = Ext4.getCmp('td_id').getValue();
+            	   if(isUndefinedOrNullOrEmpty(td_id)){
+            			showResult("请选择装配任务");
+	        		}else{
+	        			showToussePackingNote(td_id);
+	        		}
+               }
+           },
+	       {
+               xtype : 'button',
                text : '教学图片',
                handler : function(){
             	   var imageName = Ext4.getCmp('imageName').getText();
@@ -1659,7 +1671,9 @@
 			    {name : 'count'},
 			    {name : 'type'},
 			    {name : 'notice'},
-			    {name : 'hasNotice'}
+			    {name : 'hasNotice'},
+			    {name : 'washQualityCheckPoint'},
+			    {name : 'functionCheck'}
 			],
     listeners : {
     	load : function(thiz,records,options){
@@ -1680,6 +1694,22 @@
     }
 });
 
+function gridItemRender(v , ctx , record){
+	var content = "<tr height=25><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>");
+	tableContent += "</tr>"
+			+ content
+			+ "</table></br>";
+    ctx.tdAttr = " data-qtip = '"+Ext4.String.htmlEncode(tableContent)+"' data-qwidth=350 data-qtitle='<b><font style=\"color: green;\">质量、功能检查:</font><b>'"; 
+    return v; 
+}
+
 var materialGrid = new Ext4.grid.Panel({
 	id :'materialGrid',
     store: materialStore,
@@ -1693,8 +1723,8 @@
     }],
     columns: [
          {hidden : true, dataIndex : 'materialDefinitionId'},     
-         {header : "材料名称",width : 140,flex: 1,menuDisabled: true,dataIndex : 'name'}, 
-      	 {header : "数量",width : 40,menuDisabled: true,dataIndex : 'count'}
+         {header : "材料名称",width : 140,flex: 1,menuDisabled: true,dataIndex : 'name',renderer:gridItemRender}, 
+      	 {header : "数量",width : 40,menuDisabled: true,dataIndex : 'count',renderer:gridItemRender}
     ],
     plugins: [{
         ptype: 'rowexpander',