Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentView.jsp
===================================================================
diff -u -r29513 -r30509
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentView.jsp	(.../invoiceDepartmentView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentView.jsp	(.../invoiceDepartmentView.jsp)	(revision 30509)
@@ -13,6 +13,7 @@
 <html>
 <head>
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>科室发货设置</title>
 </head>
@@ -22,6 +23,7 @@
 <script type="text/javascript" src="${ctx }/dwr/interface/InvoiceDepartmentTableManage.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="${ctx}/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js?version=${svnRevision}"></script>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/ext_datefield/datetime.css?version=${svnRevision}"></link>
 <script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="invoiceDepartmentView.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentForm.js
===================================================================
diff -u -r27321 -r30509
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentForm.js	(.../invoiceDepartmentForm.js)	(revision 27321)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceDepartmentForm.js	(.../invoiceDepartmentForm.js)	(revision 30509)
@@ -1,235 +1,194 @@
 var configWin;
 var formPanel;
+
 function cancel() {
 	configWin.close();
 }
-function openSelectReceiverOrganization(departNames,codes){
-	var param = {
-		allowNull:true,
-		onlyOneOrg : true,
-		resultType:'code',
-		tabType : 'orgUnit',
-		sameLevel :'yes',
-		range : 'all',
-		departNames :departNames,
-		departCodes : codes
-	};
-	var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp", param, "800", "450");
-	//org_3306;org_3219,口腔科;妇科
-	var codes ='';
 
-	if(selectedOrgUnitArray == undefined){
-    	return;
-    }else if(selectedOrgUnitArray[0] !== undefined){
-    	codes = '';
-    	var tem ='';
-
-    	var tempArray = selectedOrgUnitArray[0].split(';');
-    	for(var i=0;i<tempArray.length;i++){
-    		codes += tempArray[i]+";";
-	    }
-    	for(var j=0;j<codes.length-1;j++){
-    		tem += codes.charAt(j);
-    	}
-    	top.Ext.getCmp("departNames").setValue(selectedOrgUnitArray[1]);
-		top.Ext.getCmp("departCodes").setValue(tem);
-    }else {
-    	var loop = setInterval(function() {
-              if(selectedOrgUnitArray.closed) {
-                clearInterval(loop);
-
-		    	var returnValue = selectedOrgUnitArray.returnValue || [];
-
-		    	if(returnValue.length > 0){
-		    		codes = '';
-			    	var tem ='';
-			    	var tempArray = returnValue[0].split(';');
-			    	for(var i=0;i<tempArray.length;i++){
-			    		codes += tempArray[i]+";";
-				    }
-			    	for(var j=0;j<codes.length-1;j++){
-			    		tem += codes.charAt(j);
-			    	}
-			    	top.Ext.getCmp("departNames").setValue(returnValue[1]);
-			    	top.Ext.getCmp("departCodes").setValue(tem);
-		    	}
-              }
-        },500);
-    }
-}
-
-function editConfig(id){
+function editConfig(id) {
 	showWindow(id);
-	if(!Ext.isEmpty(id)){
-		Ext.Ajax.request({
-			url : WWWROOT + '/disinfectSystem/invoiceDepartmentAction!loadConfigData.do',
-			params : {id : id},
-			success : function(response,options){
-				var result = Ext.decode(response.responseText);
-				if(result.success && result.data){
-					top.Ext.getCmp('id').setValue(result.data.id);
-					top.Ext.getCmp('shift').setValue(result.data.shift);
-					top.Ext.getCmp('departCodes').setValue(result.data.departCodes);
-					top.Ext.getCmp('departNames').setValue(result.data.departNames);
-					
-				}else{
+	if (!Ext4.isEmpty(id)) {
+		var mask = new Ext4.LoadMask({
+			msg: '正在加载，请稍候...',
+			target: formPanel
+		});
+		mask.show();
+		Ext4.Ajax.request({
+			url: WWWROOT + '/disinfectSystem/invoiceDepartmentAction!loadConfigData.do',
+			params: { id: id },
+			success: function (response, options) {
+				mask.hide();
+				var result = Ext4.JSON.decode(response.responseText);
+				if (result.success && result.data) {
+					top.Ext4.getCmp('id').setValue(result.data.id);
+					top.Ext4.getCmp('shift').setValue(result.data.shift);
+					top.Ext4.getCmp('departCodes').setValue(result.data.departCodes);
+					top.Ext4.getCmp('departNames').setValue(result.data.departNames);
+
+				} else {
 					showResult('系统加载出错，请稍候再试');
 				}
 			},
-			failure : function(response, options) {
+			failure: function (response, options) {
+				mask.hide();
 				showResult('系统加载出错，请稍候再试');
 			}
 		});
 	}
 }
-function deleteConfig(grid){
+
+function deleteConfig(grid) {
 	var selectedRecords = grid.getSelectionModel().getSelections();
 	var selectedCount = grid.getSelectionModel().getCount();
 	var ids = "";
-	if(selectedCount < 1){
+	if (selectedCount < 1) {
 		showResult("请选择要删除的行");
-	}else{
-		for ( var i = 0, len = selectedRecords.length; i < len; i++) {
+	} else {
+		for (var i = 0, len = selectedRecords.length; i < len; i++) {
 			if (ids == "") {
 				ids = selectedRecords[i].data['id'];
 			} else {
 				ids = ids + ';' + selectedRecords[i].data['id'];
 			}
 		}
-		Ext.MessageBox.confirm("请确认","确定要删除选中的信息吗？",
-				function(button, text) {
-					if ("yes" == button){
-						Ext.Ajax.request({
-							url : WWWROOT + '/disinfectSystem/invoiceDepartmentAction!deleteInvoiceDepartment.do',
-							params : {ids : ids},
-							success : function(response, options) {
-								var result = Ext.decode(response.responseText);
-								var success = result.success;
-								if (true != success) {
-									showResult("删除失败");
-									return;
-								} else {
-									showResult('删除成功!');
-									grid.dwrReload();
-								}
-							},
-							failure : function(response, options) {
-								showResult("删除失败");
-							}
-						});
+		Ext4.MessageBox.confirm("请确认", "确定要删除选中的信息吗？", function (button, text) {
+			if ("yes" == button) {
+				Ext4.Ajax.request({
+					url: WWWROOT + '/disinfectSystem/invoiceDepartmentAction!deleteInvoiceDepartment.do',
+					params: { ids: ids },
+					success: function (response, options) {
+						var result = Ext4.JSON.decode(response.responseText);
+						var success = result.success;
+						if (true != success) {
+							showResult("删除失败");
+							return;
+						} else {
+							showResult('删除成功!');
+							grid.dwrReload();
+						}
+					},
+					failure: function (response, options) {
+						showResult("删除失败");
 					}
 				});
+			}
+		});
 	}
 }
 
-function saveConfig(){
-	formPanel.getForm().submit({
-		url : WWWROOT + '/disinfectSystem/invoiceDepartmentAction!saveInvoiceDepartment.do',
-		method : 'POST',
-		waitMsg : '正在保存数据，请稍候',
-		waitTitle : '提交表单',
-		success : function(form, action) {
+function saveConfig() {
+	formPanel.form.submit({
+		url: WWWROOT + '/disinfectSystem/invoiceDepartmentAction!saveInvoiceDepartment.do',
+		method: 'POST',
+		waitMsg: '正在保存数据，请稍候',
+		waitTitle: '提交表单',
+		success: function (form, action) {
 			showResult('保存成功！');
 			configWin.close();
 			grid.dwrReload();
 		},
-		failure : function(form, action) {
+		failure: function (form, action) {
 			showResult('保存失败。');
 		}
 	});
 }
 
-function showWindow(id){
-	 formPanel = new top.Ext.FormPanel({
-		id : 'configForm',
-		frame : true,
-		labelSeparator : ':',
-		labelAlign:'left',
-		bodyStyle : 'padding:5px 5px 0px 5px;',
-		width : 500,
-		items : [{
-			xtype : 'hidden',
-			id:'departCodes',
-			name:'departCodes'
-			},{
-				xtype : 'hidden',
-				id:'id',
-				name:'id'
-		},{
-    	xtype:"fieldset", 
-        title :'基础信息', 
-        height:160,
-        items:[{
-			layout : 'column',
-			labelWidth : 30,
-			items : [{
-				columnWidth : .8,
-				layout : 'form',
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : '分组',
-					id : 'shift',
-					name : 'shift',
-					allowBlank : false,
-					anchor : '98%'
-				},{
-					xtype : 'textarea',
-					fieldLabel : '科室',
-					id : 'departNames',
-					name : 'departNames',
-					allowBlank : false,
-					readOnly:true,
-					anchor : '98%'
-				}]
-			},{
-				columnWidth : .2,
-				layout : 'form',
-				items : [{
-							xtype : 'button',
-							text : '选择科室',
-							listeners:{
-								click : function(){
-									var departName = top.Ext.getCmp('departNames').getValue();
-									var codes = top.Ext.getCmp("departCodes").getValue();
-									openSelectReceiverOrganization(departName,codes);
-								} 								
+function showWindow(id) {
+	formPanel = new top.Ext4.form.Panel({
+		id: 'configForm',
+		frame: true,
+		labelSeparator: ':',
+		bodyStyle: 'padding:5px 5px 0px 5px;',
+		width: 800,
+		fieldDefaults: {
+			labelAlign: 'left',
+			labelWidth: 200
+		},
+		items: [{
+			xtype: 'hidden',
+			id: 'departCodes',
+			name: 'departCodes'
+		}, {
+			xtype: 'hidden',
+			id: 'id',
+			name: 'id'
+		}, {
+			xtype: "fieldset",
+			title: '基础信息',
+			height: 500,
+			items: [{
+				layout: 'column',
+				labelWidth: 170,
+				items: [{
+					columnWidth: .8,
+					layout: 'form',
+					items: [{
+						xtype: 'textfield',
+						fieldLabel: '分组',
+						id: 'shift',
+						name: 'shift',
+						allowBlank: false,
+						anchor: '98%'
+					}, {
+						xtype: 'textarea',
+						fieldLabel: '科室',
+						id: 'departNames',
+						name: 'departNames',
+						height: 230,
+						allowBlank: false,
+						readOnly: true,
+						anchor: '98%'
+					}]
+				}, {
+					columnWidth: .2,
+					layout: 'form',
+					items: [{
+						xtype: 'button',
+						text: '选择科室',
+						listeners: {
+							click: function () {
+								var departName = top.Ext4.getCmp('departNames').getValue();
+								var codes = top.Ext4.getCmp("departCodes").getValue();;
+								openSelectReceiverOrganization(departName, codes);
 							}
-						}]
+						}
+					}]
+				}]
 			}]
 		}]
-	}],
-		buttons : [{
-			id : 'saveBtn',
-			text : '保存',
-			handler : function(){
-				if(formPanel.getForm().isValid()){
+		,
+		buttons: [{
+			id: 'saveBtn',
+			text: '保存',
+			handler: function () {
+				if (formPanel.getForm().isValid()) {
 					saveConfig();
-				}else{
+				} else {
 					showResult('请填写表单！');
 					return false;
 				}
 			}
 		}, {
-			text : '取消',
-			id : 'saveAndNewBtn',
-			handler : cancel
+			text: '取消',
+			id: 'saveAndNewBtn',
+			handler: cancel
 		}]
 	});
-	 configWin = new top.Ext.Window({
-		 id : 'satisfactionSurveyApplicationWin',
-			layout : 'border',
-			title : '科室发货设置',
-			width : 500,
-			height : 200,
-			border : false,
-			plain : true,
-			modal :true,
-			items : [{
-				region:'center',
-				width : 200,
-			    layout :'fit',
-				items:[formPanel]
-			}]
+	configWin = new top.Ext4.window.Window({
+		id: 'satisfactionSurveyApplicationWin',
+		layout: 'border',
+		title: '科室发货设置',
+		width: 800,
+		height: 500,
+		border: false,
+		plain: true,
+		modal: true,
+		items: [{
+			region: 'center',
+			width: 400,
+			layout: 'fit',
+			items: [formPanel]
+		}]
 	});
 	configWin.show();
 }
