Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r21380 -r21392
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 21380)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 21392)
@@ -2490,7 +2490,9 @@
 	
 	Ext4.tip.QuickTipManager.init();
 	Ext4.apply(Ext4.tip.QuickTipManager.getQuickTip(), {
-	    dismissDelay: 0,
+		maxWidth: 1200,
+		minWidth: 100,
+		dismissDelay: 0,
 	    showDelay: 0
 	});
     top.Ext4.tip.QuickTipManager.init();
@@ -2866,26 +2868,68 @@
 				var index = grid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置
 				if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
 					var record = this.getStore().getAt(index);
+					//1、借物单特有的
 					var BorrowName = '';
 					var BorrowAmount = '';
-					var isDiposableApplicationForm = (record.data['type']==diposableGoodsApplicationForm);
+					//2、外来器械包申请单特有的
+					var ForeignName = '';
+					var ForeignContent = '';
+					//3、装配数量和灭菌数量
+					var PackAndSterileName = '';
+					var PackAndSterileContent = '';
+					
+					var isForeignTousseApplicationForm = record.data['type'] == '外来器械包申请单';  //是否外来器械包申请单
+					var isDiposableApplicationForm = (record.data['type']==diposableGoodsApplicationForm);  //是否外来器械包申请单
 					tableContent = record.data['htmlContent'];//
 					if(!tableContent){
 						var content = "";
 						DWREngine.setAsync(false);
 						InvoicePlanTableManager.findApplicationItemVOListByInvoicePlanId(record.data['id'],function(voItems){
 							for(var i=0;i<voItems.length;i++) {
 								var tousseName = voItems[i].name;
+								var recyclingAmount = voItems[i].recyclingAmount;
+								var packedAmount = voItems[i].packedAmount;
+								var sterilizationAmount = voItems[i].sterilizationAmount;
+								var invoiceAmount = voItems[i].invoiceAmount;
+								
+								
 								if(record.data['type'] == '借物单'){
 									BorrowName = "<td width='70px' align='center'><h3>已还数量</h3></td>";
 									BorrowAmount = "<td align='center'>" + voItems[i].alsoAmount+"</td>";
 								}
-								var recyclingAmount = voItems[i].recyclingAmount;
+								if(isForeignTousseApplicationForm){
+									ForeignName = 
+											"<td width='70px' align='center'><h3>供应商</h3></td>" +
+											"<td width='70px' align='center'><h3>医生名称</h3></td>" +
+											"<td width='70px' align='center'><h3>拆包数量</h3></td>";
+									ForeignContent = 
+											"<td align='center'>" + voItems[i].supplierName+"</td>" +
+											"<td align='center'>" + voItems[i].doctor+"</td>" +
+											"<td align='center'>" + voItems[i].splitAmount+"</td>";
+								}
+								
+								if (!isDiposableApplicationForm) {
+									PackAndSterileName = 
+										"<td width='70px' align='center'><h3>装配数量</h3></td>" +
+										"<td width='70px' align='center'><h3>灭菌数量</h3></td>";
+									PackAndSterileContent = 
+											"<td align='center'>" + packedAmount+"</td>" +
+											"<td align='center'>" + sterilizationAmount+"</td>";
+								}
 
 								content += "<tr height=25 ";
 	                            content += voItems[i].delivered === false ? "style='background-color: palevioletred'>" : ">";
-								content +="<td align='left'>&nbsp" + tousseName +"</td><td align='center'>" + voItems[i].amountDisplay+"</td><td align='center'>" + recyclingAmount+"</td><td align='center'>" + voItems[i].invoiceAmount+"</td>" + BorrowAmount;
-								// content +="<tr height=25><td align='left'>&nbsp" + tousseName +"</td><td align='center'>" + voItems[i].amount+"</td><td align='center'>" + recyclingAmount+"</td><td align='center'>" + voItems[i].invoiceAmount+"</td>"+BorrowAmount;
+								content +=
+										ForeignContent +
+										"<td align='left'>&nbsp" + tousseName +"</td>" +
+										"<td align='center'>" + voItems[i].amountDisplay+"</td>" +
+										"<td align='center'>" + recyclingAmount+"</td>" +
+										PackAndSterileContent +
+										"<td align='center'>" + invoiceAmount+"</td>" + 
+										BorrowAmount;
+								
+								
+								
 								//一次性物品加编号
 								if(isDiposableApplicationForm){
 									var code = voItems[i].externalCode;
@@ -2908,15 +2952,23 @@
 							}
 						});
 						DWREngine.setAsync(true);
-						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='80px' align='center'><h3>已发货数量</h3></td>"+BorrowName);
+						tableContent = ("<table height='100%' border='1' align='center' cellpadding='0' cellspacing='0'>" +
+								"<tr bgcolor='#D7EBD9'  height=25>" +
+									ForeignName +
+									"<td width='190px' align='center'><h3>物品名称</h3></td>" +
+									"<td width='70px' align='center'><h3>申请数量</h3></td>" +
+									"<td width='70px' align='center'><h3>回收数量</h3></td>" +
+									PackAndSterileName +
+									"<td width='80px' align='center'><h3>发货数量</h3></td>" +
+									BorrowName);
 						if(isDiposableApplicationForm){
 							tableContent += "<td width='70px' align='center'><h3>编码</h3></td>";
 						}
 						tableContent += "</tr>" + content + "</table></br>";
 						record.set("htmlContent",tableContent);
 					}
 	                e.getTarget().setAttribute('data-qtip', tableContent);
-	                e.getTarget().setAttribute('data-qwidth', 450);
+//	                e.getTarget().setAttribute('data-qwidth', 1000);
 	                e.getTarget().setAttribute('data-qtitle', '&nbsp<font size=10>申请物品列表:</font>');
 				}
 			});