Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r36455 -r36530
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 36455)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 36530)
@@ -1063,9 +1063,18 @@
 	if(actionType == ACTION_TYPE_CONFIRM_RETURN || actionType == ACTION_TYPE_EARLY_RETURN){
 		if(selNodes.length > 0){
 			var idsArr = [];
+			var supplierNameArr = [];
 			for(var i=0;i<selNodes.length;i++){
 				idsArr[i] = selNodes[i].get('id');
+				var supplierName = selNodes[i].data.supplierName;
+				if(supplierNameArr.indexOf(supplierName) == -1){
+					supplierNameArr.push(supplierName)
+				}
 			}
+			if(supplierNameArr.length > 1){
+				showResult('请选择同一供应商的外来器械进行归还！');
+				return
+			}
 			ids = idsArr.join(';');
 		}else {
 			showResult('请先勾选需要归还的器械包后再进行操作');