Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp
===================================================================
diff -u -r35435 -r38494
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp	(.../tousseGoodsWarningView.jsp)	(revision 35435)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp	(.../tousseGoodsWarningView.jsp)	(revision 38494)
@@ -103,13 +103,15 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/TousseInstanceTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/BarcodeTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/extUtils.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="tousseGoodsWarningView.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/packing/tousesPackingTeachingImage.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/ContainerTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/InvoiceTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/SupplyRoomConfigTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectForm.js?version=${svnRevision}"></script>
 
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css?version=${svnRevision}"></link>
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
===================================================================
diff -u -r37124 -r38494
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 37124)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 38494)
@@ -758,6 +758,25 @@
         hidden:System_TousseGoods_delete,
         handler: function(){printTousseGoods(grid)}
     },'-',{
+		text : '返销',
+		iconCls : 'btn_ext_returnDisinfect',
+		handler : function(){
+			var records = grid.getSelectionModel().getSelections();
+
+			if (records.length == 0) {
+				showResult("请选择要返销的器械包。");
+				return false;
+			}
+
+			var obj = {
+				orgUnitName:orgUnitName,
+				userName:userName,
+				records:records
+			}
+
+			addTousseReturnDisinfect('', obj);
+		}
+	},'-',{
 		text : '导出',
 		iconCls : 'btn_ext_download',
 		handler : function(){exportExcel(grid)}
Index: ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
===================================================================
diff -u -r36828 -r38494
--- ssts-web/src/main/webapp/ext/fontSize12/styles/common.css	(.../common.css)	(revision 36828)
+++ ssts-web/src/main/webapp/ext/fontSize12/styles/common.css	(.../common.css)	(revision 38494)
@@ -280,6 +280,9 @@
 .btn_ext_delete {
     background-image:url( ../resources/images/default/dd/btn_delete.gif ) !important;
 }
+.btn_ext_close {
+    background-image:url( ../../../images/garbage.gif ) !important;
+}
 .btn_ext_edit {
     background-image:url( ../../../images/edit.gif ) !important;
 }
@@ -298,6 +301,9 @@
 .btn_ext_add_foreignTousse {
     background-image:url( ../../../images/web/package2.png) !important;
 }
+.btn_ext_returnDisinfect {
+    background-image:url( ../../../images/web/returnDisinfect.png ) !important;
+}
 .btn_ext_yes {
     background-image:url( ../resources/images/default/dd/drop-yes.gif ) !important;
 }
Index: ssts-web/src/main/webapp/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectForm.js
===================================================================
diff -u -r34482 -r38494
--- ssts-web/src/main/webapp/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectForm.js	(.../tousseReturnDisinfectForm.js)	(revision 34482)
+++ ssts-web/src/main/webapp/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectForm.js	(.../tousseReturnDisinfectForm.js)	(revision 38494)
@@ -143,11 +143,10 @@
  * 如果点击添加按钮，则传过来的ID为空
  * 
  * @param id
- * @param status
- *            审核状态
+ * @param tousseObj //NYSY-65：器械包
  * @return
  */
-function addTousseReturnDisinfect(id, status) {
+function addTousseReturnDisinfect(id, tousseObj) {
 	tousseInstanceStore.removeAll();
 	var tbar;
 	var saveBtn = {
@@ -259,7 +258,7 @@
 				xtype : 'hidden',
 				name : 'orgUnitCoding',
 				id : 'orgUnitCoding',
-				value : $Id("currentOrgUnitCode").value
+				value : $Id("currentOrgUnitCode") ? $Id("currentOrgUnitCode").value : ''
 			}, {
 				layout : 'form',
 				columnWidth : .33,
@@ -269,7 +268,7 @@
 					id : 'orgUnitName',
 					name : 'orgUnitName',
 					allowBlank : false,
-					value : $Id('currentOrgUnitName').value,
+					value : $Id('currentOrgUnitName') ? $Id('currentOrgUnitName').value : '',
 					readOnly : true,
 					anchor : '96%'
 				}]
@@ -282,7 +281,7 @@
 					maxLength : '100',
 					id : 'operateUser',
 					name : 'operateUser',
-					value : $Id('userName').value,
+					value : $Id('userName') ? $Id('userName').value : '',
 					readOnly : true,
 					anchor : '96%'
 				}]
@@ -324,9 +323,8 @@
 				id : 'tousseInstanceGrid',
 				store : tousseInstanceStore,
 				cm : tousseCm,
-				height : 265,
+				height : 325,
 				width:640,
-				autoHeight : true,
 				autoExpandColumn : 'tousseName',
 				frame : false,
 				viewConfig: {
@@ -399,9 +397,27 @@
 			}
 		});
 	} else {// 添加
-		top.Ext.getCmp('operateUser').setValue($Id('userName').value);
-		top.Ext.getCmp('orgUnitName').setValue($Id('currentOrgUnitName').value);
-		top.Ext.getCmp('operateDate').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i'));
+		if($Id('userName')){
+			top.Ext.getCmp('operateUser').setValue($Id('userName').value);
+			top.Ext.getCmp('orgUnitName').setValue($Id('currentOrgUnitName').value);
+			top.Ext.getCmp('operateDate').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i'));
+		}
+		if(tousseObj){
+			top.Ext.getCmp('operateUser').setValue(tousseObj.userName);
+			top.Ext.getCmp('orgUnitName').setValue(tousseObj.orgUnitName);
+			top.Ext.getCmp('operateDate').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i'));
+			if(tousseObj.records && tousseObj.records.length > 0){
+				for(var i=0;i<tousseObj.records.length;i++){
+					var record = new addTousseInstance({
+						id : tousseObj.records[i].data.id,
+						barcode : tousseObj.records[i].data.barcode || '',
+						amount : 1,
+						tousseName : tousseObj.records[i].data.tousseName || ''
+					});
+					tousseInstanceStore.add(record);
+				}
+			}
+		}
 	}
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectView.js
===================================================================
diff -u -r34482 -r38494
--- ssts-web/src/main/webapp/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectView.js	(.../tousseReturnDisinfectView.js)	(revision 34482)
+++ ssts-web/src/main/webapp/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectView.js	(.../tousseReturnDisinfectView.js)	(revision 38494)
@@ -2,7 +2,7 @@
 var grid;
 
 function newTousseReturnDisinfect(){
-	addTousseReturnDisinfect('', '');
+	addTousseReturnDisinfect('');
 }
 
 
@@ -12,8 +12,7 @@
  */
 function renderCallModifyFunction(v, p, record) {
 	var data = record.data;
-	return "<a href=\"#\" onclick=\"addTousseReturnDisinfect(" + data['id'] + ",'"
-			+ data['status'] + "');return false;\">" + v + "</a>";
+	return "<a href=\"#\" onclick=\"addTousseReturnDisinfect(" + data['id'] + ");return false;\">" + v + "</a>";
 }
 
 Ext.onReady(function() {