Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp
===================================================================
diff -u -r29513 -r31651
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp	(.../instrumentRoomGoodsManagement.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp	(.../instrumentRoomGoodsManagement.jsp)	(revision 31651)
@@ -27,7 +27,6 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/TousseInstanceTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="invoicePrint.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js?version=${svnRevision}"></script>
 
 <!-- 日期控件引入 -->
@@ -41,7 +40,6 @@
 <script type="text/javascript">
 var supplier = '<%=Supplier.SUPPLIER_TYPE_SUPPLIER%>';//供货单位
 </script>
-<script type="text/javascript" src="materialEntryView.js?version=${svnRevision}"></script>
 <script type="text/javascript">
 var curUserName = '${userName}';
 
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js
===================================================================
diff -u -r23322 -r31651
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js	(.../instrumentRoomGoodsManagement.js)	(revision 23322)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js	(.../instrumentRoomGoodsManagement.js)	(revision 31651)
@@ -285,6 +285,11 @@
 	editRecord(data['id'],data['committedStatus']);
 }
 
+function returnUrl(operation){
+	var url = WWWROOT+'/disinfectsystem/toussemanager/position/changePosition.jsp?editMode=true&operation='+encodeURIComponent(operation);
+	document.location.href = url;
+}
+
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	
@@ -350,24 +355,21 @@
 		hidden : !SSTS_InstrumentGoodsManagement,
 		iconCls : 'btn_ext_application_add',
 		handler : function() {
-			var url = WWWROOT+'/disinfectsystem/toussemanager/position/changePosition.jsp?editMode=true&operation=发货';
-			document.location.href = url;
+			returnUrl('发货');
 		}
 	},'-', {
 		text : '器械包签收',
 		hidden : !SSTS_InstrumentGoodsManagement,
 		iconCls : 'btn_ext_application_add',
 		handler : function() {
-			var url = WWWROOT+'/disinfectsystem/toussemanager/position/changePosition.jsp?editMode=true&operation=签收';
-			document.location.href = url;
+			returnUrl('签收');
 		}
 	},'-', {
 		text : '器械包回退',
 		hidden : !SSTS_InstrumentGoodsManagement,
 		iconCls : 'btn_ext_application_add',
 		handler : function() {
-			var url = WWWROOT+'/disinfectsystem/toussemanager/position/changePosition.jsp?editMode=true&operation=回退';
-			document.location.href = url;
+			returnUrl('回退');
 		}
 	}];