Index: ssts-web/src/main/webapp/disinfectsystem/invoice/selectUserecordWindowView.jsp
===================================================================
diff -u -r35891 -r35892
--- ssts-web/src/main/webapp/disinfectsystem/invoice/selectUserecordWindowView.jsp	(.../selectUserecordWindowView.jsp)	(revision 35891)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/selectUserecordWindowView.jsp	(.../selectUserecordWindowView.jsp)	(revision 35892)
@@ -118,11 +118,11 @@
        		handler : function() {
        			var records = userecordGrid.getSelectionModel().getSelections();
        			if (records.length == 0) {
-       				showResult("请选择使用记录！");
+					showResultWithoutSpeakCurPage("请选择使用记录！");
        				return false;
        			}
        			if (records.length > 1) {
-       				showResult("只能选择一条使用记录！");
+					showResultWithoutSpeakCurPage("只能选择一条使用记录！");
        				return false;
        			}
        			var d = records[0];
@@ -142,7 +142,13 @@
        		iconCls : 'btn_ext_application_edit',
        		id : 'editTbar',
        		handler : function() {
-       			window.close();
+				if(parent.Ext){
+					var win = parent.Ext.getCmp('extWindow');
+					win.close();
+				}else {
+					self.hidden = true;
+					self.close();
+				}
        		}
        	}];
        	var dwrCallParams = null;
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
===================================================================
diff -u -r35891 -r35892
--- ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 35891)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 35892)
@@ -1169,7 +1169,7 @@
 
                	codes = '';
 		    	var tem ='';
-		    	var returnValue = selectedUserecordObject.returnValue || {};
+		    	var returnValue = selectedUserecordObject.returnValue;
 				if(returnValue){
 					var selectedUserecordJsonObject = Ext.decode(returnValue);
 					if(selectedUserecordJsonObject){