Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r35782 -r36390
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 35782)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 36390)
@@ -257,7 +257,7 @@
 }
 
 //确认归还：0，提前归还：1，批量确认归还：2，批量提前归还：3
-function returnFunction(actionType,id,handleDepartCoding,supplierContactName){
+function returnFunction(actionType,id,handleDepartCoding,supplierContactName,supplierName){
 	if(top.Ext4.getCmp("handleDepartCoding")) {
 		handleDepartCoding = top.Ext4.getCmp("handleDepartCoding").getValue() || '';
 	}
@@ -279,7 +279,7 @@
 	var returnManStore = new Ext4.data.Store({
 		proxy : {
 			type : 'ajax',
-			url : WWWROOT + '/systemmanage/user/loadUserByOrgId!loadUserByDepartmentCode.do',
+			url : WWWROOT + '/systemmanage/user/loadUserByDepartmentCode!loadUserByDepartmentCode.do',
 			reader : {
 				root : 'data'
 			},
@@ -407,6 +407,22 @@
 			}
 		},{
 			columnWidth : 1,
+			defaultType : 'textfield',
+			border : false,
+			layout : 'form',
+			anchor : "90%",
+			bodyStyle: 'background:transparent;',
+			hidden:(supplierName == undefined || supplierName == 'undefined'),
+			items : {
+				fieldLabel : '供应商',
+				id : 'supplierName1',
+				name : 'supplierName1',
+				allowBlank : true,
+				value:supplierName,
+				disabled:true
+			}
+		},{
+			columnWidth : 1,
 			defaultType : 'combo',
 			border : false,
 			layout : 'form',
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r35713 -r36390
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 35713)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 36390)
@@ -515,7 +515,7 @@
 					showResult('您选择了多家外来器械供应室的申请单,只能选择一家供应商的申请单进行批量归还');
 					return
 				}
-				returnFunction(2,'',records[0].data.handleDepartCoding,records[0].data.supplierContactName);
+				returnFunction(2,'',records[0].data.handleDepartCoding,records[0].data.supplierContactName,records[0].data.supplierName);
 			}else {
 				comfirmReturnOrEarlyReturn(ACTION_TYPE_CONFIRM_RETURN);
 			}
@@ -554,7 +554,7 @@
 					showResult('您选择了多家外来器械供应室的申请单,只能选择一家供应商的申请单进行批量归还');
 					return
 				}
-				returnFunction(3,'',records[0].data.handleDepartCoding,records[0].data.supplierContactName);
+				returnFunction(3,'',records[0].data.handleDepartCoding,records[0].data.supplierContactName,records[0].data.supplierName);
 			}else {
 				comfirmReturnOrEarlyReturn(ACTION_TYPE_EARLY_RETURN);
 			}