Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r17351 -r17512
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 17351)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 17512)
@@ -234,6 +234,10 @@
 function showTousseInfoDiv(v,p,record,rowIndex, columnIndex, store) {
 	var result = v;
 	var id = record.data.id;
+	var haveUnSupplementMaterials = record.data.haveUnSupplementMaterials;
+	if(haveUnSupplementMaterials == true){
+		result = "◆ " + result;
+	}
 	return "<span style=\"color:green;\" class=\"linkstyle\">" + result + "</span>";;
 }
 
@@ -1033,7 +1037,8 @@
 	     {name : 'packageType'},
 	     {name : 'scanned'},
 	     {name : 'isTimeout'},
-	     {name : 'isUrgentTousse'}
+	     {name : 'isUrgentTousse'},
+	     {name : 'haveUnSupplementMaterials'}
 	];
 	
 	
@@ -1152,11 +1157,34 @@
 				var title2 = ("<tr bgcolor='#D7EBD9'  height=25><td width='190px' align='center'><h3>装配人</h3></td><td width='70px' align='center'><h3>装配时间</h3></td><td width='70px' align='center'><h3>灭菌程序</h3></td><td width='70px' align='center'><h3>有效期至</h3></td></tr>");
 				tableContent = ("<table height='100%' width='430px' border='1' align='center' cellpadding='0' cellspacing='0'><tr bgcolor='#D7EBD9'  height=25><td width='190px' align='center'><h3>器械包名称</h3></td><td width='70px' align='center'><h3>包装类型</h3></td><td width='70px' align='center'><h3>是否加急</h3></td><td width='70px' align='center'><h3>灭菌开始时间</h3></td>");
 				tableContent += "</tr>" +content1+ title2 + content2 +"</table><br>";
+				
+				if(record.get("haveUnSupplementMaterials") == true){
+					DWREngine.setAsync(false);
+					PackingTableManager.loadUnSupplementMaterialsByTousseInstance(record.get("id"),function(dataArray){
+						if(dataArray != ""){
+							var invoiceItems = JSON.parse(dataArray);
+							var content = "";
+							if (invoiceItems != null) {
+								for ( var i = 0; i < invoiceItems.length; i++) {
+									content += "<tr height=25><td align='left' width='250px'>&nbsp"
+											+ invoiceItems[i].materialName
+											+ "</td><td align='center' width='100px'>"
+											+ invoiceItems[i].amount
+											+ "</td><td align='center' width='100px'>"
+											+ invoiceItems[i].type
+											+ "</td></tr>";
+								}
+							}
+							tableContent += ("<table height='100%' width='430px' border='1' align='center' cellpadding='0' cellspacing='0'><tr bgcolor='#D7EBD9' height=25><td width='300px' align='center'><h3>材料名称</h3></td><td width='100px' align='center'><h3>数量</h3></td><td width='100px' align='center'><h3>类型</h3></td>");
+							tableContent += "</tr>" + content + "</table></br>";
+						}
+					});
+					DWREngine.setAsync(true);
+				}
 				record.set("htmlContent",tableContent);
 			}
 			var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象
-			rowEl.set({
-			'data-qtip' : tableContent,'data-qwidth':450,'data-qtitle':'&nbsp<font size=10>器械包信息:</font>'},false);
+			rowEl.set({'data-qtip' : tableContent,'data-qwidth':450,'data-qtitle':'&nbsp<font size=10>器械包信息:</font>'},false);
 		}
 	});