Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
===================================================================
diff -u -r18360 -r20258
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 18360)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 20258)
@@ -478,6 +478,13 @@
 		handler : function() {
 			auditAndConvertBtnClicked(grid);
 		}
+	},{
+		text : '合并转换申请单',
+		hidden : SSTS_UseRecord_MergeConvert,
+		iconCls : 'btn_ext_refresh',
+		handler : function() {
+			auditAndConvertBtnClicked(grid);
+		}
 	},{id:'formSubmitResult',xtype:'hidden',value:formSubmitResultInit} ];
 	var dwrCallParams = null;