Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r18082 -r18102
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 18082)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 18102)
@@ -111,6 +111,10 @@
 	}
 }
 
+function addReturnTousseByInvoice(invoiceId){
+	document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.jsp?invoiceId='+invoiceId;
+}
+
 // 发货时扫描的器械包
 var tousseInstanceStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
@@ -872,61 +876,10 @@
 						printInvoiceLocal(0,type,id);
 					}
 				},{
-					text : '保存',
-					id : 'saveButton',
-					hidden:true,
+					text : '器械包退货',
 					handler : function() {
-						if (!form.getForm().isValid()) {
-							showResult('请正确填写表单各值');
-							return false;
-						}
-						// 并发
-						var pass = true;
-						DWREngine.setAsync(false);
-						InvoiceTableManager.getInvoiceStatus(id,
-							function(status) {
-								if (status != null) {
-									var currentStatus = top.Ext.getCmp('status').getValue();
-									if (status == invoiceStatusYes
-											&& currentStatus == invoiceStatusNo) {
-										showResult("此发货单已发货！");
-										pass = false;
-									}
-								}
-							});
-						DWREngine.setAsync(true);
-						if (!pass) {
-							return false;
-							window.close();
-						}
-						var b = validTousseGridData();
-						if (!b) {
-							return false;
-						}
-						var bool = validGridAmount();
-						if (!b) {
-							return false;
-						}
-						getTousseGridData();
-						getRecyclingapplicationStoreData();
-						var totalPrice = getTotalPrice(type);
-						form.form.submit({
-							url : WWWROOT
-									+ '/disinfectSystem/invoiceAction!saveInvoice.do?totalPrice='
-									+ totalPrice,
-							method : 'POST',
-							waitMsg : '正在保存数据，请稍候',
-							waitTitle : '提交表单',
-							success : function(form, action) {
-								window.close();
-								showResult(action.result.message);
-								grid.dwrReload();
-
-							},
-							failure : function(form, action) {
-								showResult(action.result.msg);
-							}
-						});
+						window.close();
+						addReturnTousseByInvoice(id);
 					}
 				}, {
 					text : '取消',