Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r35018 -r35094
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 35018)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 35094)
@@ -457,9 +457,9 @@
 					return
 				}
 				if(actionType == 0 || actionType == 1){
-					checkAndsubmintForeignTousseForm(id,false,false,actionType_confirmReturn);
+					checkAndsubmintForeignTousseForm(id,false,false,ACTION_TYPE_CONFIRM_RETURN);
 				}else if(actionType == 2){
-					comfirmReturnOrEarlyReturn(actionType_confirmReturn);
+					comfirmReturnOrEarlyReturn(ACTION_TYPE_CONFIRM_RETURN);
 				}else if(actionType == 3){
 					comfirmReturnOrEarlyReturn(ACTION_TYPE_EARLY_RETURN);
 				}
@@ -1035,7 +1035,7 @@
 	var tree = top.Ext4.getCmp('foreignTousseTreeGridForm');
 	var selNodes = tree.getView().getChecked();
 	var ids = '';
-	if(actionType == actionType_confirmReturn || actionType == ACTION_TYPE_EARLY_RETURN){
+	if(actionType == ACTION_TYPE_CONFIRM_RETURN || actionType == ACTION_TYPE_EARLY_RETURN){
 		if(selNodes.length > 0){
 			var idsArr = [];
 			for(var i=0;i<selNodes.length;i++){
@@ -2009,7 +2009,7 @@
 								}
 								var success = getForeignTousseInfo();
 								if(success){
-									submintForeignTousseForm(actionType_confirmReturn, false);
+									submintForeignTousseForm(ACTION_TYPE_CONFIRM_RETURN, false);
 								}
 							}
 						},{
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r34985 -r35094
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 34985)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 35094)
@@ -460,9 +460,9 @@
 					showResult('您选择了多家外来器械供应室的申请单,只能选择一家供应商的申请单进行批量归还');
 					return
 				}
-				returnFunction(3,'',records[0].data.handleDepartCoding,records[0].data.supplierContactName);
+				returnFunction(2,'',records[0].data.handleDepartCoding,records[0].data.supplierContactName);
 			}else {
-				comfirmReturnOrEarlyReturn(actionType_confirmReturn);
+				comfirmReturnOrEarlyReturn(ACTION_TYPE_CONFIRM_RETURN);
 			}
 		}
 	}, '-', {
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r34872 -r35094
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 34872)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 35094)
@@ -121,7 +121,7 @@
 	var TYPE_SUPPLIER = encodeURIComponent('<%=Supplier.SUPPLIER_TYPE_RENTTOUSSE%>');
 	var supplyRoomCoding = '<%=request.getAttribute("supplyRoomCoding")%>';
 	
-	var actionType_confirmReturn  = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>';  //确认归还
+	var ACTION_TYPE_CONFIRM_RETURN  = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>';  //确认归还
 	var ACTION_TYPE_EARLY_RETURN  = '<%=ForeignTousseApplication.ACTION_TYPE_EARLY_RETURN%>';  //提前归还
 	var ACTION_TYPE_ADD  = '<%=ForeignTousseApplication.ACTION_TYPE_ADD%>';  //新增
 	var ACTION_TYPE_INTERFERE  = '<%=ForeignTousseApplication.ACTION_TYPE_INTERFERE%>';  //干预