Index: ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
===================================================================
diff -u -r35838 -r35891
--- ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 35838)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 35891)
@@ -1153,38 +1153,53 @@
 
 var selectedUserecordObject;
 function openUserecordWindow(currentElement){
-	var arg = {'departCoding':top.Ext.getCmp('departCoding').getValue(),'depart':top.Ext.getCmp('depart').getValue()}; //要传进去的其他参数
-    arg.win = window; //把当前窗口的引用当参数传进去
-    selectedUserecordObject = window.showModalDialog(WWWROOT+'/disinfectsystem/invoice/selectUserecordWindowView.jsp', arg, 'dialogWidth:1000px;dialogHeight:600px;center:yes;help:no');
-    if(selectedUserecordObject){
-    	var selectedUserecordJsonObject = Ext.decode(selectedUserecordObject);
-    	if(selectedUserecordJsonObject){
-    		if(selectedUserecordJsonObject.id){
-    			top.Ext.getCmp("userecordId").setValue(selectedUserecordJsonObject.id);
-    		}
-    		
-    		var showText = "";
-    		//id:" + d.data.id + ",patientName:'" + d.data.patientName + "',hospitalNum:'" + d.data.hospitalNum + "',treatmentNum:'" + d.data.treatmentNum + "'
-    		if(selectedUserecordJsonObject.patientName){
-    			showText += "病人名:" + selectedUserecordJsonObject.patientName + ";";
-    		}
-    		if(selectedUserecordJsonObject.hospitalNum){
-    			showText += "住院号:" + selectedUserecordJsonObject.hospitalNum + ";";
-    		}
-    		if(selectedUserecordJsonObject.treatmentNum){
-    			showText += "诊疗号:" + selectedUserecordJsonObject.treatmentNum + ";";
-    		}
-    		if(showText != ''){
-    			var extElementId = currentElement.id;
-    			top.Ext.getCmp(extElementId).setValue(showText);
-    			//document.getElementById(extElementId).value = showText;
-    		}
-    	}
-    }else{
-    	top.Ext.getCmp("userecordId").setValue("");
-    	top.Ext.getCmp("userecordName").setValue("");
+	var param = {
+		'departCoding':top.Ext.getCmp('departCoding').getValue(),
+		'depart':top.Ext.getCmp('depart').getValue()
+	};
+   
+	var selectedUserecordObject = openModalWindowForExt(WWWROOT+'/disinfectsystem/invoice/selectUserecordWindowView.jsp',param,'使用记录列表', "1000", "600");
+	var codes ='';
+	if(selectedUserecordObject == undefined){
+    	return;
+    }else {
+    	var loop = setInterval(function() {
+              if(selectedUserecordObject.hidden) {
+                clearInterval(loop);
+
+               	codes = '';
+		    	var tem ='';
+		    	var returnValue = selectedUserecordObject.returnValue || {};
+				if(returnValue){
+					var selectedUserecordJsonObject = Ext.decode(returnValue);
+					if(selectedUserecordJsonObject){
+						if(selectedUserecordJsonObject.id){
+							top.Ext.getCmp("userecordId").setValue(selectedUserecordJsonObject.id);
+						}
+						
+						var showText = "";
+						//id:" + d.data.id + ",patientName:'" + d.data.patientName + "',hospitalNum:'" + d.data.hospitalNum + "',treatmentNum:'" + d.data.treatmentNum + "'
+						if(selectedUserecordJsonObject.patientName){
+							showText += "病人名:" + selectedUserecordJsonObject.patientName + ";";
+						}
+						if(selectedUserecordJsonObject.hospitalNum){
+							showText += "住院号:" + selectedUserecordJsonObject.hospitalNum + ";";
+						}
+						if(selectedUserecordJsonObject.treatmentNum){
+							showText += "诊疗号:" + selectedUserecordJsonObject.treatmentNum + ";";
+						}
+						if(showText != ''){
+							var extElementId = currentElement.id;
+							top.Ext.getCmp(extElementId).setValue(showText);
+						}
+					}
+				}else{
+					top.Ext.getCmp("userecordId").setValue("");
+					top.Ext.getCmp("userecordName").setValue("");
+				}
+              }
+        },500);
     }
-    
 }
 function initQueryValueAndReload() {
 	var departSearch = Ext.getCmp('departSearch').getValue();
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/selectUserecordWindowView.jsp
===================================================================
diff -u -r29513 -r35891
--- ssts-web/src/main/webapp/disinfectsystem/invoice/selectUserecordWindowView.jsp	(.../selectUserecordWindowView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/selectUserecordWindowView.jsp	(.../selectUserecordWindowView.jsp)	(revision 35891)
@@ -28,20 +28,44 @@
 <script type="text/javascript">
 Ext.onReady(function() {
 	Ext.QuickTips.init();
+	var search = window.location.search || '';
+	var departCoding;
+	var depart;
+	var userecordId;
+	function getQueryVariable(variable){
+		var search = decodeURI(window.location.search);
+		var query = search.substring(1);
+		var vars = query.split("&");
+		for (var i=0;i<vars.length;i++) {
+			var pair = vars[i].split("=");
+			if(pair[0] == variable){
+				return pair[1];
+			}
+		}
+		return(false);
+	}
+
+	if(search !== ''){
+		departCoding = getQueryVariable('departCoding');
+		depart = getQueryVariable('depart');
+		selectedUserecordId = getQueryVariable('userecordId');
+	}else {
+		departCoding = window.dialogArguments.departCoding;
+		depart = window.dialogArguments.depart;
+		selectedUserecordId = window.dialogArguments.userecordId;
+	}
+
 	//传过来的科室编码
-	var departCoding = window.dialogArguments.departCoding;
 	if(departCoding && departCoding != null){
 		//去掉科室的条件
 		//document.getElementById('parm_s_departCoding').value = departCoding;
 	}
-	
-	var depart = window.dialogArguments.depart;
+
 	if(depart){
 		//document.title = "【" + depart + "】已审核与已申请的使用记录";
 		document.title = "已审核与已申请的使用记录"
 	}
 	//已选中的使用记录id//checkboxSelectionModel : 'singleSelect',
-	var selectedUserecordId = window.dialogArguments.userecordId;
 	var columns = [
        	    {header : "病人",width : 70,dataIndex : 'patientName'},
        	    {header : "住院号",width : 90,dataIndex : 'hospitalNum'},
@@ -102,13 +126,16 @@
        				return false;
        			}
        			var d = records[0];
-       			window.returnValue = "{id:" + d.data.id + ",patientName:'" + d.data.patientName + "',hospitalNum:'" + d.data.hospitalNum + "',treatmentNum:'" + d.data.treatmentNum + "'}";
-       			try{
-       				//防止窗口关闭发生异常导致报错
-	       			window.close();
-       			}catch(e){
-       				
-       			}
+       			var returnVal = "{id:" + d.data.id + ",patientName:'" + d.data.patientName + "',hospitalNum:'" + d.data.hospitalNum + "',treatmentNum:'" + d.data.treatmentNum + "'}";
+       			if(parent.Ext){
+					var win = parent.Ext.getCmp('extWindow');
+					win.returnValue = returnVal;
+					win.close();
+				}else {
+					self.returnValue = returnVal;
+					self.hidden = true;
+					self.close();
+				}
        		}
        	}, '-', {
        		text : '取消',
@@ -127,7 +154,6 @@
        		tbar : tbar,
        		pageSize : 20,
        		defaultSortField : 'statusSequence',
-       		title : '使用记录列表',
        		defaultSortDirection : 'ASC,enteringDate DESC',
        		isCheckboxSelectionModel : true,
        		rememberSelected : false,
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.jsp
===================================================================
diff -u -r29513 -r35891
--- ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.jsp	(.../materialInvoiceView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.jsp	(.../materialInvoiceView.jsp)	(revision 35891)
@@ -42,7 +42,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}';
 var SSTS_Invoice_Update = true;