Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r34414 -r34767
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 34414)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 34767)
@@ -96,6 +96,10 @@
 						}
 					}
 
+					if(field == 'packageStatus'){
+						return false;
+					}
+
 					if(sstsConfig.foreignTousseAddWeight){
 						if(isLeaf && (field == 'weight' || field == 'urgentLevel')){
 							return false;
@@ -157,6 +161,7 @@
 	{name : 'implantAmountOfUseRecord'},
 	{name : 'packageSize'},
 	{name : 'temporaryPurchase'},
+	{name : 'packageStatus'},
 	{name : 'foreignToussePrintAmount'},
 	{name : 'splitNumber'},
 	{name : 'isTerminated'},
@@ -784,6 +789,7 @@
 			urgentLevelId:n.get("urgentLevelId"),
 			packageSize : n.get("packageSize"),
 			temporaryPurchase : n.get("temporaryPurchase"),
+			packageStatus : n.get("packageStatus"),
 			foreignToussePrintAmount : n.get("foreignToussePrintAmount"),
 			splitNumber : n.get("splitNumber"),
 			materials : materials
@@ -906,6 +912,9 @@
     		}
     	}
     }
+
+	var tree = top.Ext4.getCmp('foreignTousseTreeGridForm');
+	var selNodes = tree.getView().getChecked();
     //判断已改成上面的配置项
     /*if(sstsConfig.doctorOfForeignTousseApplicationNotBlank && top.Ext4.getCmp('doctor').getValue() == ''){
     	showResult("医生不能为空！");
@@ -915,7 +924,7 @@
     //当外来器械未归还时能否申请
     var canApplyForForeignTousseNotReturn = getObjValueFromJs('sstsConfig.canApplyForForeignTousseNotReturn',true);
     if(!canApplyForForeignTousseNotReturn){
-    	var tousseNode = foreignTousseStore.getRootNode().childNodes[0];
+    	var tousseNode = selNodes[0];
     	var tousseName = tousseNode.get("tousseName");
     	var supplierName = tousseNode.get("supplierName");
     	var id = top.Ext4.getCmp('id').getValue();
@@ -955,14 +964,34 @@
 	if(top.Ext4.getCmp('returnMan1')){
 		returnMan = top.Ext4.getCmp('returnMan1').getValue() || '';
 	}
+	var tree = top.Ext4.getCmp('foreignTousseTreeGridForm');
+	var selNodes = tree.getView().getChecked();
+	var ids = '';
+	if(actionType == actionType_confirmReturn || actionType == ACTION_TYPE_EARLY_RETURN){
+		if(selNodes.length > 0){
+			var idsArr = [];
+			for(var i=0;i<selNodes.length;i++){
+				idsArr[i] = selNodes[i].get('id');
+			}
+			ids = idsArr.join(';');
+		}else {
+			showResult('请先勾选需要归还的器械包后再进行操作');
+			return;
+		}
+	}
+	var submitUrl = '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!comfirmReturnOrEarlyReturnPartOfTousseItem.do';
+	if(actionType == ACTION_TYPE_ADD || actionType == ACTION_TYPE_UPDATE){
+		submitUrl = '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!saveForeignTousseApplication.do';
+	}
 	var oldVersion = top.Ext4.getCmp('oldVersion').getValue() || 0;
 	foreignTousseForm.form.submit({
-		 url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!saveForeignTousseApplication.do',
+		 url : WWWROOT + submitUrl,
 	     method : 'POST',
 	     waitMsg : '正在保存数据，请稍候',
 	     waitTitle : '提交表单',
 	     params : {
-			 actionType : actionType,
+			 returnType : actionType,
+			 tousseItemIds : ids,
 			 oldVersion:oldVersion,
 			 returneeOfSupplier1:returneeOfSupplier,
 			 returnMan1:returnMan
@@ -1272,6 +1301,7 @@
 			    {name : 'suppler',mapping : 'suppler'},
 			    {name : 'includeImplant',mapping : 'includeImplant'},
 			    {name : 'packageSize',mapping : 'packageSize'},
+				{name : 'packageStatus',mapping : 'packageStatus'},
 				{name : 'temporaryPurchase',mapping : 'temporaryPurchase'},
 			    {name : 'foreignToussePrintAmount',mapping : 'foreignToussePrintAmount'},
 			    {name : 'splitNumber',mapping : 'splitNumber'},
@@ -1661,6 +1691,7 @@
 						amount : 1,
 						includeImplant : '',
 						price : foreignToussePriceOfSysParams,
+						packageStatus:'待接收',
 						urgentLevel:urgentLevel,
 						urgentLevelId:urgentLevelId,
 						type : 'tousse',
@@ -1712,6 +1743,7 @@
 											splitNumber : (result.data[i].splitNumber ? result.data[i].splitNumber : defaultSplitNumber),
 											amount : 1,
 											includeImplant : '',
+											packageStatus:'待接收',
 											price : result.data[i].price,
 											urgentLevel:urgentLevel,
 											urgentLevelId:urgentLevelId,
@@ -1914,7 +1946,7 @@
 								}
 								var success = getForeignTousseInfo();
 								if(success){
-									submintForeignTousseForm(actionType_confirmReturn, false);
+									submintForeignTousseForm(ACTION_TYPE_EARLY_RETURN, false);
 								}
 							}
 						},{
@@ -2126,6 +2158,21 @@
 			forceSelection : true
         }
     },{
+    	header: '包状态',
+    	width : 60,
+    	align:'center',
+        sortable: true,
+        dataIndex : 'packageStatus',
+        editor: {
+            xtype: 'textfield',
+            allowBlank: true,
+            listeners  : {  
+                'focus':function(){  
+                    this.selectText();  
+                }  
+            }  
+        }
+    },{
     	header: '是否植入物',
     	width : 75,
     	align:'center',
@@ -2384,7 +2431,12 @@
 	        },
 	        update: function( store, record, operation, eOpts ){
 	        	refreshMaterialAmountInfo();
-	        }
+	        },
+			load:function(store,record){
+				if(record.childNodes.length > 0){
+					record.childNodes[0].set('checked',true)
+				}
+			}
 	    },
 	    folderSort: true
 	});
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r34622 -r34767
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 34622)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 34767)
@@ -488,6 +488,7 @@
 var toussePriceFluctuation = '<%=request.getAttribute("toussePriceFluctuation")%>';
 
 var actionType_confirmReturn  = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>';  //确认归还
+var ACTION_TYPE_EARLY_RETURN  = '<%=ForeignTousseApplication.ACTION_TYPE_EARLY_RETURN%>';  //提前归还
 var ACTION_TYPE_ADD  = '<%=ForeignTousseApplication.ACTION_TYPE_ADD%>';  //新增
 var mouseHoverEventOfApply = '${mouseHoverEventOfApply}';
 
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r34405 -r34767
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 34405)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 34767)
@@ -18,6 +18,7 @@
 	String userName = AcegiHelper.getLoginUser().getUserFullName();
 	String userCode = AcegiHelper.getLoginUser().getUserName();
 	Long userId = AcegiHelper.getLoginUser().getUserId();
+	request.setAttribute("mouseHoverEventOfApply", AcegiHelper.getLoginUser().getMouseHoverEventOfApply());
 	request.setAttribute("userName",userName);
 	request.setAttribute("userCode",userCode);
     request.setAttribute("depart",AcegiHelper.getLoginUser().getCurrentOrgUnitName());
@@ -60,6 +61,7 @@
 <%@ include file="/common/includeExtJs4_2.jsp"%>
 <script type="text/javascript">
 	var changLong = '<%= DeviceInterface.CHANGLONG %>';
+	var mouseHoverEventOfApply = '${mouseHoverEventOfApply}';
 	var fontSize = '${fontSize}';
 	var changlong_DC_4 = '<%= DeviceInterface.XINHUA_CHANGLONG_DC_4 %>';
 	var changlong_DC_5 = '<%= DeviceInterface.XINHUA_CHANGLONG_DC_5 %>';
@@ -154,6 +156,7 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/ForeignTousseApplicationTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/PackingTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/OrgUnitTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/InvoicePlanTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/RecyclingApplicationTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/DataSynchronizationTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/InvoiceTableManager.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r34581 -r34767
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 34581)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 34767)
@@ -246,6 +246,23 @@
 
 Ext.onReady(function(){
 	Ext.QuickTips.init();
+	Ext.apply(Ext.QuickTips.getQuickTip(), {
+		showDelay : 0,
+		trackMouse : false,
+		hideDelay : true,
+		closable : false,
+		autoHide : false,
+		draggable : true,
+		dismissDelay : 0
+	});
+	Ext4.tip.QuickTipManager.init();
+	Ext4.apply(Ext4.tip.QuickTipManager.getQuickTip(), {
+		maxWidth: 1200,
+		minWidth: 100,
+		dismissDelay: 0,
+	    showDelay: 0
+	});
+    top.Ext4.tip.QuickTipManager.init();
 	var isShowInterfacePush = false;
 	if(sstsConfig.expandFieldsOfForeignTousseApplicationForm && sstsConfig.expandFieldsOfForeignTousseApplicationForm.length > 0){
 		var expandFieldsOfForeignTousseApplicationForm = sstsConfig.expandFieldsOfForeignTousseApplicationForm;
@@ -282,7 +299,6 @@
 	    {header : "外来器械包条码",width : 150,dataIndex : 'barcodes', hidden:!sstsConfig.showForeignTousseApplicationBarcode,sortable:false},
 	    {header : "供应商",width : 150,dataIndex : 'supplierName'}, 
 	    {header : surgeryName,width : 150,dataIndex : 'surgery'}, 
-	    {header : "包状态",width : 60,dataIndex : 'packageStatus',renderer:renderPackageStatusColor}, 
 	    {header : "回收状态",width : 70,dataIndex : 'recyclingStatus',renderer:renderRecyclingStatusColor},
 	    {header : "发货状态",width : 70,dataIndex : 'deliverStatus',renderer:renderDeliverStatusColor},
 		{header : "终止状态",width : 70,dataIndex : 'endStatus'},
@@ -607,6 +623,108 @@
 		ForeignTousseApplicationTableManager.findForeignTousseApplicationTableList,
 		null
 	);
+
+	var tableContent;
+	if (mouseHoverEventOfApply != '否') {
+		grid.on('mouseover', function(e) {// 添加mouseover事件
+			var index = grid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到行的位置
+			if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
+				var record = this.getStore().getAt(index);
+				tableContent = record.data['htmlContent'];
+				//2、外来器械包申请单特有的
+				var ForeignName = '';
+				var ForeignContent = '';
+				//3、装配数量和灭菌数量
+				var PackAndSterileName = '';
+				var PackAndSterileContent = '';
+				
+				var urgentAmount = "";
+				var urgentLevel	 = "";
+				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;
+							var urgentAmountData = voItems[i].urgentAmount;
+							var urgentLevelData	 = voItems[i].urgentLevel;
+							var packageStatus	 = voItems[i].packageStatus || '';
+							if(packageStatus == 'null'){
+								packageStatus = '';
+							}
+
+							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>" +
+								"<td width='70px' align='center'><h3>拆包数量</h3></td>";
+							ForeignContent = 
+								"<td align='center'>" + voItems[i].supplierName+"</td>" +
+								"<td align='center'>" + packageStatus+"</td>" +
+								"<td align='center'>" + voItems[i].doctor+"</td>" +
+								"<td align='center'>" + voItems[i].splitAmount+"</td>";
+										
+							
+							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>";
+							
+							if(sstsConfig.enableUrgentFunction){//加急级别
+								urgentAmount = 
+									"<td width='70px' align='center'><h3>加急数量</h3></td>" +
+									"<td width='70px' align='center'><h3>加急级别</h3></td>";
+								if(urgentAmountData !="" && urgentAmountData != null){
+									urgentAmountData = urgentAmountData;
+								}else{
+									urgentAmountData = 0;
+								}
+								
+								if(urgentLevelData !="" && urgentLevelData != null){
+									urgentLevelData = urgentLevelData;
+								}else{
+									urgentLevelData = "无";
+								}
+								urgentLevel = 
+									"<td align='center'>" + urgentAmountData+"</td>" +
+									"<td align='center'>" + urgentLevelData+"</td>";
+							}
+							content += "<tr height=25 ";
+							content += voItems[i].delivered === false ? "style='background-color: palevioletred'>" : ">";	//如果是未完全发货的话背景色显示为红色
+							content +=
+									ForeignContent +
+									"<td align='left'>&nbsp;" + tousseName +"</td>" +
+									"<td align='center'>" + voItems[i].amountDisplay+"</td>" +
+									"<td align='center'>" + recyclingAmount+"</td>" +
+									PackAndSterileContent + urgentLevel+
+									"<td align='center'>" + invoiceAmount+"</td>"
+							content +="</tr>";
+						}
+					});
+					DWREngine.setAsync(true);
+					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 + urgentAmount +
+								"<td width='80px' 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', 1000);
+				e.getTarget().setAttribute('data-qtitle', '&nbsp;<font size=10>申请物品列表:</font>');
+			}
+		});
+	}
 	
 	new Ext.Viewport({
 		layout : 'border',
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r34637 -r34767
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 34637)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 34767)
@@ -4911,7 +4911,7 @@
 						checkAutoReturnBorrowing(confirmation, saveAndNew, print, recyclingAmountConfirm);
 					}
 				});
-			} else if (tousseTypeisForeignTousseDefinition == true && (recyclingStatus == '部分接收' || recyclingStatus == '待接收')) {
+			} else if (tousseTypeisForeignTousseDefinition == true && (recyclingStatus == '部分接收' || recyclingStatus == '待接收' || recyclingStatus == '待回收')) {
 				dialogConfirm("还有部分器械包未装入篮筐，是否继续保存？", function () {
 					if (sstsConfig.showRecyclingDetail && recyclingTousses.length > 0) {
 						showRecyclingDetail(recyclingTousses, function () {
@@ -7020,7 +7020,7 @@
 			if (application != null) {
 				$("#recyclingApplicationId").val(application.id);
 				$("#invoicePlanVersion").val(application.version);
-				$("#recyclingStatus").val(application.packageStatus);
+				$("#recyclingStatus").val(application.recyclingStatus);
 				var recordType = application.type;
 				if (recordType == '自定义器械包申请单') {
 					$('#add-bao').hide();
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r34132 -r34767
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 34132)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 34767)
@@ -4329,6 +4329,10 @@
 									var invoiceAmount = voItems[i].invoiceAmount;
 									var urgentAmountData = voItems[i].urgentAmount;
 									var urgentLevelData	 = voItems[i].urgentLevel;
+									var packageStatus	 = voItems[i].packageStatus;
+									if(packageStatus == 'null'){
+										packageStatus = '';
+									}
 									
 									if(record.data['type'] == '借物单'){
 										BorrowName = "<td width='70px' align='center'><h3>已还数量</h3></td>";
@@ -4337,10 +4341,12 @@
 									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>" +
 												"<td width='70px' align='center'><h3>拆包数量</h3></td>";
 										ForeignContent = 
 												"<td align='center'>" + voItems[i].supplierName+"</td>" +
+												"<td align='center'>" + packageStatus+"</td>" +
 												"<td align='center'>" + voItems[i].doctor+"</td>" +
 												"<td align='center'>" + voItems[i].splitAmount+"</td>";
 									}