Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r17660 -r17724
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 17660)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 17724)
@@ -716,6 +716,12 @@
 
 }
 
+function addReturnDisposableGoodsByInvoicePlan(invoicePlanId){
+	document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.jsp?invoicePlanId='+invoicePlanId;
+}
+function addReturnTousseByInvoicePlan(invoicePlanId){
+	document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.jsp?invoicePlanId='+invoicePlanId;
+}
 /**
  * 重新设置一次性物品节点的值
  * @param targetNode 对应的节点
@@ -3830,11 +3836,13 @@
 	     {header : "拼音码",width : 120 * fontSizeScale,dataIndex : 'spelling',hidden:true}, 
 	     {header : "五笔码",width : 120 * fontSizeScale,dataIndex : 'wbCode',hidden:true}, 
 	     {header: "发货单状态", dataIndex: 'invoiceStatus',hidden:true},
-	     {header : "操作",width : 175 * fontSizeScale,renderer: function(v,p,record){
+	     {header : "操作",width : 420 * fontSizeScale,renderer: function(v,p,record){
     	    	 var invoiceStatus = record.data.invoiceStatus;
     	    	 var deliverStatus = record.data.deliverStatus;
     	    	 var inoviceButton = "";
     	    	 var returnButton = "";
+    	    	 var returnGoodsButton = ""; 
+    	    	 var viewReturnGoodsButton = "";
     	    	 // 未提交或者待发货的单，不显示签收以及查看发货单按钮
     	    	 if (record.data.committedStatus == '' || deliverStatus == '待发货'){
     	    		 return "";
@@ -3853,6 +3861,13 @@
         	    		 inoviceButton = "<input type=\"button\" value=\"查看发货单\" onclick=\"searchInvoice('"+record.data.id+"')\">";
         	    	 }
     	    	 }
+    	    	 if(deliverStatus == '已发货' || deliverStatus == '部分发货' || invoiceStatus == '部分签收' || invoiceStatus == '已签收'){
+    	    		 returnGoodsButton += "<input type=\"button\" value=\"一次性物品退货\" onclick=\"addReturnDisposableGoodsByInvoicePlan('"+record.data.id+"')\">";
+    	    		 returnGoodsButton += "<input type=\"button\" value=\"器械包退货\" onclick=\"addReturnTousseByInvoicePlan('"+record.data.id+"')\">";
+    	    	 }
+    	    	 if(record.data.returnedGoods == '是'){
+    	    		 viewReturnGoodsButton = "<input type=\"button\" value=\"查看退货记录\" onclick=\"searchReturnGoodsRecord('"+record.data.id+"')\">";
+    	    	 }
     	    	 
     	    	 var departCoding = $Id('departCoding').value;  //用户的当前科室科室编码
     	    	 var handleDepartCoding = record.data.handleDepartCoding;  //处理科室的科室编码
@@ -3862,7 +3877,7 @@
     	    			 && (returnStatusArr[0] == record.data.returnStatus || returnStatusArr[1] == record.data.returnStatus)){
         			 returnButton = "<input type=\"button\" value=\"归还物品\" onclick=\"createReturnApplication("+record.data.id+")\" >";
         		 }
-    	    	 return inoviceButton+returnButton;
+    	    	 return inoviceButton+returnButton+returnGoodsButton+viewReturnGoodsButton;
          	 }
 	     },
 	     {header : "预回收人",width : 65 * fontSizeScale,dataIndex : 'prepareRecycleOperator',hidden : sstsConfig.hiddenRecyclingPeople},
@@ -3900,6 +3915,7 @@
 	     {name : 'prepareRecycleComfirmor'},
 	     {name : 'prepareRecycleDateTime'},
 	     {name : 'recyclingTime'},
+	     {name : 'returnedGoods'},
 	     {name : 'handleDepartCoding'}
 	];