Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r30256 -r30290
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 30256)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 30290)
@@ -191,7 +191,7 @@
 }
 
 //确认归还：0，提前归还：1，批量确认归还：2，批量提前归还：3
-function returnFunction(actionType,id,handleDepartCoding){
+function returnFunction(actionType,id,handleDepartCoding,supplierContactName){
 	if(top.Ext4.getCmp("handleDepartCoding")) {
 		handleDepartCoding = top.Ext4.getCmp("handleDepartCoding").getValue() || '';
 	}
@@ -364,6 +364,7 @@
 				typeAhead : false,
 				allowBlank : true,
 				forceSelection:false,
+				value:supplierContactName,
 				store : supplierContactStore
 			}
 		}]
@@ -406,7 +407,12 @@
 			handler : function() {
 				tmpWindow.close();
 			}
-		}]
+		}],
+		listeners:{
+			render:function () {
+				top.Ext4.getCmp('returneeOfSupplier1').setValue(supplierContactName);
+			}
+		}
 	});
 	tmpWindow.show();
 }
@@ -1812,7 +1818,8 @@
 			disabled : disableReturn,
 			handler : function(){
 				if(sstsConfig.enableReturneeOfForeignTousseSupplier){
-					returnFunction(0,id);
+					var supplierContactName = top.Ext4.getCmp('supplierContactName').getValue() || '';
+					returnFunction(0,id,'',supplierContactName);
 				}else {
 					var tmpWindow = new top.Ext4.window.Window({
 						title : '请确认',
@@ -1848,7 +1855,8 @@
 			disabled:disableEarlyReturn,
 			handler : function(){
 				if(sstsConfig.enableReturneeOfForeignTousseSupplier){
-					returnFunction(1,id);
+					var supplierContactName = top.Ext4.getCmp('supplierContactName').getValue() || '';
+					returnFunction(1,id,'',supplierContactName);
 				}else {
 					var tmpWindow = new top.Ext4.window.Window({
 						title : '请确认',
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r30244 -r30290
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 30244)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 30290)
@@ -288,7 +288,8 @@
 	     {name : 'remark'},
 		 {name : 'urgencyNum'},
 		 {name : 'handleDepartCoding'},
-	     {name : 'handleDepart'}
+		 {name : 'handleDepart'},
+		 {name : 'supplierContactName'}
 	];
 	
 	var filters = new Ext.grid.GridFilters({
@@ -368,9 +369,8 @@
 				showResult('您选择了多家外来器械供应室的申请单,只能选择一家供应商的申请单进行批量归还');
 				return
 			}
-
 			if(sstsConfig.enableReturneeOfForeignTousseSupplier){
-				returnFunction(3,'',records[0].data.handleDepartCoding);
+				returnFunction(3,'',records[0].data.handleDepartCoding,records[0].data.supplierContactName);
 			}else {
 				comfirmReturnOrEarlyReturn(actionType_confirmReturn);
 			}
@@ -402,7 +402,7 @@
 			}
 
 			if(sstsConfig.enableReturneeOfForeignTousseSupplier){
-				returnFunction(3,'',records[0].data.handleDepartCoding);
+				returnFunction(3,'',records[0].data.handleDepartCoding,records[0].data.supplierContactName);
 			}else {
 				comfirmReturnOrEarlyReturn(ACTION_TYPE_EARLY_RETURN);
 			}