Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r16769 -r16835
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 16769)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 16835)
@@ -3775,7 +3775,13 @@
         	    		 inoviceButton = "<input type=\"button\" value=\"查看发货单\" onclick=\"searchInvoice('"+record.data.id+"')\">";
         	    	 }
     	    	 }
-    	    	 if(record.data.departCoding == $Id('departCoding').value && (record.data.deliverStatus == statusArr[1] || record.data.deliverStatus == statusArr[2]) && (returnStatusArr[0] == record.data.returnStatus || returnStatusArr[1] == record.data.returnStatus)){
+    	    	 
+    	    	 var departCoding = $Id('departCoding').value;  //用户的当前科室科室编码
+    	    	 var handleDepartCoding = record.data.handleDepartCoding;  //处理科室的科室编码
+    	    	 
+    	    	 if((record.data.departCoding == departCoding || (sstsConfig.allowInsteadReturn && insteadReturn && handleDepartCoding == departCoding)) 
+    	    			 && (record.data.deliverStatus == statusArr[1] || record.data.deliverStatus == statusArr[2]) 
+    	    			 && (returnStatusArr[0] == record.data.returnStatus || returnStatusArr[1] == record.data.returnStatus)){
         			 returnButton = "<input type=\"button\" value=\"归还物品\" onclick=\"createReturnApplication("+record.data.id+")\" >";
         		 }
     	    	 return inoviceButton+returnButton;
@@ -3816,6 +3822,7 @@
 	     {name : 'prepareRecycleComfirmor'},
 	     {name : 'prepareRecycleDateTime'},
 	     {name : 'recyclingTime'},
+	     {name : 'handleDepartCoding'}
 	];
 	
 	var filters = new Ext.grid.GridFilters({